X Strike Force XFree86 SVN commit: rev 769 - trunk/debian
Author: branden
Date: 2003-11-14 14:04:50 -0500 (Fri, 14 Nov 2003)
New Revision: 769
Modified:
trunk/debian/changelog
trunk/debian/shell-lib.sh
Log:
Fix corrupted error message text in check_symlinks_and_warn().
(Closes: #220713)
- debian/shell-lib.sh
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-11-14 05:28:55 UTC (rev 768)
+++ trunk/debian/changelog 2003-11-14 19:04:50 UTC (rev 769)
@@ -1,3 +1,11 @@
+xfree86 (4.2.1-15) unstable; urgency=low
+
+ * Fix corrupted error message text in check_symlinks_and_warn().
+ (Closes: #220713)
+ - debian/shell-lib.sh
+
+ -- Branden Robinson <branden@debian.org> Fri, 14 Nov 2003 14:03:33 -0500
+
xfree86 (4.2.1-14) unstable; urgency=medium
* Urgency due to fix for FTBFS triggered by linux-kernel-headers package.
@@ -2407,12 +2415,12 @@
with any other packages that depend on the disappearing PEX5 and XIE
libraries.
* debian/copyright: update the "dead pool" to add README.DRI{,comp}
- * debian/rules:
+ * debian/rules:
- when building static debugging server, set optimization level to 0
instead of 2
* debian/xserver-xfree86.docs.*: remove README.DRI{,comp}
* debian/xserver-xfree86.templates:
- - clarify the circumstances under which advanced users can look for the
+ - clarify the circumstances under which advanced users can look for the
XKB directory (Closes: #140228)
- clarify that the mouse questions don't support more than 5 buttons
(see #141390)
Modified: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh 2003-11-14 05:28:55 UTC (rev 768)
+++ trunk/debian/shell-lib.sh 2003-11-14 19:04:50 UTC (rev 769)
@@ -294,7 +294,7 @@
fi
elif [ -e "$symlink" ]; then
errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="be installed until this"
+ errmsg="$errmsg be installed until this"
if [ -f "$symlink" ]; then
errmsg="$errmsg file"
elif [ -d "$symlink" ]; then
Reply to: