Control: tag -1 pending

On Mon, Jul 08, 2013 at 05:08:15PM +0200, Arno Töll wrote:
> On 08.07.2013 16:26, Colin Watson wrote:
> > -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)
> 
> This is all fine, though (>= 2.0.50-9) is trivially satisfied for eons
> in Debian. You may keep it as is, but any version of Apache provided in
> Debian since Sarge (I think) satisfies this dependency.

Yep - I decided to leave this as-is in an NMU on the principle of
minimal change.

> > -Depends: apache2.2-common, ${shlibs:Depends}
> > +Depends: ${shlibs:Depends}, ${misc:Depends}
> 
> Perfect. That's the most important part of the whole transition. That
> said, I never tested dh-apache2 at such low compat levels. Please ensure
> it works correctly and adds apache2-api-20120211 to ${misc:Depends}.

It does, and maintainer scripts look sensible.

> Everything else looks correct, too. Please note, I did not compile the
> module with your patch. Please pay attention whether the upstream
> codebase still compiles against the 2.4 APIs. In particular the build
> system is often not triggering a fatal build failure for obsolete
> symbols due to the nature of a plugin. However, may test rebuild last
> year [1] indicated it would still work indeed.

The build isn't completely clean, but I've checked over the warnings
that are emitted and they appear to be harmless.

> Apart, please go ahead an NMU the module as soon as you see it fits to you.

Thanks for the review.  Dear maintainer, I've uploaded the following
patch as an NMU to try to help unblock the Apache 2.4 transition.

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) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Port to Apache 2.4 (closes: #666842).
+
+ -- Colin Watson <cjwat...@debian.org>  Mon, 08 Jul 2013 16:57:36 +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

Regards,

-- 
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