xfs: Changes to 'debian-unstable'
debian/changelog | 13 +++++++++++++
debian/rules | 4 ++--
debian/xfs.postinst.in | 18 ------------------
debian/xfs.postrm.in | 14 --------------
debian/xfs.preinst.in | 40 ++++++++++++++++++++++------------------
5 files changed, 37 insertions(+), 52 deletions(-)
New commits:
commit ecf32e4c1c5776fa9dc40bb7d8ded762a9856bc5
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 24 18:40:24 2008 +0100
Add --no-start to dh_installinit
so that the default daemon restart code is not automatically added
after the xfs-specific one.
diff --git a/debian/changelog b/debian/changelog
index 61d37c3..04de12d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,11 @@ xfs (1:1.0.6-2) UNRELEASED; urgency=low
xfs-specific scripts are actually used instead of dh_installinit
ones, causing the daemon to not always restart on upgrade,
closes: #457900.
+ + Add --no-start to dh_installinit so that default daemon restart
+ code is not automatically added after the xfs-specific one.
* Remove obsolete stuff from maintainer scripts.
- -- Brice Goglin <bgoglin@debian.org> Mon, 24 Mar 2008 18:04:38 +0100
+ -- Brice Goglin <bgoglin@debian.org> Mon, 24 Mar 2008 18:28:00 +0100
xfs (1:1.0.6-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 4704157..750f5ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ binary-arch: build install
dh_installman
dh_installchangelogs ChangeLog
dh_installexamples
- dh_installinit
+ dh_installinit --no-start
dh_link
dh_strip
dh_compress
commit 75aad7995ff10bfc8d61a0cad5fac9bf44b17431
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 24 18:05:25 2008 +0100
Remove obsolete stuff from maintainer scripts
diff --git a/debian/changelog b/debian/changelog
index 4eccf13..61d37c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xfs (1:1.0.6-2) UNRELEASED; urgency=low
xfs-specific scripts are actually used instead of dh_installinit
ones, causing the daemon to not always restart on upgrade,
closes: #457900.
+ * Remove obsolete stuff from maintainer scripts.
- -- Brice Goglin <bgoglin@debian.org> Mon, 24 Mar 2008 18:01:22 +0100
+ -- Brice Goglin <bgoglin@debian.org> Mon, 24 Mar 2008 18:04:38 +0100
xfs (1:1.0.6-1) unstable; urgency=low
diff --git a/debian/xfs.postinst.in b/debian/xfs.postinst.in
index 85a1e7c..13927dc 100644
--- a/debian/xfs.postinst.in
+++ b/debian/xfs.postinst.in
@@ -17,24 +17,6 @@ THIS_SCRIPT=postinst
#INCLUDE_SHELL_LIB#
-check_symlinks_and_bomb /usr/lib/X11/fs
-
-# now safe to finish migrations started in preinst
-if [ -e /usr/X11R6/lib/X11/fs.moved-by-preinst ] && \
- [ -L /usr/X11R6/lib/X11/fs ]; then
- rm -r /usr/X11R6/lib/X11/fs.moved-by-preinst
-fi
-if [ -e /etc/X11/xfs.moved-by-preinst ]; then
- rm /etc/X11/xfs.moved-by-preinst
-fi
-
-# deal with a bug in very old versions of xbase
-for DIR in rc0.d rc1.d rc6.d; do
- if [ -L "/etc/$DIR/K1xfs" ]; then
- mv "/etc/$DIR/K1xfs" "/etc/$DIR/K01xfs"
- fi
-done
-
# Registering the init scripts or starting the daemon may cause output to
# stdout, which can confuse debconf.
db_stop
diff --git a/debian/xfs.postrm.in b/debian/xfs.postrm.in
index 8433c80..617d4a8 100644
--- a/debian/xfs.postrm.in
+++ b/debian/xfs.postrm.in
@@ -14,20 +14,6 @@ THIS_SCRIPT=postrm
#INCLUDE_SHELL_LIB#
-if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
- if [ -d /usr/X11R6/lib/X11/fs.moved-by-preinst ] && \
- [ -L /usr/X11R6/lib/X11/fs ]; then
- rm /usr/X11R6/lib/X11/fs
- mv /usr/X11R6/lib/X11/fs.moved-by-preinst /usr/X11R6/lib/X11/fs
- fi
- if [ -e /etc/X11/xfs.moved-by-preinst ] && [ -d /etc/X11/fs ] && \
- ! [ -e /etc/X11/xfs ]; then
- mv /etc/X11/fs /etc/X11/xfs
- rm /etc/X11/xfs.moved-by-preinst
- fi
-
-fi
-
if [ "$1" = "abort-install" ]; then
rm -f /var/run/xfs.install
fi
diff --git a/debian/xfs.preinst.in b/debian/xfs.preinst.in
index 2ad91e8..c4e556d 100644
--- a/debian/xfs.preinst.in
+++ b/debian/xfs.preinst.in
@@ -14,24 +14,6 @@ THIS_SCRIPT=preinst
#INCLUDE_SHELL_LIB#
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # fs dir moved to /etc/X11 in 4.x
- if [ -e /usr/X11R6/lib/X11/fs ] && ! [ -L /usr/X11R6/lib/X11/fs ]; then
- observe "removing obsolete /usr/X11R6/lib/X11/fs directory"
- mv /usr/X11R6/lib/X11/fs /usr/X11R6/lib/X11/fs.moved-by-preinst
- fi
-
- # /etc/X11/xfs dir renamed to /etc/X11/fs in 4.x
- if [ -d /etc/X11/xfs ] && ! [ -e /etc/X11/fs ]; then
- observe "moving X font server configuration directory /etc/X11/xfs" \
- "to /etc/X11/fs"
- mv /etc/X11/xfs /etc/X11/fs
- touch /etc/X11/xfs.moved-by-preinst
- fi
-
- check_symlinks_and_warn /usr/lib/X11/fs
-fi
-
if [ "$1" = "install" ]; then
# Create a flag file that tells the postinst script this is an install, not
# an upgrade.
commit 87a2f067d25a8afd13c492a2ed07af0e23acf1f1
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 24 13:44:56 2008 +0100
Make sure maintainer scripts are generated during build
diff --git a/debian/changelog b/debian/changelog
index 4aeda50..4eccf13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xfs (1:1.0.6-2) UNRELEASED; urgency=low
* Remove the obsolete /etc/X11/fs/xfs.options, closes: #382776.
+ * Make sure maintainer scripts are generated during build, so that
+ xfs-specific scripts are actually used instead of dh_installinit
+ ones, causing the daemon to not always restart on upgrade,
+ closes: #457900.
- -- Brice Goglin <bgoglin@debian.org> Mon, 24 Mar 2008 13:42:51 +0100
+ -- Brice Goglin <bgoglin@debian.org> Mon, 24 Mar 2008 18:01:22 +0100
xfs (1:1.0.6-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index a257b2b..4704157 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
confflags += --enable-man-pages=3
-build: patch build-stamp
+build: patch genscripts build-stamp
build-stamp:
dh_testdir
commit 18c1f4e3c5dfbddad7ebb1311c7c288176d8d84c
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 24 13:43:11 2008 +0100
Remove the obsolete /etc/X11/fs/xfs.options
and keep it without renaming it if modified
since we still use it if it exists.
diff --git a/debian/changelog b/debian/changelog
index 030a323..4aeda50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfs (1:1.0.6-2) UNRELEASED; urgency=low
+
+ * Remove the obsolete /etc/X11/fs/xfs.options, closes: #382776.
+
+ -- Brice Goglin <bgoglin@debian.org> Mon, 24 Mar 2008 13:42:51 +0100
+
xfs (1:1.0.6-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/xfs.preinst.in b/debian/xfs.preinst.in
index 6617bf0..2ad91e8 100644
--- a/debian/xfs.preinst.in
+++ b/debian/xfs.preinst.in
@@ -38,6 +38,28 @@ if [ "$1" = "install" ]; then
: >/var/run/xfs.install
fi
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you, keeping it."
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "1:1.0.6-1"; then
+ rm_conffile xfs "/etc/X11/fs/xfs.options"
+ fi
+esac
+
#DEBHELPER#
exit 0
Reply to: