- exclude SConstruct and CMakeLists.txt

Changed files:
    branch.sh -> 1.8
    lighttpd-branch.diff -> 1.47

diff --git a/branch.sh b/branch.sh
index 6c466f729356b472e0af311329488838fa134f68..ce1964caf4cc0a36a7b9e44172f4c58533de56e0 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -10,5 +10,5 @@ echo "Running diff: $old -> $new"
 LC_ALL=C svn diff --old=$old --new=$new > lighttpd-branch.diff
 
 echo "Excluding files which change version or were not in dist tarball"
-filterdiff -x 'configure.in' lighttpd-branch.diff > lighttpd-branch.diff.tmp
+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

diff --git a/lighttpd-branch.diff b/lighttpd-branch.diff
index b98de8c492daea5bc2e7bf1f4e4136e7b10cee1f..6e37739f0f233b2ec540eeaa62ba83bbc93db7cc 100644 (file)
--- a/lighttpd-branch.diff
+++ b/lighttpd-branch.diff
@@ -33,17 +33,6 @@ Index: src/mod_cml_lua.c
        /* load lua program */
 Index: SConstruct
 ===================================================================
---- SConstruct (.../tags/lighttpd-1.4.21)      (revision 2399)
-+++ SConstruct (.../branches/lighttpd-1.4.x)   (revision 2399)
-@@ -5,7 +5,7 @@
- from stat import *
- 
- package = 'lighttpd'
--version = '1.4.21'
-+version = '1.4.22'
- 
- def checkCHeaders(autoconf, hdrs):
-       p = re.compile('[^A-Z0-9]')
 Index: NEWS
 ===================================================================
 --- NEWS       (.../tags/lighttpd-1.4.21)      (revision 2399)
@@ -64,17 +53,6 @@ Index: NEWS
    * Do not rely on ioctl FIONREAD (#673)
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt     (.../tags/lighttpd-1.4.21)      (revision 2399)
-+++ CMakeLists.txt     (.../branches/lighttpd-1.4.x)   (revision 2399)
-@@ -10,7 +10,7 @@
- 
- SET(CPACK_PACKAGE_VERSION_MAJOR 1)
- SET(CPACK_PACKAGE_VERSION_MINOR 4)
--SET(CPACK_PACKAGE_VERSION_PATCH 21)
-+SET(CPACK_PACKAGE_VERSION_PATCH 22)
- SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
- 
- SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 
 Property changes on: .
 ___________________________________________________________________