[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 81976beeaab89a50e56eb46b43f2408b2b6485b7
Author: Clint Adams <schizo at debian.org>
Date:   Sat Jul 22 21:46:17 2006 +0000

    1.5.10 revised
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-100

diff --git a/debian/changelog b/debian/changelog
index 7c211bc..a96d967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 fakeroot (1.5.10) unstable; urgency=low
 
   * Move po4a stuff to dist-hook.
+  * Drop po4a from build-deps.
   * In postrm, remove the symlink which may have been generated
     by ldconfig, to avoid upsetting piuparts.  closes: #351299.
 
diff --git a/debian/control b/debian/control
index 61c4b45..a02af08 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], libc6-dev-i386 [amd64], libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-powerpc [ppc64], lib64gcc1 [i386], po4a (>= 0.23)
+Build-Depends: sharutils, libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], libc6-dev-i386 [amd64], libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-powerpc [ppc64], lib64gcc1 [i386]
 Maintainer: Clint Adams <schizo at debian.org>
 Standards-Version: 3.7.2
 
diff --git a/debian/rules b/debian/rules
index c40dc0c..f9209d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,8 @@ build: build-stamp
 build-stamp:
 	$(checkdir)
 
+	chmod +x fake/configure
+
 	mkdir obj-sysv objfake-sysv obj-tcp objfake-tcp
 	cd obj-sysv && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot --program-suffix=-sysv $(CONFARGS)
 	cd objfake-sysv && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man --program-suffix=-sysv $(CONFARGS)
@@ -233,14 +235,16 @@ binary: binary-indep binary-arch
 
 prebuild:
 	printf "define(FAKEROOT_VERSION, %s)\n" $(fakeroot_version) >acinclude.m4
-	ln -sf ../acinclude.m4 fake/acinclude.m4
+#	ln -sf ../acinclude.m4 fake/acinclude.m4
+	ln -f ../acinclude.m4 fake/acinclude.m4
 
 	autoreconf -fi
 	cd fake && autoreconf -fi
 
 	./configure
-	make dist
+	$(MAKE) dist
 	mv fakeroot-$(fakeroot_version).tar.gz ../fakeroot_$(fakeroot_version).orig.tar.gz
+	$(MAKE) distclean
 
 define checkdir
 	test -f debian/rules

-- 
fakeroot