Package: libapache2-mod-lisp Severity: important Dear maintainer,
I've prepared a NMU for libapache2-mod-lisp 1.3.1-1.3. Please acknowledge the changes porting the module to Apache2 2.4. I've attached a debdiff. -- with kind regards, Arno Töll IRC: daemonkeeper on Freenode/OFTC GnuPG Key-ID: 0x9D80F36D
diff -u libapache2-mod-lisp-1.3.1/debian/rules libapache2-mod-lisp-1.3.1/debian/rules
--- libapache2-mod-lisp-1.3.1/debian/rules
+++ libapache2-mod-lisp-1.3.1/debian/rules
@@ -2,6 +2,7 @@
configure: configure-stamp
configure-stamp:
+ dh_quilt_patch
dh_testdir
touch configure-stamp
@@ -17,6 +18,7 @@
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) clean
dh_clean
+ dh_quilt_unpatch
install: build
dh_testdir
@@ -24,8 +26,6 @@
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-lisp
- install --preserve-timestamps -m 644 debian/lisp.load \
- debian/libapache2-mod-lisp/etc/apache2/mods-available/
# Build architecture-independent files here.
binary-indep: build install
@@ -35,7 +35,8 @@
binary-arch: build install
dh_testdir -a
dh_testroot -a
- dh_installdebconf -a
+ dh_installdebconf -a
+ dh_apache2 -a
dh_installdocs -a
dh_installexamples -a
dh_installmenu -a
diff -u libapache2-mod-lisp-1.3.1/debian/control libapache2-mod-lisp-1.3.1/debian/control
--- libapache2-mod-lisp-1.3.1/debian/control
+++ libapache2-mod-lisp-1.3.1/debian/control
@@ -2,12 +2,12 @@
Section: devel
Priority: optional
Maintainer: Chris Hanson <c...@debian.org>
-Build-Depends: debhelper (>> 5.0.0), apache2-threaded-dev
+Build-Depends: debhelper (>> 5.0.0), apache2-dev, dh-apache2, quilt
Standards-Version: 3.7.3
Package: libapache2-mod-lisp
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2.2-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: An Apache2 module that interfaces with Lisp environments
Establishes a link between the Apache2 web server and a Lisp environment
that allows a Lisp program to generate dynamic content while letting
diff -u libapache2-mod-lisp-1.3.1/debian/changelog libapache2-mod-lisp-1.3.1/debian/changelog
--- libapache2-mod-lisp-1.3.1/debian/changelog
+++ libapache2-mod-lisp-1.3.1/debian/changelog
@@ -1,3 +1,10 @@
+libapache2-mod-lisp (1.3.1-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Port to apache2.4 (Closes: #666821)
+
+ -- Arno Töll <a...@debian.org> Sat, 06 Jul 2013 18:54:32 +0200
+
libapache2-mod-lisp (1.3.1-1.2) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.debhelper.log
+++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.debhelper.log
@@ -0,0 +1 @@
+dh_quilt_unpatch
only in patch2:
unchanged:
--- libapache2-mod-lisp-1.3.1.orig/debian/libapache2-mod-lisp.apache2
+++ libapache2-mod-lisp-1.3.1/debian/libapache2-mod-lisp.apache2
@@ -0,0 +1 @@
+mod debian/lisp.load
only in patch2:
unchanged:
--- libapache2-mod-lisp-1.3.1.orig/debian/patches/apache2.4-fixes.patch
+++ libapache2-mod-lisp-1.3.1/debian/patches/apache2.4-fixes.patch
@@ -0,0 +1,24 @@
+--- a/mod_lisp.c
++++ b/mod_lisp.c
+@@ -169,8 +169,8 @@
+ } while (0)
+
+ #define ML_LOG_ERROR(status, r, msg) \
+- (ap_log_error (APLOG_MARK, APLOG_ERR, (status), \
+- ((r) -> server), (msg)))
++ ap_log_error (APLOG_MARK, APLOG_ERR, (status), \
++ ((r) -> server), (msg))
+
+ #define ML_LOG_PERROR(r, msg) \
+ ML_LOG_ERROR ((APR_FROM_OS_ERROR (apr_get_os_error ())), (r), (msg))
+@@ -184,8 +184,8 @@
+
+ #if ENABLE_DEBUG
+ # define ML_LOG_DEBUG(r, msg) \
+- (ap_log_error (APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, \
+- ((r) -> server), (msg)))
++ ap_log_error (APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, \
++ ((r) -> server), (msg))
+ #else
+ # define ML_LOG_DEBUG(r, msg)
+ #endif
only in patch2:
unchanged:
--- libapache2-mod-lisp-1.3.1.orig/debian/patches/series
+++ libapache2-mod-lisp-1.3.1/debian/patches/series
@@ -0,0 +1 @@
+apache2.4-fixes.patch
signature.asc
Description: OpenPGP digital signature
