Control: tag -1 patch

On Sun, Apr 01, 2012 at 09:15:51PM +0000, a...@debian.org wrote:
> your package libapache2-mod-encoding is provding an Apache2 web server module.
> We're upgrading Apache to the new upstream version 2.4 [1] (tracked
> as transition bug #661958). This requires all modules to be rebuilt
> due to ABI changes.  Thus, you need to rebuild and reupload your
> Apache2 module package in a version compatible to our new package
> available in experimental [2].  Please note it is not enough to
> simply rebuild the module - it needs some adaptions in the module
> package metadata. We have written packaging guidelines for our
> reverse dependencies [3]. Please read it carefully, it should be able
> to answer most of your questions. Do also look at dh_apache2
> (available through the dh-apache2 package) which can simplify
> packaging Apache2 modules.  In short, we want to highlight these
> changes you need to be aware of.

I think that this patch should do the job, but it's the first module
I've worked on for the 2.4 transition.  Could a Debian Apache expert
have a look?  If it looks OK, I'm willing to NMU for this, since the
last maintainer upload was nearly six years ago.

diff -u libapache2-mod-encoding-20040616/debian/changelog 
libapache2-mod-encoding-20040616/debian/changelog
--- libapache2-mod-encoding-20040616/debian/changelog
+++ libapache2-mod-encoding-20040616/debian/changelog
@@ -1,3 +1,10 @@
+libapache2-mod-encoding (20040616-5.2) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Port to Apache 2.4 (closes: #666842).
+
+ -- Colin Watson <cjwat...@debian.org>  Mon, 08 Jul 2013 15:13:07 +0100
+
 libapache2-mod-encoding (20040616-5.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u libapache2-mod-encoding-20040616/debian/control 
libapache2-mod-encoding-20040616/debian/control
--- libapache2-mod-encoding-20040616/debian/control
+++ libapache2-mod-encoding-20040616/debian/control
@@ -2,13 +2,13 @@
 Section: net
 Priority: optional
 Maintainer: Tatsuki Sugiura <s...@nemui.org>
-Build-Depends: debhelper (>= 4.0.0), libiconv-hook-dev, apache2-threaded-dev 
(>= 2.0.50-9) | apache2-dev (>= 2.0.50-9)
+Build-Depends: debhelper (>= 4.0.0), libiconv-hook-dev, dh-apache2, 
apache2-dev (>= 2.0.50-9)
 Standards-Version: 3.7.2.2
 Uploaders: Taku YASUI <t...@debian.or.jp>
 
 Package: libapache2-mod-encoding
 Architecture: any
-Depends: apache2.2-common, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Apache2 module for non-ascii filename interoperability
  This module improves non-ascii filename interoperability of
  apache (and mod_dav).
diff -u libapache2-mod-encoding-20040616/debian/rules 
libapache2-mod-encoding-20040616/debian/rules
--- libapache2-mod-encoding-20040616/debian/rules
+++ libapache2-mod-encoding-20040616/debian/rules
@@ -61,14 +61,6 @@
 
        # Add here commands to install the package into 
debian/libapache2-mod-encoding.
        #$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-encoding
-       mkdir -p \
-         $(CURDIR)/debian/libapache2-mod-encoding/usr/lib/apache2/modules
-       install -m 644 *.so \
-         $(CURDIR)/debian/libapache2-mod-encoding/usr/lib/apache2/modules
-       mkdir -p \
-         $(CURDIR)/debian/libapache2-mod-encoding/etc/apache2/mods-available
-       install -m 644 debian/encoding.load \
-         $(CURDIR)/debian/libapache2-mod-encoding/etc/apache2/mods-available
 
 
 # Build architecture-independent files here.
@@ -83,6 +75,7 @@
        dh_installdocs
        dh_installexamples
 #      dh_install
+       dh_apache2
 #      dh_installmenu
 #      dh_installdebconf       
 #      dh_installlogrotate
only in patch2:
unchanged:
--- libapache2-mod-encoding-20040616.orig/debian/apache2
+++ libapache2-mod-encoding-20040616/debian/apache2
@@ -0,0 +1,2 @@
+mod mod_encoding.so
+mod debian/encoding.load

Thanks,

-- 
Colin Watson                                       [cjwat...@debian.org]


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to