Please consider the attached patch for libcgicc5.I have attached the libcgicc_3.2.16-0.1.debian.tar.xz file from a successful build of libgcc5 with the upstream version 3.2.16. Alternatively, the diff between the latest package in sid 3.2.9-3 and my NMU version 3.2.16-0.1 is also attached.
The debian/changelog might have to be updated with a proper debian developer email address, and a non-NMU version number, if my patch is accepted.
Thanks, Thomas
libcgicc_3.2.16-0.1.debian.tar.xz
Description: application/xz
diff -urN orig/debian/changelog mine/debian/changelog --- orig/debian/changelog 2011-04-12 02:06:09.000000000 +0100 +++ mine/debian/changelog 2016-07-31 16:46:35.000000000 +0100 @@ -1,3 +1,15 @@ +libcgicc (3.2.16-0.1) unstable; urgency=low + + * NMU upload + * New upstream release (closes: #833081, #811988, #798624, #645616) + * Updated to Standards-Version 3.9.8 (no changes required) + * Updated to debhelper 9, updated Build-Depends + * Updated the Vcs URLs in debian/control with the upstream sources + * Updated debian/*.install and removed the install directory where source and + destination directories are the same. + + -- Thomas Pircher <tehpeh-deb...@tty1.net> Fri, 29 Jul 2016 21:00:13 +0100 + libcgicc (3.2.9-3) unstable; urgency=low * Fix binary-only build by adding --no-run-if-empty to xargs in the diff -urN orig/debian/compat mine/debian/compat --- orig/debian/compat 2011-04-08 00:49:34.000000000 +0100 +++ mine/debian/compat 2016-07-29 21:54:06.000000000 +0100 @@ -1 +1 @@ -7 +9 diff -urN orig/debian/control mine/debian/control --- orig/debian/control 2011-04-10 14:12:20.000000000 +0100 +++ mine/debian/control 2016-07-30 20:42:08.000000000 +0100 @@ -1,12 +1,12 @@ Source: libcgicc Priority: optional -Section: libs Maintainer: Chris Butler <chr...@debian.org> -Build-Depends: debhelper (>> 7.0.50~), automake, libtool, doxygen, dh-autoreconf -Standards-Version: 3.9.2 +Build-Depends: debhelper (>=9), automake, libtool, autotools-dev, doxygen +Standards-Version: 3.9.8 +Section: libs Homepage: http://www.gnu.org/software/cgicc/ -Vcs-Git: git://git.crustynet.org.uk/libcgicc.git/ -Vcs-Browser: http://git.crustynet.org.uk/libcgicc.git +Vcs-Cvs: :pserver:anonym...@cvs.savannah.gnu.org:/sources/cgicc +Vcs-Browser: http://cvs.savannah.gnu.org/viewvc/?root=cgicc Package: libcgicc-doc Section: doc @@ -17,18 +17,18 @@ CGI applications for the World Wide Web. libcgicc performs the following functions: . - * Parses both GET and POST form data transparently. + * Parses both GET and POST form data transparently. * Provides string, integer, floating-point and single- and multiple-choice - retrieval methods for form data. + retrieval methods for form data. * Provides methods for saving and restoring CGI environments to aid in - application debugging. + application debugging. * Provides full on-the-fly HTML generation capabilities, with support for - cookies. - * Supports HTTP file upload. - * Compatible with FastCGI. + cookies. + * Supports HTTP file upload. + * Compatible with FastCGI. . This package contains documentation on the usage of the library. - + Package: libcgicc5-dev Section: libdevel Architecture: any @@ -42,15 +42,15 @@ CGI applications for the World Wide Web. libcgicc performs the following functions: . - * Parses both GET and POST form data transparently. + * Parses both GET and POST form data transparently. * Provides string, integer, floating-point and single- and multiple-choice - retrieval methods for form data. + retrieval methods for form data. * Provides methods for saving and restoring CGI environments to aid in - application debugging. + application debugging. * Provides full on-the-fly HTML generation capabilities, with support for - cookies. - * Supports HTTP file upload. - * Compatible with FastCGI. + cookies. + * Supports HTTP file upload. + * Compatible with FastCGI. . This package contains development files needed for writing and compiling applications that use libcgicc. @@ -66,15 +66,15 @@ CGI applications for the World Wide Web. libcgicc performs the following functions: . - * Parses both GET and POST form data transparently. + * Parses both GET and POST form data transparently. * Provides string, integer, floating-point and single- and multiple-choice - retrieval methods for form data. + retrieval methods for form data. * Provides methods for saving and restoring CGI environments to aid in - application debugging. + application debugging. * Provides full on-the-fly HTML generation capabilities, with support for - cookies. - * Supports HTTP file upload. - * Compatible with FastCGI. + cookies. + * Supports HTTP file upload. + * Compatible with FastCGI. . This package contains runtime library files for running applications that use libcgicc. diff -urN orig/debian/copyright mine/debian/copyright --- orig/debian/copyright 2011-04-08 00:49:34.000000000 +0100 +++ mine/debian/copyright 2016-07-30 20:06:04.000000000 +0100 @@ -1,38 +1,46 @@ -This package was downloaded from http://www.gnu.org/software/cgicc +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cgicc +Source: http://www.gnu.org/software/cgicc + Files: debian/* -Copyright: © 2003-2008 Chris Butler <chr...@debian.org> +Copyright: 2003-2008 Chris Butler <chr...@debian.org> License: GPL-2+ The Debian packaging information is under the GPL, version 2 or later Files: * -Copyright: © 1996 - 2004 Stephen F. Booth <sbo...@gnu.org> - 2007 Sebastien DIAZ <sebastien.d...@gmail.com> +Copyright: 1996-2004 Stephen F. Booth <sbo...@gnu.org> + 2007-2014 Sebastien DIAZ <sebastien.d...@gmail.com> License: LGPL-3+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - -On Debian systems, the complete text of the GNU Lesser General Public License can -be found in `/usr/share/common-licenses/LGPL-3'. Files: doc/* -Copyright: © 1996 - 2004 Stephen F. Booth <sbo...@gnu.org> -License: GFDL-1.1+ - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 or - any later version published by the Free Software Foundation; with no - Invariant Sections, with no Front Cover Texts, and with no Back-Cover - Texts. +Copyright: 1996-2004 Stephen F. Booth <sbo...@gnu.org> +License: GFDL-1.2+ -On Debian systems, the complete text of the GNU Free Documentation License can -be found in `/usr/share/common-licenses/GFDL'. + +License: LGPL-3+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + . + On Debian systems, the complete text of the GNU Lesser General Public License can + be found in `/usr/share/common-licenses/LGPL-3'. + +License: GFDL-1.2+ + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 or + any later version published by the Free Software Foundation; with no + Invariant Sections, with no Front Cover Texts, and with no Back-Cover + Texts. + . + On Debian systems, the complete text of the GNU Free Documentation License can + be found in `/usr/share/common-licenses/GFDL'. diff -urN orig/debian/libcgicc1.dirs mine/debian/libcgicc1.dirs --- orig/debian/libcgicc1.dirs 1970-01-01 01:00:00.000000000 +0100 +++ mine/debian/libcgicc1.dirs 2016-07-30 18:48:00.000000000 +0100 @@ -0,0 +1 @@ +usr/lib diff -urN orig/debian/libcgicc1.install mine/debian/libcgicc1.install --- orig/debian/libcgicc1.install 1970-01-01 01:00:00.000000000 +0100 +++ mine/debian/libcgicc1.install 2016-07-30 19:13:43.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/lib*.so.* diff -urN orig/debian/libcgicc5-dev.install mine/debian/libcgicc5-dev.install --- orig/debian/libcgicc5-dev.install 2011-04-08 00:51:39.000000000 +0100 +++ mine/debian/libcgicc5-dev.install 2016-07-30 19:14:06.000000000 +0100 @@ -1,6 +1,6 @@ -usr/include/* usr/include -usr/lib/lib*.a usr/lib -usr/lib/lib*.so usr/lib -usr/lib/pkgconfig/* usr/lib/pkgconfig -usr/bin/* usr/bin -usr/share/aclocal/* usr/share/aclocal +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/* +usr/bin/* +usr/share/aclocal/* diff -urN orig/debian/libcgicc5.install mine/debian/libcgicc5.install --- orig/debian/libcgicc5.install 2011-04-08 00:49:34.000000000 +0100 +++ mine/debian/libcgicc5.install 2016-07-30 19:14:11.000000000 +0100 @@ -1 +1 @@ -usr/lib/lib*.so.* usr/lib +usr/lib/lib*.so.* diff -urN orig/debian/libcgicc-dev.dirs mine/debian/libcgicc-dev.dirs --- orig/debian/libcgicc-dev.dirs 1970-01-01 01:00:00.000000000 +0100 +++ mine/debian/libcgicc-dev.dirs 2016-07-29 21:00:18.000000000 +0100 @@ -0,0 +1,2 @@ +usr/lib +usr/include diff -urN orig/debian/libcgicc-dev.install mine/debian/libcgicc-dev.install --- orig/debian/libcgicc-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ mine/debian/libcgicc-dev.install 2016-07-30 19:14:23.000000000 +0100 @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/lib*.so +usr/lib/pkgconfig/* +usr/share/pkgconfig/* diff -urN orig/debian/patches/0001-Create-a-pkg-config-file.patch mine/debian/patches/0001-Create-a-pkg-config-file.patch --- orig/debian/patches/0001-Create-a-pkg-config-file.patch 2011-04-09 01:07:50.000000000 +0100 +++ mine/debian/patches/0001-Create-a-pkg-config-file.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -From: Chris Butler <chr...@debian.org> -Date: Fri, 8 Apr 2011 01:04:28 +0100 -Subject: Create a pkg-config file - ---- - support/Makefile.am | 2 ++ - support/cgicc.pc.in | 12 ++++++++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) - create mode 100644 support/cgicc.pc.in - -diff --git a/support/Makefile.am b/support/Makefile.am -index 52a03fe..5038c02 100644 ---- a/support/Makefile.am -+++ b/support/Makefile.am -@@ -7,3 +7,5 @@ depcomp install-sh ltmain.sh missing - - bin_SCRIPTS = cgicc-config - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = cgicc.pc -diff --git a/support/cgicc.pc.in b/support/cgicc.pc.in -new file mode 100644 -index 0000000..287120a ---- /dev/null -+++ b/support/cgicc.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+includedir=@includedir@ -+libdir=@libdir@ -+ -+Name: cgicc -+Description: cgicc is a C++ library for writing CGI applications -+Version: @VERSION@ -+Requires: -+Conflicts: -+Libs: -L${libdir} -lcgicc -+Cflags: -I${includedir} --- diff -urN orig/debian/patches/0002-fix-g-4.3-FTBFS.patch mine/debian/patches/0002-fix-g-4.3-FTBFS.patch --- orig/debian/patches/0002-fix-g-4.3-FTBFS.patch 2011-04-09 01:07:50.000000000 +0100 +++ mine/debian/patches/0002-fix-g-4.3-FTBFS.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -From: Chris Butler <chr...@debian.org> -Date: Fri, 8 Apr 2011 01:10:45 +0100 -Subject: fix g++-4.3 FTBFS - ---- - cgicc/HTMLElement.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/cgicc/HTMLElement.cpp b/cgicc/HTMLElement.cpp -index a76b05c..c0e2ed2 100644 ---- a/cgicc/HTMLElement.cpp -+++ b/cgicc/HTMLElement.cpp -@@ -30,6 +30,8 @@ - #include "cgicc/HTMLElement.h" - #include "cgicc/HTMLElementList.h" - -+#include <cstring> -+ - // ============================================================ - // Class HTMLElement - // ============================================================ --- diff -urN orig/debian/patches/0003-fix-autoconf-automake-files-to-fit-policy.patch mine/debian/patches/0003-fix-autoconf-automake-files-to-fit-policy.patch --- orig/debian/patches/0003-fix-autoconf-automake-files-to-fit-policy.patch 2011-04-09 01:07:50.000000000 +0100 +++ mine/debian/patches/0003-fix-autoconf-automake-files-to-fit-policy.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -From: Chris Butler <chr...@debian.org> -Date: Fri, 8 Apr 2011 01:11:20 +0100 -Subject: fix autoconf/automake files to fit policy - ---- - configure.ac | 12 ++---------- - doc/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 23ae071..8477b45 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,10 +77,6 @@ AC_MSG_CHECKING(whether to build the cgicc demos) - AC_MSG_RESULT($cgicc_demos) - AM_CONDITIONAL(DEMOS, test "$cgicc_demos" = yes) - --if test "$cgicc_demos" = yes; then -- AC_CONFIG_FILES(demo/Makefile) --fi -- - dnl enable/disable the FastCgi demos, if specified - AC_ARG_ENABLE(fcgi-demos, - [ --enable-fcgi-demos build FastCgi demos [[default=no]]], -@@ -99,13 +95,9 @@ if test "$cgicc_fcgi_demos" = yes; then - fi - AC_SUBST(FCGI_LIBS) - --dnl Output contrib/Makefile if either of the demos are enabled --if test "$cgicc_demos" = yes || test "$cgicc_fcgi_demos" = yes; then -- AC_CONFIG_FILES(contrib/Makefile) --fi -- - dnl Always output certain files - AC_CONFIG_FILES([Makefile cgicc/Makefile cgicc/CgiDefs.h -- support/Makefile support/cgicc-config doc/Makefile doc/Doxyfile]) -+ support/Makefile support/cgicc-config doc/Makefile doc/Doxyfile -+ demo/Makefile contrib/Makefile support/cgicc.pc]) - - AC_OUTPUT -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 7071315..11d3ff1 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -2,7 +2,7 @@ - - CLEANFILES = *~ stamp - --docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION) -+# docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION) - - FILES = index.tmpl license.tmpl lists.tmpl bugs.tmpl demos.tmpl \ - cgi-overview.tmpl tutorial.tmpl lib-overview.tmpl COPYING COPYING.LIB \ --- diff -urN orig/debian/patches/pkg-config.patch mine/debian/patches/pkg-config.patch --- orig/debian/patches/pkg-config.patch 1970-01-01 01:00:00.000000000 +0100 +++ mine/debian/patches/pkg-config.patch 2016-07-30 20:24:43.000000000 +0100 @@ -0,0 +1,21 @@ +Changed the pkg config file. +--- a/cgicc.pc.in ++++ b/cgicc.pc.in +@@ -1,11 +1,12 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ ++libdir=@libdir@ + + Name: cgicc + Description: GNU cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web. +-Requires: + Version: @VERSION@ +-Libs: -L${libdir} +-Cflags: +\ No newline at end of file ++Requires: ++Conflicts: ++Libs: -L${libdir} -lcgicc ++Cflags: -I${includedir} diff -urN orig/debian/patches/series mine/debian/patches/series --- orig/debian/patches/series 2011-04-09 01:07:50.000000000 +0100 +++ mine/debian/patches/series 2016-07-30 10:06:46.000000000 +0100 @@ -1,3 +1 @@ -0001-Create-a-pkg-config-file.patch -0002-fix-g-4.3-FTBFS.patch -0003-fix-autoconf-automake-files-to-fit-policy.patch +pkg-config.patch diff -urN orig/debian/rules mine/debian/rules --- orig/debian/rules 2011-04-11 19:23:32.000000000 +0100 +++ mine/debian/rules 2016-07-31 09:57:51.000000000 +0100 @@ -1,16 +1,21 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 %: - dh --with autoreconf $@ + dh $@ --with autotools_dev DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
