- applied in svn

[packages/lighttpd.git] / branch.sh

diff --git a/branch.sh b/branch.sh
index ce1964caf4cc0a36a7b9e44172f4c58533de56e0..a0153209d130b11b3503aab6bfc8779e707d7325 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -1,14 +1,15 @@
 #!/bin/sh
 set -e
 svn=svn://svn.lighttpd.net/lighttpd
-tag=lighttpd-1.4.21
+tag=lighttpd-1.4.23
 branch=lighttpd-1.4.x
 
 old=$svn/tags/$tag
 new=$svn/branches/$branch
 echo "Running diff: $old -> $new"
-LC_ALL=C svn diff --old=$old --new=$new > lighttpd-branch.diff
+LC_ALL=C svn diff --old=$old --new=$new > lighttpd-branch.diff.tmp
 
 echo "Excluding files which change version or were not in dist tarball"
-filterdiff -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' lighttpd-branch.diff > lighttpd-branch.diff.tmp
-mv -f lighttpd-branch.diff.tmp lighttpd-branch.diff
+filterdiff -x tests/mod-extforward.conf -x ChangeLog -x .cvsignore -x src/.cvsignore -x tests/.cvsignore -x doc/.cvsignore -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' -x 'src/CMakeLists.txt' -x 'src/config.h.cmake' -x 'src/mod_uploadprogress.c' lighttpd-branch.diff.tmp > lighttpd-branch.diff.tmp2
+mv -f lighttpd-branch.diff.tmp2 lighttpd-branch.diff
+rm -f lighttpd-branch.diff.tmp