[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 e146fd052075cc568b0ed33c21b549294a917ab8
Author: Clint Adams <schizo at debian.org>
Date:   Sat Apr 23 14:53:32 2005 +0000

    fakeroot-tcp a higher-priority alternative on the Hurd.  closes: #299633.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-62

diff --git a/debian/changelog b/debian/changelog
index e2accee..186406e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fakeroot (1.2.10) unstable; urgency=low
+
+  * Have fakeroot-tcp be a higher-priority alternative on the Hurd.
+    closes: #299633.
+
+ -- Clint Adams <schizo at debian.org>  Sat, 23 Apr 2005 10:52:07 -0400
+
 fakeroot (1.2.9) unstable; urgency=medium
 
   * Fix broken symlinks in /usr/lib64/libfakeroot.
diff --git a/debian/fakeroot.postinst b/debian/fakeroot.postinst.in
similarity index 87%
rename from debian/fakeroot.postinst
rename to debian/fakeroot.postinst.in
index 37ff79d..41e5e58 100755
--- a/debian/fakeroot.postinst
+++ b/debian/fakeroot.postinst.in
@@ -16,14 +16,14 @@ case "$1" in
 esac
 
 update-alternatives --install /usr/bin/fakeroot fakeroot \
-			/usr/bin/fakeroot-sysv 50 \
+			/usr/bin/fakeroot-sysv @FAKEROOT_SYSV_ALTPRIO@ \
 		--slave /usr/share/man/man1/fakeroot.1.gz \
 		fakeroot.1.gz /usr/share/man/man1/fakeroot-sysv.1.gz \
 		--slave /usr/share/man/man1/faked.1.gz \
 		faked.1.gz /usr/share/man/man1/faked-sysv.1.gz
 
 update-alternatives --install /usr/bin/fakeroot fakeroot \
-			/usr/bin/fakeroot-tcp 30 \
+			/usr/bin/fakeroot-tcp @FAKEROOT_TCP_ALTPRIO@ \
 		--slave /usr/share/man/man1/fakeroot.1.gz \
 		fakeroot.1.gz /usr/share/man/man1/fakeroot-tcp.1.gz \
 		--slave /usr/share/man/man1/faked.1.gz \
diff --git a/debian/rules b/debian/rules
index 627d114..b3e4bf5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,7 +136,15 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 	$(INSTALL_FILE) debian/shlibs debian/tmp/DEBIAN/shlibs
 	$(INSTALL_SCRIPT) debian/fakeroot.prerm debian/tmp/DEBIAN/prerm
+ifneq ($(DEB_HOST_GNU_TYPE),i386-hurd)
+	sed 's/@FAKEROOT_SYSV_ALTPRIO@/50/;s/@FAKEROOT_TCP_ALTPRIO@/30/;' \
+		debian/fakeroot.postinst.in > debian/fakeroot.postinst
+else
+	sed 's/@FAKEROOT_SYSV_ALTPRIO@/30/;s/@FAKEROOT_TCP_ALTPRIO@/50/;' \
+		debian/fakeroot.postinst.in > debian/fakeroot.postinst
+endif
 	$(INSTALL_SCRIPT) debian/fakeroot.postinst debian/tmp/DEBIAN/postinst
+	rm -f debian/fakeroot.postinst
 	# We can just use the deps for faked.
 	dpkg-shlibdeps -Tdebian/substvars \
 		debian/tmp/usr/bin/faked-sysv \

-- 
fakeroot