Package: libfcgi
Version: 2.4.0-8.1
Followup-For: Bug #633182
User: [email protected]
Usertags: origin-ubuntu quantal ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/rules,control: Remove dependency_libs from .la files inline with
    recommendation from Ubuntu MIR review, specify debhelper (>= 7.0.50~)
    for override usage.
  * d/libfcgi0ldbl.manpages,rules: Don't install manpage using rules file.
  * d/libfcgi0ldbl.docs: Rationalized to prevent duplicate install of docs.
  * d/dirs: Dropped - not actually required and generates linitan warning.
  * d/control,rules: Drop use of quilt dh addon as this is provided by
    debhelper.
  * d/control: Bumped Standards-Version to 3.9.3:
    - d/copyright: Converted to machine readable format.

In addition to resolving the issue identified in this bug report I have also
had a general update of the packaging to remove surplus rules, files and
dependencies.

Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.5.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJQCSmiAAoJEL/srsug59jDf8QP/iUrxwEB86NwB5avtBe/aKUZ
sBBD+L0KWMvXzx0yC6H5rFSLaAJmeeTuWh0DCSCjRFga5V7Ob5oLrDEFCyiBdnnH
/CE2F5+e0OrCYYmqKUpgVg1WUJOs+SBV8IMXeaeG3eWeb22NAZYmqK58gSrjyFpQ
zr5LQd/XeOlXV3041UzjO7c+qHCPQPJiaJ+QK8QETfqkK4rm3GfJYtC4c0THBHbg
XNMF6392WzaxvvErFyogM/3viyk9lNlN12azHj4vFg0SsLA1nLcBvAej4qSRVPBw
2zMVl/2K70nDi9ezzfWZ/C6XHeMrOY1tCepxAmIBS9m+H20KQN9b3sY8Z51UaXIh
TS3FE1VrQRGTdloF+InFy/1hHIZtBVHsUfHpSUd0pp/EBfVGOeYOlpoWb+C8y7Ln
J+2yg6FPjD2KlOVKj35dQ/JOOwiH9Upoltt5k3H42aLicDvmt+z0Ix7CWJtnn3s9
ATjkn+f4AYzXUP8E1PvbovdX9W3vsiDXnjvKYgoFf+M4IS47Ks1L5GFfBG/c9DqB
R45QjSLpeTo85NMmitZqb5+JIC1uChCRc1xvGCTOvwXS5A9xM2x7GLXlO7RA1e7F
FrcAl3MGRMYldaoeKcUr/mDjat4xGx9L1+cIvWrautf6+gov1SwlKb7+SIWqAntj
d19kSEJEVnuT37946vsV
=Ay40
-----END PGP SIGNATURE-----
diff -Nru libfcgi-2.4.0/debian/changelog libfcgi-2.4.0/debian/changelog
diff -Nru libfcgi-2.4.0/debian/control libfcgi-2.4.0/debian/control
--- libfcgi-2.4.0/debian/control	2012-07-20 09:54:19.000000000 +0100
+++ libfcgi-2.4.0/debian/control	2012-07-20 10:31:06.000000000 +0100
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[email protected]>
 XSBC-Original-Maintainer: Tatsuki Sugiura <[email protected]>
-Build-Depends: debhelper (>> 7.0.0), quilt
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.3
 Uploaders: Taku YASUI <[email protected]>
 Homepage: http://www.fastcgi.com/drupal/
 
diff -Nru libfcgi-2.4.0/debian/copyright libfcgi-2.4.0/debian/copyright
--- libfcgi-2.4.0/debian/copyright	2012-07-14 16:04:29.000000000 +0100
+++ libfcgi-2.4.0/debian/copyright	2012-07-20 10:34:53.000000000 +0100
@@ -1,37 +1,40 @@
-This package was debianized by Tatsuki Sugiura <[email protected]> on
-Tue,  8 Jul 2003 13:58:36 +0900.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://www.fastcgi.com/#TheDevKit
 
-It was downloaded from http://www.fastcgi.com/#TheDevKit
-
-Upstream Author: Open Market, Inc.
-
-Copyright: Copyright (c) 1996 Open Market, Inc.
-
-This FastCGI application library source and object code (the
-"Software") and its documentation (the "Documentation") are
-copyrighted by Open Market, Inc ("Open Market").  The following terms
-apply to all files associated with the Software and Documentation
-unless explicitly disclaimed in individual files.
-
-Open Market permits you to use, copy, modify, distribute, and license
-this Software and the Documentation for any purpose, provided that
-existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions.  No written
-agreement, license, or royalty fee is required for any of the
-authorized uses.  Modifications to this Software and Documentation may
-be copyrighted by their authors and need not follow the licensing
-terms described here.  If modifications to this Software and
-Documentation have new licensing terms, the new terms must be clearly
-indicated on the first page of each file where they apply.
-
-OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE
-SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN
-NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
-DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE
-DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR
-LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.  THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS".
-OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR
-OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION.
+Files: *
+Copyright: 1996 Open Market, Inc.
+License: FASTCGI
+
+Files: debian/*
+Copyright: Tatsuki Sugiura <[email protected]>
+License: FASTCGI
+
+License: FASTCGI
+ This FastCGI application library source and object code (the
+ "Software") and its documentation (the "Documentation") are
+ copyrighted by Open Market, Inc ("Open Market").  The following terms
+ apply to all files associated with the Software and Documentation
+ unless explicitly disclaimed in individual files.
+ .
+ Open Market permits you to use, copy, modify, distribute, and license
+ this Software and the Documentation for any purpose, provided that
+ existing copyright notices are retained in all copies and that this
+ notice is included verbatim in any distributions.  No written
+ agreement, license, or royalty fee is required for any of the
+ authorized uses.  Modifications to this Software and Documentation may
+ be copyrighted by their authors and need not follow the licensing
+ terms described here.  If modifications to this Software and
+ Documentation have new licensing terms, the new terms must be clearly
+ indicated on the first page of each file where they apply.
+ .
+ OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE
+ SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN
+ NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
+ DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE
+ DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR
+ CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR
+ LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGES.  THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS".
+ OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR
+ OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION.
diff -Nru libfcgi-2.4.0/debian/dirs libfcgi-2.4.0/debian/dirs
--- libfcgi-2.4.0/debian/dirs	2012-07-14 16:04:29.000000000 +0100
+++ libfcgi-2.4.0/debian/dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-lib
diff -Nru libfcgi-2.4.0/debian/libfcgi0ldbl.docs libfcgi-2.4.0/debian/libfcgi0ldbl.docs
--- libfcgi-2.4.0/debian/libfcgi0ldbl.docs	2012-07-14 16:04:29.000000000 +0100
+++ libfcgi-2.4.0/debian/libfcgi0ldbl.docs	2012-07-20 10:41:07.000000000 +0100
@@ -1,4 +1,2 @@
 README
-doc/fastcgi-prog-guide/*
-doc/fastcgi-whitepaper/*
 doc/*
diff -Nru libfcgi-2.4.0/debian/libfcgi0ldbl.manpages libfcgi-2.4.0/debian/libfcgi0ldbl.manpages
--- libfcgi-2.4.0/debian/libfcgi0ldbl.manpages	1970-01-01 01:00:00.000000000 +0100
+++ libfcgi-2.4.0/debian/libfcgi0ldbl.manpages	2012-07-20 10:24:28.000000000 +0100
@@ -0,0 +1 @@
+debian/cgi-fcgi.1
diff -Nru libfcgi-2.4.0/debian/rules libfcgi-2.4.0/debian/rules
--- libfcgi-2.4.0/debian/rules	2012-07-14 16:04:29.000000000 +0100
+++ libfcgi-2.4.0/debian/rules	2012-07-20 10:30:19.000000000 +0100
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
 
-binary: install
-	dh --with quilt binary --before installman
-	dh_installman -p libfcgi0ldbl debian/cgi-fcgi.1
-	dh_compress
-	dh --with quilt binary --after installman
-
 %:
-	dh --with quilt $@
+	dh $@
+
+override_dh_auto_install:
+	dh_auto_install
+	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`

Reply via email to