xorg: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/xserver-xorg.postinst.in | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 617c3f9613dc466848ca63e9881f0ef26927026f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 10:42:18 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ba33a8f..835a44f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg (1:7.3+14) UNRELEASED; urgency=low
+xorg (1:7.3+14) unstable; urgency=low
* Ignore errors from update-rc.d remove (closes: #490595).
- -- Julien Cristau <jcristau@debian.org> Sun, 13 Jul 2008 10:33:49 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 13 Jul 2008 10:42:05 +0200
xorg (1:7.3+13) unstable; urgency=low
commit 000821941026bd9edc580c9539dd10226299538e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 10:41:54 2008 +0200
Ignore errors from update-rc.d remove (closes: #490595).
diff --git a/debian/changelog b/debian/changelog
index 039a1c4..ba33a8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.3+14) UNRELEASED; urgency=low
+
+ * Ignore errors from update-rc.d remove (closes: #490595).
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 13 Jul 2008 10:33:49 +0200
+
xorg (1:7.3+13) unstable; urgency=low
[ Debconf translations]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 75bb76c..717b611 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1005,7 +1005,7 @@ case "$1" in
remove_conffile_commit "/etc/init.d/xserver-xorg"
fi
if dpkg --compare-versions "$2" lt-nl "1:7.3+13"; then
- update-rc.d xserver-xorg remove
+ update-rc.d xserver-xorg remove || true
fi
;;
esac
Reply to: