Author: dnusinow
Date: 2005-10-29 18:48:23 -0500 (Sat, 29 Oct 2005)
New Revision: 796
Added:
branches/6.9/debian/patches/debian/992_debian_allow_build_from_svn.diff
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/series
branches/6.9/debian/x11-common.preinst.in
Log:
Merge changes from trunk
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-10-29 23:39:35 UTC (rev 795)
+++ branches/6.9/debian/changelog 2005-10-29 23:48:23 UTC (rev 796)
@@ -12,6 +12,16 @@
-- David Nusinow <[EMAIL PROTECTED]> Sat, 29 Oct 2005 18:37:00 -0400
+xorg-x11 (6.8.2.dfsg.1-10) unstable; urgency=low
+
+ * Really fix x11-common.preinst "eq" test by using "=" instead.
+ (Closes: #334345
+ * Add debian/992_debian_allow_build_from_svn.diff to ignore .svn directories
+ rather than CVS ones, thereby letting people build straight from our SVN
+ without failing MANIFEST check. Thanks Will Dyson and Frans Pop.
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 29 Oct 2005 16:53:20 -0400
+
xorg-x11 (6.8.99.901.dfsg.1-1) experimental; urgency=low
* Update to 6.9RC1
Copied: branches/6.9/debian/patches/debian/992_debian_allow_build_from_svn.diff
(from rev 794, trunk/debian/patches/debian/992_debian_allow_build_from_svn.diff)
Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series 2005-10-29 23:39:35 UTC (rev 795)
+++ branches/6.9/debian/patches/series 2005-10-29 23:48:23 UTC (rev 796)
@@ -108,3 +108,4 @@
debian/914_make_static_libs.diff -p0
debian/916_add_XKBPATH_env_variable.diff
debian/989_ubuntu_add_extra_modelines_from_xorg.diff -p0
+debian/992_debian_allow_build_from_svn.diff
Modified: branches/6.9/debian/x11-common.preinst.in
===================================================================
--- branches/6.9/debian/x11-common.preinst.in 2005-10-29 23:39:35 UTC (rev
795)
+++ branches/6.9/debian/x11-common.preinst.in 2005-10-29 23:48:23 UTC (rev
796)
@@ -47,7 +47,7 @@
# been modified from the stable sarge version. If they have been modified,
we
# don't do anything, but if they are untouched then we remove them to let
the
# upgrade continue without errors
- if [ "$2" -eq "" ]; then
+ if [ "$2" = "" ]; then
remove_conffile_prepare /etc/X11/Xresources/xfree86-common \
a0f3911120c49038cb87607e3c545b90
remove_conffile_prepare /etc/X11/Xsession \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
