Author: glen Date: Tue Jun 17 16:10:09 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- ignore .cvsignore from branch.diff
---- Files affected:
SOURCES:
lighttpd-branch.diff (1.35 -> 1.36) , lighttpd-branch.sh (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/lighttpd-branch.diff
diff -u SOURCES/lighttpd-branch.diff:1.35 SOURCES/lighttpd-branch.diff:1.36
--- SOURCES/lighttpd-branch.diff:1.35 Tue Jun 17 17:58:26 2008
+++ SOURCES/lighttpd-branch.diff Tue Jun 17 18:10:03 2008
@@ -1873,16 +1873,6 @@
* fixed initgroups() called after chroot (#1384)
Index: .cvsignore
===================================================================
---- .cvsignore (.../tags/lighttpd-1.4.19) (revision 2190)
-+++ .cvsignore (.../branches/lighttpd-1.4.x) (revision 2190)
-@@ -3,7 +3,6 @@
- configure
- depcomp
- config.*
--lighttpd.spec
- mkinstalldirs
- distribute.sh
- autom4te.cache
Property changes on: .
___________________________________________________________________
================================================================
Index: SOURCES/lighttpd-branch.sh
diff -u SOURCES/lighttpd-branch.sh:1.3 SOURCES/lighttpd-branch.sh:1.4
--- SOURCES/lighttpd-branch.sh:1.3 Thu Apr 10 20:53:36 2008
+++ SOURCES/lighttpd-branch.sh Tue Jun 17 18:10:03 2008
@@ -9,6 +9,6 @@
echo "Running diff: $old -> $new"
LC_ALL=C svn diff --old=$old --new=$new > lighttpd-branch.diff
-echo "Excluding files which change version (configure.in, SConstruct)"
-filterdiff -x 'configure.in' lighttpd-branch.diff > lighttpd-branch.diff.tmp
+echo "Excluding files which change version or were not in dist tarball"
+filterdiff -x 'configure.in' -x .cvsignore lighttpd-branch.diff >
lighttpd-branch.diff.tmp
mv -f lighttpd-branch.diff.tmp lighttpd-branch.diff
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/lighttpd-branch.diff?r1=1.35&r2=1.36&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/lighttpd-branch.sh?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
