Mozilla Thunderbird

Merge lp://qastaging/~gnomefreak/thunderbird/thunderbird.lp401165 into lp://qastaging/thunderbird/3.3

  1. thunderbird.lp401165
  2. Merge into thunderbird-trunk.head
Proposed by John Vivirito
Status: Needs review
Proposed branch: lp://qastaging/~gnomefreak/thunderbird/thunderbird.lp401165
Merge into: lp://qastaging/thunderbird/3.3
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~gnomefreak/thunderbird/thunderbird.lp401165
To post a comment you must log in.

Unmerged revisions

110. By John Vivirito

  * Fix (LP: #401165)
    - debian/control: Removed GCC and GCC++ from build depends to build using default
    - debian/rules: Commented out the CC and CCX lines to build using default

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-07-10 14:18:55 +0000
3+++ debian/changelog 2009-07-22 11:30:56 +0000
4@@ -1,3 +1,11 @@
5+thunderbird (2.0.0.22+build1+nobinonly-0ubuntu3) UNRELEASED; urgency=low
6+
7+ * Fix (LP: #401165)
8+ - debian/control: Removed GCC and GCC++ from build depends to build using default
9+ - debian/rules: Commented out the CC and CCX lines to build using default
10+
11+ -- John Vivirito <gnomefreak@ubuntu.com> Wed, 22 Jul 2009 07:29:51 -0400
12+
13 thunderbird (2.0.0.22+build1+nobinonly-0ubuntu2) karmic; urgency=low
14
15 [ Loic Minier ]
16
17=== modified file 'debian/control'
18--- debian/control 2009-06-25 17:34:31 +0000
19+++ debian/control 2009-07-22 11:30:56 +0000
20@@ -32,8 +32,6 @@
21 libnss3-dev,
22 libnspr4-dev (>= 4.7.4),
23 docbook-to-man,
24- gcc-4.3 [armel],
25- g++-4.3 [armel]
26 Standards-Version: 3.7.3
27
28 Package: thunderbird
29
30=== modified file 'debian/rules'
31--- debian/rules 2009-06-25 17:34:31 +0000
32+++ debian/rules 2009-07-22 11:30:56 +0000
33@@ -25,10 +25,10 @@
34 OPTFLAGS = -O2 -fno-strict-aliasing
35 endif
36
37-ifeq ($(DEB_HOST_ARCH),armel)
38- CC=gcc-4.3
39- CXX=g++-4.3
40-endif
41+#ifeq ($(DEB_HOST_ARCH),armel)
42+# CC=gcc-4.3
43+# CXX=g++-4.3
44+#endif
45
46 OPTFLAGS += -g
47

Subscribers

People subscribed via source and target branches