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

[John Vivirito]

Unmerged revisions

110. By John Vivirito on 2009-07-22

  * 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

=== modified file 'debian/changelog'
--- debian/changelog	2009-07-10 14:18:55 +0000
+++ debian/changelog	2009-07-22 11:30:56 +0000
@@ -1,3 +1,11 @@
+thunderbird (2.0.0.22+build1+nobinonly-0ubuntu3) UNRELEASED; urgency=low
+
+  * 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  
+
+ -- John Vivirito <[e-mail]>  Wed, 22 Jul 2009 07:29:51 -0400
+
 thunderbird (2.0.0.22+build1+nobinonly-0ubuntu2) karmic; urgency=low
 
   [ Loic Minier ]
 
=== modified file 'debian/control'
--- debian/control	2009-06-25 17:34:31 +0000
+++ debian/control	2009-07-22 11:30:56 +0000
@@ -32,8 +32,6 @@
 	libnss3-dev,
 	libnspr4-dev (>= 4.7.4),
 	docbook-to-man,
-	gcc-4.3 [armel],
-	g++-4.3 [armel]
 Standards-Version: 3.7.3
 
 Package: thunderbird
 
=== modified file 'debian/rules'
--- debian/rules	2009-06-25 17:34:31 +0000
+++ debian/rules	2009-07-22 11:30:56 +0000
@@ -25,10 +25,10 @@
         OPTFLAGS = -O2 -fno-strict-aliasing
 endif
 
-ifeq ($(DEB_HOST_ARCH),armel)
-	CC=gcc-4.3
-	CXX=g++-4.3
-endif
+#ifeq ($(DEB_HOST_ARCH),armel)
+#	CC=gcc-4.3
+#	CXX=g++-4.3
+#endif
 
 OPTFLAGS += -g