[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 6b9f3b7d422d71205fadc9367088d47c7b7bb7e2
Author: Clint Adams <schizo at debian.org>
Date:   Thu Jul 14 11:19:22 2005 +0000

    Stop forcing gcc 3.4 on amd64.  closes: #317911.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-79

diff --git a/debian/changelog b/debian/changelog
index 2335fa1..706577e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ fakeroot (1.4.2) unstable; urgency=medium
   * Apply patch from Steve Langasek to update debian/rules to build correctly
     on biarch with both the old and new versions of dpkg-architecture
     closes: #317911.
+  * Stop forcing gcc 3.4 on amd64.  closes: #317911.
 
  -- Clint Adams <schizo at debian.org>  Thu, 14 Jul 2005 06:37:36 -0400
 
diff --git a/debian/control b/debian/control
index 7aaeef4..ad006b6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: fakeroot
 Section: utils
 Priority: optional
-Build-Depends: sharutils, libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], gcc-3.4 [amd64], ia32-libs-dev [amd64]
+Build-Depends: sharutils, libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], ia32-libs-dev [amd64]
 Maintainer: Clint Adams <schizo at debian.org>
 Standards-Version: 3.6.2
 
diff --git a/debian/rules b/debian/rules
index 5e23980..31788a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,8 +178,8 @@ ifneq (,$(findstring $(DEB_HOST_GNU_TYPE),s390-linux-gnu))
 	cd obj64-tcp && CC="gcc -m64" ../configure --prefix=/usr --mandir=/usr/share/man --build=s390-linux --host=s390x-linux --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
 endif
 ifneq (,$(findstring $(DEB_HOST_GNU_TYPE),x86_64-linux-gnu))
-	cd obj64-sysv && CC="gcc-3.4 -m32" ../configure --prefix=/usr --mandir=/usr/share/man --build=x86_64-linux --host=i386-linux --program-suffix=-sysv $(CONFARGS)
-	cd obj64-tcp && CC="gcc-3.4 -m32" ../configure --prefix=/usr --mandir=/usr/share/man --build=x86_64-linux --host=i386-linux --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
+	cd obj64-sysv && CC="gcc -m32" ../configure --prefix=/usr --mandir=/usr/share/man --build=x86_64-linux --host=i386-linux --program-suffix=-sysv $(CONFARGS)
+	cd obj64-tcp && CC="gcc -m32" ../configure --prefix=/usr --mandir=/usr/share/man --build=x86_64-linux --host=i386-linux --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
 endif
 
 	cd obj64-tcp && $(MAKE) libfakeroot.la

-- 
fakeroot