packages: lighttpd/lighttpd-branch.diff, lighttpd/lighttpd-branch.sh, light...

[glen]

Author: glen                         Date: Wed Sep 30 10:08:36 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- exclude configure.ac from branch.diff to avoid version bump; rel 7

---- Files affected:
packages/lighttpd:
   lighttpd-branch.diff (1.59 -> 1.60) , lighttpd-branch.sh (1.15 -> 1.16) , lighttpd.spec (1.300 -> 1.301) 

---- Diffs:

================================================================
Index: packages/lighttpd/lighttpd-branch.diff
diff -u packages/lighttpd/lighttpd-branch.diff:1.59 packages/lighttpd/lighttpd-branch.diff:1.60
--- packages/lighttpd/lighttpd-branch.diff:1.59	Mon Sep 21 15:24:44 2009
+++ packages/lighttpd/lighttpd-branch.diff	Wed Sep 30 12:08:30 2009
@@ -2738,44 +2738,6 @@
  	return 0;
 Index: configure.ac
 ===================================================================
---- configure.ac	(.../tags/lighttpd-1.4.23)
-+++ configure.ac	(.../branches/lighttpd-1.4.x)
-@@ -1,9 +1,10 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.57)
--AC_INIT([lighttpd], [1.4.23], [contact at lighttpd.net])
-+AC_INIT([lighttpd], [1.4.24], [contact at lighttpd.net])
- AC_CONFIG_SRCDIR([src/server.c])
- AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CANONICAL_TARGET
- 
-@@ -417,12 +418,18 @@
-    AC_DEFINE([HAVE_LUA], [1], [liblua])
-    AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-  ],[
--   # for debian based systems
--   PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
--     AC_DEFINE([HAVE_LUA], [1], [liblua])
--     AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
--   ])
-+ # for debian based systems
-+ PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
-+   AC_DEFINE([HAVE_LUA], [1], [liblua])
-+   AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-+ ],[
-+ # for freebsd
-+ PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [
-+   AC_DEFINE([HAVE_LUA], [1], [liblua])
-+   AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-  ])
-+ ])
-+ ])
- 
-  AC_SUBST(LUA_CFLAGS)
-  AC_SUBST(LUA_LIBS)
 Index: doc/.cvsignore
 ===================================================================
 Index: doc/fastcgi.txt

================================================================
Index: packages/lighttpd/lighttpd-branch.sh
diff -u packages/lighttpd/lighttpd-branch.sh:1.15 packages/lighttpd/lighttpd-branch.sh:1.16
--- packages/lighttpd/lighttpd-branch.sh:1.15	Mon Sep 21 15:35:25 2009
+++ packages/lighttpd/lighttpd-branch.sh	Wed Sep 30 12:08:31 2009
@@ -21,6 +21,7 @@
 		-x 'src/mod_uploadprogress.c' \
 		-x 'tests/.cvsignore' \
 		-x 'tests/mod-extforward.conf' \
+		-x 'configure.ac' \
 		| \
 	# remove revno's for smaller diffs
 	sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'

================================================================
Index: packages/lighttpd/lighttpd.spec
diff -u packages/lighttpd/lighttpd.spec:1.300 packages/lighttpd/lighttpd.spec:1.301
--- packages/lighttpd/lighttpd.spec:1.300	Mon Sep 21 15:36:29 2009
+++ packages/lighttpd/lighttpd.spec	Wed Sep 30 12:08:31 2009
@@ -24,7 +24,7 @@
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
 Version:	1.4.23
-Release:	6
+Release:	7
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
@@ -1292,6 +1292,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.301  2009/09/30 10:08:31  glen
+- exclude configure.ac from branch.diff to avoid version bump; rel 7
+
 Revision 1.300  2009/09/21 13:36:29  glen
 - bugfix for lighty#2068 (mod expires not concating headers); rel 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.diff?r1=1.59&r2=1.60&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.sh?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.300&r2=1.301&f=u