[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 000a12f69159767d037c75d3355fa07a1746f4a0
Author: Clint Adams <schizo at debian.org>
Date:   Sat Jul 22 21:13:25 2006 +0000

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

diff --git a/debian/changelog b/debian/changelog
index a7b0f5a..7c211bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fakeroot (1.5.10) unstable; urgency=low
+
+  * Move po4a stuff to dist-hook.
+  * In postrm, remove the symlink which may have been generated
+    by ldconfig, to avoid upsetting piuparts.  closes: #351299.
+
+ -- Clint Adams <schizo at debian.org>  Sat, 22 Jul 2006 16:02:43 -0400
+
 fakeroot (1.5.9) unstable; urgency=low
 
   * Fix libc6-dev-amd64 typo in build-deps.  closes: #376903.
diff --git a/debian/fakeroot.postrm b/debian/fakeroot.postrm
new file mode 100644
index 0000000..b833168
--- /dev/null
+++ b/debian/fakeroot.postrm
@@ -0,0 +1,34 @@
+#! /bin/sh -e
+
+# This script is called twice during the removal of the package; once
+# after the removal of the package's files from the system, and as
+# the final step in the removal of this package, after the package's
+# conffiles have been removed.
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+  (remove)
+    # ldconfig would clean this up the next time it's run, but
+    # we remove it to make piuparts stop complaining
+    rm -f /usr/lib/libfakeroot-0.so
+
+    ;;
+  (purge|disappear|upgrade|failed-upgrade|abort-install|abort-upgrade)
+    :
+
+    ;;
+  (*) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 7574712..c40dc0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,7 @@ BIARCH_LIB_DIR=usr/lib64
 endif
 endif
 
+fakeroot_version := $(shell dpkg-parsechangelog | sed -n '/^Version: \(.*\)$$/ {s//\1/;p}')
 
 build: build-stamp
 build-stamp:
@@ -148,6 +149,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 #	strip --strip-debug debian/tmp/usr/lib/libfakeroot.a
 endif
 	$(INSTALL_FILE) debian/shlibs debian/tmp/DEBIAN/shlibs
+	$(INSTALL_SCRIPT) debian/fakeroot.postrm debian/tmp/DEBIAN/postrm
 	$(INSTALL_SCRIPT) debian/fakeroot.prerm debian/tmp/DEBIAN/prerm
 ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
 	sed 's/@FAKEROOT_SYSV_ALTPRIO@/50/;s/@FAKEROOT_TCP_ALTPRIO@/30/;' \
@@ -230,12 +232,16 @@ binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary checkroot prebuild
 
 prebuild:
-	printf "define(FAKEROOT_VERSION, %s)\n" $$(dpkg-parsechangelog | sed -n '/^Version: \(.*\)$$/ {s//\1/;p}') >acinclude.m4
+	printf "define(FAKEROOT_VERSION, %s)\n" $(fakeroot_version) >acinclude.m4
 	ln -sf ../acinclude.m4 fake/acinclude.m4
 
 	autoreconf -fi
 	cd fake && autoreconf -fi
 
+	./configure
+	make dist
+	mv fakeroot-$(fakeroot_version).tar.gz ../fakeroot_$(fakeroot_version).orig.tar.gz
+
 define checkdir
 	test -f debian/rules
 endef
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b9193eb..31b84d2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,17 +6,22 @@ man_MANS = faked.1 fakeroot.1
 #another automake bug workaround
 EXTRA_DIST = $(man_MANS)
 
-all-recursive: po4a
+dist-hook:
+	cp -r $(srcdir)/po4a $(distdir)
+	rm -rf `find $(distdir) -name .arch-ids`
+	cd $(distdir) && po4a -k 0 --rm-backups --variable "srcdir=$(distdir)/" po4a/po4a.cfg
 
-po4a:
-	@$(NORMAL_INSTALL)
-	po4a -k 0 --variable "srcdir=$(srcdir)/" $(srcdir)/po4a/po4a.cfg
+#all-recursive: po4a
 
-clean-recursive: po4a-clean
-
-po4a-clean:
-	@$(NORMAL_INSTALL)
-	po4a -k 0 --variable "srcdir=$(srcdir)/" \
-	   --rm-translations $(srcdir)/po4a/po4a.cfg
-
-.PHONY: po4a po4a-clean
+#po4a:
+#	@$(NORMAL_INSTALL)
+#	po4a -k 0 --variable "srcdir=$(srcdir)/" $(srcdir)/po4a/po4a.cfg
+#
+#clean-recursive: po4a-clean
+#
+#po4a-clean:
+#	@$(NORMAL_INSTALL)
+#	po4a -k 0 --variable "srcdir=$(srcdir)/" \
+#	   --rm-translations $(srcdir)/po4a/po4a.cfg
+#
+#.PHONY: po4a po4a-clean
diff --git a/doc/es/Makefile.am b/doc/es/Makefile.am
index 538a467..8c099eb 100644
--- a/doc/es/Makefile.am
+++ b/doc/es/Makefile.am
@@ -5,4 +5,4 @@ man_MANS = faked.1 fakeroot.1
 
 $(man_MANS):
 
-EXTRA_DIST = faked.1 fakeroot.1
+#EXTRA_DIST = faked.1 fakeroot.1
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
index 8904398..a8e26ef 100644
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -5,4 +5,4 @@ man_MANS = fakeroot.1 faked.1
 
 $(man_MANS):
 
-EXTRA_DIST = fakeroot.1 faked.1
+#EXTRA_DIST = fakeroot.1 faked.1
diff --git a/doc/sv/Makefile.am b/doc/sv/Makefile.am
index e1b96a7..4a9a7ce 100644
--- a/doc/sv/Makefile.am
+++ b/doc/sv/Makefile.am
@@ -5,4 +5,4 @@ man_MANS = faked.1 fakeroot.1
 
 $(man_MANS):
 
-EXTRA_DIST = faked.1 fakeroot.1
+#EXTRA_DIST = faked.1 fakeroot.1

-- 
fakeroot