debian/changelog | 9 +++++++++
debian/control | 2 +-
debian/rules | 1 -
debian/xfs.postinst.in | 6 +-----
debian/xfs.postrm.in | 1 -
5 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 9182f5406840e92da9153f325618639dcba9ffda
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Jul 8 17:56:10 2008 +0200
lintian warning fixes
* Remove the -1 debian revisions from build-depends.
* Don't run dh_makeshlibs.
* Don't run update-rc.d twice in postinst and postrm, debhelper handles this
for us.
diff --git a/debian/changelog b/debian/changelog
index bfa0f79..5e2691f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xfs (1:1.0.8-3) UNRELEASED; urgency=low
+
+ * Remove the -1 debian revisions from build-depends.
+ * Don't run dh_makeshlibs.
+ * Don't run update-rc.d twice in postinst and postrm, debhelper handles this
+ for us.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Tue, 08 Jul 2008 17:53:58 +0200
+
xfs (1:1.0.8-2) unstable; urgency=low
* Add $syslog dependency to the xfs init.d script (closes: #489232).
diff --git a/debian/control b/debian/control
index 0e05b64..feac7b7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1),
libxfont-dev (>= 1:1.0.0-1), xtrans-dev (>= 1.0.0-1), quilt
+Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0),
libxfont-dev (>= 1:1.0.0), xtrans-dev (>= 1.0.0), quilt
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xfs
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xfs.git
diff --git a/debian/rules b/debian/rules
index ab2c6b2..a0b927d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,6 @@ binary-arch: build install
dh_fixperms
dh_installdeb
dh_shlibdeps
- dh_makeshlibs
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/debian/xfs.postinst.in b/debian/xfs.postinst.in
index 5248921..b8d60f0 100644
--- a/debian/xfs.postinst.in
+++ b/debian/xfs.postinst.in
@@ -21,9 +21,7 @@ THIS_SCRIPT=postinst
# stdout, which can confuse debconf.
db_stop
-if [ -e /etc/init.d/xfs ]; then
- update-rc.d xfs defaults
-fi
+#DEBHELPER#
# If we are not installing, we may or may not need to restart the daemon, but
we
# always start the daemon on install.
@@ -45,8 +43,6 @@ fi
[ -n "$NOSTART" ] || invoke-rc.d xfs start || true
-#DEBHELPER#
-
# Remove install flag file. Leave the "daemon not stopped" flag file, if it
# exists, so that it will be seen by the init script.
rm -f /var/run/xfs.install
diff --git a/debian/xfs.postrm.in b/debian/xfs.postrm.in
index 617d4a8..a56104d 100644
--- a/debian/xfs.postrm.in
+++ b/debian/xfs.postrm.in
@@ -21,7 +21,6 @@ fi
#DEBHELPER#
if [ "$1" = "purge" ]; then
- update-rc.d xfs remove
if [ -d /etc/X11/fs ]; then
rm -r /etc/X11/fs
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
