X Strike Force X.Org X11 SVN commit: r793 - in trunk/debian: . patches patches/debian
Author: dnusinow
Date: 2005-10-29 15:55:26 -0500 (Sat, 29 Oct 2005)
New Revision: 793
Added:
trunk/debian/patches/debian/992_debian_allow_build_from_svn.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* 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.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-10-29 20:07:42 UTC (rev 792)
+++ trunk/debian/changelog 2005-10-29 20:55:26 UTC (rev 793)
@@ -1,9 +1,12 @@
xorg-x11 (6.8.2.dfsg.1-9+SVN) UNRELEASED; urgency=low
- * Really fix x11-common.preinst "eq" test by using "=" instead.
+ * 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 <dnusinow@debian.org> Sun, 23 Oct 2005 17:33:51 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 29 Oct 2005 16:53:20 -0400
xorg-x11 (6.8.2.dfsg.1-9) unstable; urgency=low
Added: trunk/debian/patches/debian/992_debian_allow_build_from_svn.diff
===================================================================
--- trunk/debian/patches/debian/992_debian_allow_build_from_svn.diff 2005-10-29 20:07:42 UTC (rev 792)
+++ trunk/debian/patches/debian/992_debian_allow_build_from_svn.diff 2005-10-29 20:55:26 UTC (rev 793)
@@ -0,0 +1,19 @@
+$Id$
+
+This patch allows building from a straight svn pull.
+
+This patch by Will Dyson and Frans Pop.
+
+Index: trunk/xc/programs/rstart/Imakefile
+===================================================================
+--- trunk.orig/xc/programs/rstart/Imakefile 2005-10-29 16:22:36.000000000 -0400
++++ trunk/xc/programs/rstart/Imakefile 2005-10-29 16:24:33.000000000 -0400
+@@ -114,7 +114,7 @@
+ esac
+
+ #define Recurse(src, dest, filefunc) set -x; \@@\
+- for name in `find src -print | grep -v CVS` ; \@@\
++ for name in `find src -print | grep -v "\.svn"` ; \@@\
+ do \@@\
+ if test -f $$name; \@@\
+ then \@@\
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-10-29 20:07:42 UTC (rev 792)
+++ trunk/debian/patches/series 2005-10-29 20:55:26 UTC (rev 793)
@@ -167,3 +167,4 @@
debian/989_ubuntu_add_extra_modelines_from_xorg.diff -p0
debian/990_ubuntu_accept_enabled_for_extensions.diff -p0
debian/991_ubuntu_gcc_flags.diff -p0
+debian/992_debian_allow_build_from_svn.diff
Reply to: