- ignore .cvsignore from branch.diff

Changed files:
    branch.sh -> 1.4
    lighttpd-branch.diff -> 1.36

diff --git a/branch.sh b/branch.sh
index c7b74ac7af3c370c3625de01a63bc7a95ad6d0c9..540cf119dfad5346089cb7e06b18e574090ca478 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -9,6 +9,6 @@ new=$svn/branches/$branch
 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

diff --git a/lighttpd-branch.diff b/lighttpd-branch.diff
index 69d84e9a450f7427cb9156442399fd360f977332..940e29cff422c4982c98e7836488c0473638b8c2 100644 (file)
--- a/lighttpd-branch.diff
+++ b/lighttpd-branch.diff
@@ -1873,16 +1873,6 @@ Index: NEWS
    * 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: .
 ___________________________________________________________________