Author: dnusinow
Date: 2005-09-03 13:47:16 -0500 (Sat, 03 Sep 2005)
New Revision: 588
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/shell-lib.sh
Log:
Merge changes between -r585 and HEAD -r586 (one important bugfix by
Branden)
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-09-03 18:47:16 UTC (rev 587)
+++ branches/6.9/debian/changelog 2005-09-03 18:47:16 UTC (rev 588)
@@ -84,6 +84,8 @@
re-enabling backing store in the Xvfb X server. The test harness relies
on the existence of backing store in the virtual X server it uses to run
tests in.
+ * Fix shell-lib.sh to ensure that the function
+ replace_conffile_with_symlink_rollback() actually exists.
[ David Nusinow ]
* Add Build-Depends on linux-kernel-headers to (>= 2.6.13+0rc3-1.1) so that
@@ -95,7 +97,7 @@
dpkg-buildpackage -nc to work. Thanks Jeremy Shaw.
+ Also add -f to ln command in genscripts to allow -nc to work
- -- David Nusinow <dnusinow@debian.org> Sat, 3 Sep 2005 13:39:36 -0400
+ -- Branden Robinson <branden@debian.org> Sat, 3 Sep 2005 13:33:12 -0500
xorg-x11 (6.8.2.dfsg.1-6) unstable; urgency=low
Modified: branches/6.9/debian/shell-lib.sh
===================================================================
--- branches/6.9/debian/shell-lib.sh 2005-09-03 18:47:16 UTC (rev 587)
+++ branches/6.9/debian/shell-lib.sh 2005-09-03 18:47:16 UTC (rev 588)
@@ -597,7 +597,7 @@
remove_conffile_commit "$_conffile"
}
-remove_conffile_rollback_with_symlink_rollback () {
+replace_conffile_with_symlink_rollback () {
# syntax: replace_conffile_with_symlink_rollback oldfilename newfilename
#
# Roll back the replacing of a conffile "oldfilename" with symlink to