tags 317911 patch
thanks

The attached patch fixes fakeroot's build rules to be compatible with both
the old and new versions of dpkg-dev.

Thanks,
-- 
Steve Langasek
postmodern programmer
diff -Nru /tmp/jB1MCWWRNo/fakeroot-1.4.1/debian/changelog 
/tmp/obX332YxVf/fakeroot-1.4.2/debian/changelog
--- /tmp/jB1MCWWRNo/fakeroot-1.4.1/debian/changelog     2005-06-29 
14:59:35.000000000 -0700
+++ /tmp/obX332YxVf/fakeroot-1.4.2/debian/changelog     2005-07-12 
19:42:00.000000000 -0700
@@ -1,3 +1,11 @@
+fakeroot (1.4.1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update debian/rules to build correctly on biarch with both the old and
+    new versions of dpkg-architecture (closes: #317911).
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Tue, 12 Jul 2005 19:35:34 -0700
+
 fakeroot (1.4.1) unstable; urgency=low
 
   * Fix broken shell substitution.
diff -Nru /tmp/jB1MCWWRNo/fakeroot-1.4.1/debian/rules 
/tmp/obX332YxVf/fakeroot-1.4.2/debian/rules
--- /tmp/jB1MCWWRNo/fakeroot-1.4.1/debian/rules 2005-05-09 08:53:43.000000000 
-0700
+++ /tmp/obX332YxVf/fakeroot-1.4.2/debian/rules 2005-07-12 19:35:30.000000000 
-0700
@@ -23,7 +23,7 @@
 INSTALL_PROGRAM += -s
 endif
 
-ifeq (x86_64-linux,$(DEB_HOST_GNU_TYPE))
+ifeq (x86_64-linux-gnu,$(DEB_HOST_GNU_TYPE))
 BIARCH_LIB_DIR=emul/ia32-linux/usr/lib
 else
 BIARCH_LIB_DIR=usr/lib64
@@ -64,7 +64,7 @@
        -cd obj-tcp && $(MAKE) distclean
        -cd objfake-sysv && $(MAKE) distclean
        -cd objfake-tcp && $(MAKE) distclean
-ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux s390-linux 
x86_64-linux))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu 
x86_64-linux-gnu))
        -cd obj64-sysv && $(MAKE) distclean
        -cd obj64-tcp && $(MAKE) distclean
 endif
@@ -118,7 +118,7 @@
        rm debian/tmp/usr/lib/libfakeroot/libfakeroot.so
        rm debian/tmp/usr/lib/libfakeroot.a
        rm debian/tmp/usr/lib/libfakeroot.so
-ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux s390-linux 
x86_64-linux))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu 
x86_64-linux-gnu))
        debian/rules binary-biarch
 endif
        $(INSTALL_FILE) debian/copyright 
debian/tmp/usr/share/doc/fakeroot/copyright
@@ -169,15 +169,15 @@
        $(checkdir)
        mkdir obj64-sysv obj64-tcp
 
-ifeq (sparc-linux,$(DEB_HOST_GNU_TYPE))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE),sparc-linux-gnu))
        cd obj64-sysv && CC="gcc -m64" ../configure --prefix=/usr 
--mandir=/usr/share/man --build=sparc-linux --host=sparc64-linux 
--program-suffix=-sysv $(CONFARGS)
        cd obj64-tcp && CC="gcc -m64" ../configure --prefix=/usr 
--mandir=/usr/share/man --build=sparc-linux --host=sparc64-linux --with-ipc=tcp 
--program-suffix=-tcp $(CONFARGS)
 endif
-ifeq (s390-linux,$(DEB_HOST_GNU_TYPE))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE),s390-linux-gnu))
        cd obj64-sysv && CC="gcc -m64" ../configure --prefix=/usr 
--mandir=/usr/share/man --build=s390-linux --host=s390x-linux 
--program-suffix=-sysv $(CONFARGS)
        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
-ifeq (x86_64-linux,$(DEB_HOST_GNU_TYPE))
+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)
 endif

Attachment: signature.asc
Description: Digital signature

Reply via email to