Control: tags -1 + pending

On Fri, May 06, 2016 at 01:56:16PM +0200, Helmut Grohne wrote:
>  * It bumps the debhelper compatibility level from 7 to 9, because
>    debhelper 9 makes supporting multiarch much easier.
>  * It adds a new binary package libfcgi-bin and thus goes through NEW.
>  * It doesn't pass simple piuparts, because piuparts does not handle
>    complex upgrades that involve multiple packages by default (see
>    #766543).

I am uploading the slightly updated (only d/changelog) patch attached as
a NMU to delayed/15. Please contact me if I should delay it any longer.

Helmut
--- libfcgi-2.4.0/debian/changelog
+++ libfcgi-2.4.0/debian/changelog
@@ -1,3 +1,14 @@
+libfcgi (2.4.0-8.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Enable Multi-Arch: (Closes: #823600)
+    + Switch to debhelper 9 to support multiarch paths.
+      + dh option --with must come after sequence
+    + Split cgi-fcgi to separate M-A:foreign package libfcgi-bin.
+    + libfcgi0ldbl only Recommends libcgi-fcgi to avoid a circular dependency.
+
+ -- Helmut Grohne <[email protected]>  Fri, 06 May 2016 12:47:58 +0200
+
 libfcgi (2.4.0-8.3) unstable; urgency=medium
 
   * Non-maintainer upload.
--- libfcgi-2.4.0/debian/compat
+++ libfcgi-2.4.0/debian/compat
@@ -1 +1 @@
-7
+9
--- libfcgi-2.4.0/debian/control
+++ libfcgi-2.4.0/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Tatsuki Sugiura <[email protected]>
-Build-Depends: debhelper (>> 7.0.0), dh-autoreconf
+Build-Depends: debhelper (>= 9), dh-autoreconf
 Standards-Version: 3.9.5
 Uploaders: Taku YASUI <[email protected]>
 Homepage: http://www.fastcgi.com/drupal/
@@ -11,6 +11,7 @@
 Section: libdevel
 Architecture: any
 Depends: libfcgi0ldbl (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Header files of FastCGI
  FastCGI is a language independent, scalable, open extension
  to CGI that provides high performance without the limitations
@@ -21,9 +22,26 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libfcgi-bin (= ${binary:Version})
 Conflicts: libfcgi0, libfcgi0c2
 Replaces: libfcgi0, libfcgi0c2
+Multi-Arch: same
 Description: Shared library of FastCGI
  FastCGI is a language independent, scalable, open extension
  to CGI that provides high performance without the limitations
  of server specific APIs.
+
+Package: libfcgi-bin
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libfcgi0ldbl (<< 2.4.0-8.4)
+Replaces: libfcgi0ldbl (<< 2.4.0-8.4)
+Multi-Arch: foreign
+Description: FastCGI bridge from CGI
+ FastCGI is a language independent, scalable, open extension
+ to CGI that provides high performance without the limitations
+ of server specific APIs.
+ .
+ This package contains the cgi-fcgi utility to bridge between CGI
+ and FastCGI.
--- libfcgi-2.4.0/debian/libfcgi-bin.install
+++ libfcgi-2.4.0/debian/libfcgi-bin.install
@@ -0,0 +1 @@
+usr/bin/*
--- libfcgi-2.4.0/debian/libfcgi-bin.manpages
+++ libfcgi-2.4.0/debian/libfcgi-bin.manpages
@@ -0,0 +1 @@
+debian/cgi-fcgi.1
--- libfcgi-2.4.0/debian/libfcgi-dev.install
+++ libfcgi-2.4.0/debian/libfcgi-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
--- libfcgi-2.4.0/debian/libfcgi0ldbl.install
+++ libfcgi-2.4.0/debian/libfcgi0ldbl.install
@@ -1,2 +1 @@
-usr/bin/*
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
--- libfcgi-2.4.0/debian/libfcgi0ldbl.manpages
+++ libfcgi-2.4.0/debian/libfcgi0ldbl.manpages
@@ -1 +0,0 @@
-debian/cgi-fcgi.1
--- libfcgi-2.4.0/debian/rules
+++ libfcgi-2.4.0/debian/rules
@@ -3,7 +3,7 @@
 export AUTOMAKE=automake --foreign
 
 %:
-       dh --with autoreconf $@
+       dh $@ --with autoreconf
 
 override_dh_auto_configure:
        dh_auto_configure -- $(shell dpkg-buildflags --export=cmdline)

Reply via email to