X Strike Force X.Org X11 SVN commit: r306 - trunk/debian
Author: dnusinow
Date: 2005-07-03 14:27:06 -0500 (Sun, 03 Jul 2005)
New Revision: 306
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/xfree86-common.postinst.in
Log:
- Add -f to update-rc.d call in xfree86-common.postinst.in to get rid of
error during configure stage. Thanks to Norbert Tretowski for providing
the fix.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-03 18:51:43 UTC (rev 305)
+++ trunk/debian/TODO 2005-07-03 19:27:06 UTC (rev 306)
@@ -44,8 +44,6 @@
+ Grab Thomas Winischhofer's post-6.8.2 fixes to MiscPassMessage() from CVS
(see Debian #285807).
-* Fix upgrade issue with xfree86-common
-
* Make sure xdm upgrades work properly
xorg-x11 6.8.2-2 (unstable)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-03 18:51:43 UTC (rev 305)
+++ trunk/debian/changelog 2005-07-03 19:27:06 UTC (rev 306)
@@ -8,6 +8,10 @@
- Change x-common to x11-common in order to reflect that this package
provides symlinks named x11
+ - Add -f to update-rc.d call in xfree86-common.postinst.in to get rid of
+ error during configure stage. Thanks to Norbert Tretowski for providing
+ the fix.
+
- Patch Audit
- 002_xdm_fixes.diff updated (Eugene Konev)
- 005_rgb.txt_in_etc_X11.diff updated (Nathanael Nerode)
Modified: trunk/debian/xfree86-common.postinst.in
===================================================================
--- trunk/debian/xfree86-common.postinst.in 2005-07-03 18:51:43 UTC (rev 305)
+++ trunk/debian/xfree86-common.postinst.in 2005-07-03 19:27:06 UTC (rev 306)
@@ -6,7 +6,7 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xfree86-common.postinst.in 1433 2004-05-21 17:59:20Z branden $
+# $Id$
set -e
@@ -36,7 +36,7 @@
remove_conffile_commit /etc/init.d/xfree86-common
if dpkg --compare-versions "$2" lt "6.8.1-0.3"; then
- update-rc.d xfree86-common remove
+ update-rc.d -f xfree86-common remove
fi
# vim:set ai et sts=2 sw=2 tw=80:
Reply to: