[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a
Clint Adams
schizo at debian.org
Tue Aug 23 13:05:33 UTC 2011
The following commit has been merged in the upstream branch:
commit 3e3d33def14a2c97765fd8e4bbc38ee9d9b72892
Author: Clint Adams <schizo at debian.org>
Date: Wed Mar 16 00:59:12 2005 +0000
attempt at alternatives handling
git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-50
diff --git a/debian/changelog b/debian/changelog
index 6fc4bc7..b131f7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fakeroot (1.2.6) unstable; urgency=low
+
+ * Manage /usr/bin/fakeroot via alternatives.
+
+ -- Clint Adams <schizo at debian.org> Tue, 15 Mar 2005 19:27:35 -0500
+
fakeroot (1.2.5) unstable; urgency=low
* fakeroot.1: Include text by Justin Pryzby about LD_PRELOAD and
diff --git a/debian/fakeroot.postinst b/debian/fakeroot.postinst
new file mode 100755
index 0000000..09f708d
--- /dev/null
+++ b/debian/fakeroot.postinst
@@ -0,0 +1,32 @@
+#!/bin/sh -e
+
+case "$1" in
+ configure)
+ # continue below
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ exit 0
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+update-alternatives --install /usr/bin/fakeroot fakeroot-sysv \
+ /usr/bin/fakeroot-sysv 50 \
+ --slave /usr/share/man/man1/fakeroot.1.gz \
+ fakeroot-sysv.1.gz /usr/share/man/man1/fakeroot-sysv.1.gz \
+ --slave /usr/share/man/man1/faked.1.gz \
+ faked-sysv.1.gz /usr/share/man/man1/faked-sysv.1.gz
+
+update-alternatives --install /usr/bin/fakeroot fakeroot-tcp \
+ /usr/bin/fakeroot-tcp 30 \
+ --slave /usr/share/man/man1/fakeroot.1.gz \
+ fakeroot-tcp.1.gz /usr/share/man/man1/fakeroot-tcp.1.gz \
+ --slave /usr/share/man/man1/faked.1.gz \
+ faked-tcp.1.gz /usr/share/man/man1/faked-tcp.1.gz
+
+exit 0
diff --git a/debian/fakeroot.prerm b/debian/fakeroot.prerm
new file mode 100755
index 0000000..030e319
--- /dev/null
+++ b/debian/fakeroot.prerm
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+case "$1" in
+ remove|deconfigure)
+ update-alternatives --remove fakeroot /usr/bin/fakeroot-sysv
+ update-alternatives --remove fakeroot /usr/bin/fakeroot-tcp
+ ;;
+ upgrade)
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+exit 0
diff --git a/debian/rules b/debian/rules
index fece01d..08c8740 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,20 +28,20 @@ build: build-stamp
build-stamp:
$(checkdir)
- mkdir obj objfake obj-tcp objfake-tcp
- cd obj && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot $(CONFARGS)
- cd objfake && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man $(CONFARGS)
+ 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)
cd obj-tcp && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/libfakeroot --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
cd objfake-tcp && CFLAGS="$(CFLAGS)" ../fake/configure --prefix=/usr --mandir=/usr/share/man --program-suffix=-tcp $(CONFARGS)
- cd obj && $(MAKE)
- cd objfake && $(MAKE)
+ cd obj-sysv && $(MAKE)
+ cd objfake-sysv && $(MAKE)
cd obj-tcp && $(MAKE)
cd objfake-tcp && $(MAKE)
ifeq ($(DEB_BUILD_GNU_TYPE)),$(DEB_HOST_GNU_TYPE))
- cd obj && $(MAKE) check
+ cd obj-sysv && $(MAKE) check
cd obj-tcp && $(MAKE) check
endif
@@ -49,15 +49,15 @@ endif
clean: checkroot
$(checkdir)
- rm -rf obj objfake obj64 obj-tcp objfake-tcp obj64-tcp
+ rm -rf obj-sysv objfake-sysv obj64-sysv obj-tcp objfake-tcp obj64-tcp
rm -f build-stamp build-biarch-stamp
# Add here commands to clean up after the build process.
- -cd obj && $(MAKE) distclean
+ -cd obj-sysv && $(MAKE) distclean
-cd obj-tcp && $(MAKE) distclean
- -cd objfake && $(MAKE) distclean
+ -cd objfake-sysv && $(MAKE) distclean
-cd objfake-tcp && $(MAKE) distclean
ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux s390-linux))
- -cd obj64 && $(MAKE) distclean
+ -cd obj64-sysv && $(MAKE) distclean
-cd obj64-tcp && $(MAKE) distclean
endif
rm -rf .deps
@@ -83,19 +83,28 @@ binary-arch: build checkroot
rm debian/tmp/usr/lib/libfakeroot.so.0
ln -s libfakeroot-tcp.so.0.0.1 debian/tmp/usr/lib/libfakeroot-tcp.so.0
- cd obj && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
- cd objfake && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
+ cd obj-sysv && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
+ cd objfake-sysv && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
+
+ mv debian/tmp/usr/lib/libfakeroot/libfakeroot.so.0.0.1 debian/tmp/usr/lib/libfakeroot/libfakeroot-sysv.so.0.0.1
+ rm debian/tmp/usr/lib/libfakeroot/libfakeroot.so.0
+ ln -s libfakeroot-sysv.so.0.0.1 debian/tmp/usr/lib/libfakeroot/libfakeroot-sysv.so.0
+
+ mv debian/tmp/usr/lib/libfakeroot.so.0.0.1 debian/tmp/usr/lib/libfakeroot-sysv.so.0.0.1
+ rm debian/tmp/usr/lib/libfakeroot.so.0
+ ln -s libfakeroot-sysv.so.0.0.1 debian/tmp/usr/lib/libfakeroot-sysv.so.0
+
$(INSTALL_DIR) debian/tmp/DEBIAN debian/tmp/usr/bin/
# $(INSTALL_SCRIPT) scripts/fakeroot debian/tmp/usr/bin/
$(INSTALL_DIR) debian/tmp/usr/share/doc/fakeroot \
debian/tmp/usr/lib/libfakeroot
$(INSTALL_FILE) README.fake doc/README.saving DEBUG debian/tmp/usr/share/doc/fakeroot/
- ( echo "This package was written and put together by me, "; \
- echo "joost witteveen <joostje at debian.org>" ; \
+ ( echo "fakeroot was written originally by"; \
+ echo "joost witteveen" ; \
echo "------------------------------------------------"; \
cat COPYING) > debian/tmp/usr/share/doc/fakeroot/copyright
- cd obj && ./libtool --finish $(CURDIR)/debian/tmp/usr/lib/fakeroot
- cd objfake && ./libtool --finish $(CURDIR)/debian/tmp/usr/lib
+# cd obj-sysv && ./libtool --finish $(CURDIR)/debian/tmp/usr/lib/fakeroot
+# cd objfake-sysv && ./libtool --finish $(CURDIR)/debian/tmp/usr/lib
rm -f debian/tmp/usr/lib/libfakeroot/libfakeroot.*a*
rm -f debian/tmp/usr/bin/simple debian/tmp/usr/lib/libfakeroot.la
rm debian/tmp/usr/lib/libfakeroot/libfakeroot.so
@@ -111,8 +120,8 @@ endif
debian/tmp/usr/share/man/es/man1/faked.1 \
debian/tmp/usr/share/man/sv/man1/fakeroot.1 \
debian/tmp/usr/share/man/sv/man1/faked.1 \
- debian/tmp/usr/share/man/man1/faked.1 \
- debian/tmp/usr/share/man/man1/fakeroot.1 \
+ debian/tmp/usr/share/man/man1/faked-sysv.1 \
+ debian/tmp/usr/share/man/man1/fakeroot-sysv.1 \
debian/tmp/usr/share/man/man1/faked-tcp.1 \
debian/tmp/usr/share/man/man1/fakeroot-tcp.1 \
debian/tmp/usr/share/doc/fakeroot/changelog
@@ -126,12 +135,14 @@ 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.prerm debian/tmp/DEBIAN/prerm
+ $(INSTALL_SCRIPT) debian/fakeroot.postinst debian/tmp/DEBIAN/postinst
# We can just use the deps for faked.
dpkg-shlibdeps -Tdebian/substvars debian/tmp/usr/bin/faked
dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -Pdebian/tmp
chmod 644 debian/tmp/DEBIAN/control
chown root:root debian/tmp/DEBIAN/control
- chmod 4644 debian/tmp/usr/lib/libfakeroot.so.0.0.1
+ chmod 4644 debian/tmp/usr/lib/libfakeroot-sysv.so.0.0.1
chmod 4644 debian/tmp/usr/lib/libfakeroot-tcp.so.0.0.1
cd debian/tmp && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
dpkg-deb --build debian/tmp ..
@@ -141,11 +152,11 @@ binary-biarch:
mkdir obj64 obj64-tcp
ifeq (sparc-linux,$(DEB_HOST_GNU_TYPE))
- cd obj64 && CC="gcc -m64" ../configure --prefix=/usr --mandir=/usr/share/man --build=sparc-linux --host=sparc64-linux $(CONFARGS)
+ 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))
- cd obj64 && CC="gcc -m64" ../configure --prefix=/usr --mandir=/usr/share/man --build=s390-linux --host=s390x-linux $(CONFARGS)
+ 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
@@ -159,12 +170,15 @@ endif
# mv debian/tmp/usr/lib64/libfakeroot.so.0.0.1 debian/tmp/usr/lib64/libfakeroot-tcp.so.0.0.1
# mv debian/tmp/usr/lib64/libfakeroot.so.0 debian/tmp/usr/lib64/libfakeroot-tcp.so.0
- cd obj64 && $(MAKE) libfakeroot.la
+ cd obj64-sysv && $(MAKE) libfakeroot.la
$(INSTALL_DIR) debian/tmp/usr/lib64/libfakeroot
- cd obj64 && $(SHELL) ./libtool --mode=install install libfakeroot.la \
+ cd obj64-sysv && $(SHELL) ./libtool --mode=install install libfakeroot.la \
$(CURDIR)/debian/tmp/usr/lib64/libfakeroot/libfakeroot.la
-# cd obj64 && ./libtool --finish debian/fakeroot-sparc/usr/lib64/fakeroot
+# cd obj64-sysv && ./libtool --finish debian/fakeroot-sparc/usr/lib64/fakeroot
rm -f debian/tmp/usr/lib64/libfakeroot/libfakeroot.*a*
+ mv debian/tmp/usr/lib64/libfakeroot/libfakeroot.so.0.0.1 debian/tmp/usr/lib64/libfakeroot/libfakeroot-sysv.so.0.0.1
+ mv debian/tmp/usr/lib64/libfakeroot/libfakeroot.so.0 debian/tmp/usr/lib64/libfakeroot/libfakeroot-sysv.so.0
+
rm debian/tmp/usr/lib64/libfakeroot/libfakeroot.so
# rm debian/tmp/usr/lib64/libfakeroot.so
diff --git a/debian/shlibs b/debian/shlibs
index 46e67c9..572426f 100644
--- a/debian/shlibs
+++ b/debian/shlibs
@@ -1 +1,2 @@
-/usr/lib/libfakeroot/libfakeroot 0
+/usr/lib/libfakeroot/libfakeroot-sysv 0
+/usr/lib/libfakeroot/libfakeroot-tcp 0
--
fakeroot
More information about the Fakeroot-commits
mailing list