Source: libfcgi
Version: 2.4.0-8.3
Severity: wishlist
Tags: patch

Hi,

It would be useful to be able to install libfcgi-dev for multiple
architectures simultaneously. This can be achieved using multiarch. I am
attaching a patch that converts libfcgi to multiarch. If you apply it,
keep the following aspects in mind:

 * 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).

Helmut
diff -Nru libfcgi-2.4.0/debian/changelog libfcgi-2.4.0/debian/changelog
--- libfcgi-2.4.0/debian/changelog      2014-08-08 13:05:23.000000000 +0200
+++ libfcgi-2.4.0/debian/changelog      2016-05-06 12:54:41.000000000 +0200
@@ -1,3 +1,14 @@
+libfcgi (2.4.0-8.4) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Enable Multi-Arch: (Closes: #-1)
+    + 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 cgi-fcgi to avoid a circular dependency.
+
+ -- Helmut Grohne <h.gro...@intenta.de>  Fri, 06 May 2016 12:47:58 +0200
+
 libfcgi (2.4.0-8.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libfcgi-2.4.0/debian/compat libfcgi-2.4.0/debian/compat
--- libfcgi-2.4.0/debian/compat 2010-02-08 16:27:34.000000000 +0100
+++ libfcgi-2.4.0/debian/compat 2016-05-06 12:49:18.000000000 +0200
@@ -1 +1 @@
-7
+9
diff -Nru libfcgi-2.4.0/debian/control libfcgi-2.4.0/debian/control
--- libfcgi-2.4.0/debian/control        2014-08-08 12:50:29.000000000 +0200
+++ libfcgi-2.4.0/debian/control        2016-05-06 12:50:47.000000000 +0200
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Tatsuki Sugiura <s...@nemui.org>
-Build-Depends: debhelper (>> 7.0.0), dh-autoreconf
+Build-Depends: debhelper (>= 9), dh-autoreconf
 Standards-Version: 3.9.5
 Uploaders: Taku YASUI <t...@debian.or.jp>
 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.
diff -Nru libfcgi-2.4.0/debian/libfcgi-bin.install 
libfcgi-2.4.0/debian/libfcgi-bin.install
--- libfcgi-2.4.0/debian/libfcgi-bin.install    1970-01-01 01:00:00.000000000 
+0100
+++ libfcgi-2.4.0/debian/libfcgi-bin.install    2016-05-06 12:52:40.000000000 
+0200
@@ -0,0 +1 @@
+usr/bin/*
diff -Nru libfcgi-2.4.0/debian/libfcgi-bin.manpages 
libfcgi-2.4.0/debian/libfcgi-bin.manpages
--- libfcgi-2.4.0/debian/libfcgi-bin.manpages   1970-01-01 01:00:00.000000000 
+0100
+++ libfcgi-2.4.0/debian/libfcgi-bin.manpages   2014-08-08 12:54:03.000000000 
+0200
@@ -0,0 +1 @@
+debian/cgi-fcgi.1
diff -Nru libfcgi-2.4.0/debian/libfcgi-dev.install 
libfcgi-2.4.0/debian/libfcgi-dev.install
--- libfcgi-2.4.0/debian/libfcgi-dev.install    2014-08-08 13:06:13.000000000 
+0200
+++ libfcgi-2.4.0/debian/libfcgi-dev.install    2016-05-06 12:53:15.000000000 
+0200
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff -Nru libfcgi-2.4.0/debian/libfcgi0ldbl.install 
libfcgi-2.4.0/debian/libfcgi0ldbl.install
--- libfcgi-2.4.0/debian/libfcgi0ldbl.install   2010-02-08 16:27:34.000000000 
+0100
+++ libfcgi-2.4.0/debian/libfcgi0ldbl.install   2016-05-06 12:53:28.000000000 
+0200
@@ -1,2 +1 @@
-usr/bin/*
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -Nru libfcgi-2.4.0/debian/libfcgi0ldbl.manpages 
libfcgi-2.4.0/debian/libfcgi0ldbl.manpages
--- libfcgi-2.4.0/debian/libfcgi0ldbl.manpages  2014-08-08 12:54:03.000000000 
+0200
+++ libfcgi-2.4.0/debian/libfcgi0ldbl.manpages  1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-debian/cgi-fcgi.1
diff -Nru libfcgi-2.4.0/debian/rules libfcgi-2.4.0/debian/rules
--- libfcgi-2.4.0/debian/rules  2014-08-08 13:04:34.000000000 +0200
+++ libfcgi-2.4.0/debian/rules  2016-05-06 12:54:02.000000000 +0200
@@ -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