X Strike Force X.Org X11 SVN commit: r586 - trunk/debian
Author: branden
Date: 2005-09-03 13:37:47 -0500 (Sat, 03 Sep 2005)
New Revision: 586
Modified:
trunk/debian/changelog
trunk/debian/shell-lib.sh
Log:
Fix shell-lib.sh to ensure that the function
replace_conffile_with_symlink_rollback() actually exists.
Could we be more careful, please? The correct name of the function is
right there in a comment on the next line.
I don't see how #322920 could possibly have been fixed by -6 given that the
function required didn't even exist under the correct name, but I haven't
confirmed the continuing breakage on my own.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-03 18:34:54 UTC (rev 585)
+++ trunk/debian/changelog 2005-09-03 18:37:47 UTC (rev 586)
@@ -5,6 +5,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
@@ -16,7 +18,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: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh 2005-09-03 18:34:54 UTC (rev 585)
+++ trunk/debian/shell-lib.sh 2005-09-03 18:37:47 UTC (rev 586)
@@ -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
Reply to: