Attached the diff, which was missing in the previous mail.
diff -urN orig/debian/cgicc-config.1 mine/debian/cgicc-config.1
--- orig/debian/cgicc-config.1 2011-04-08 00:49:34.000000000 +0100
+++ mine/debian/cgicc-config.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CGICC-CONFIG 1 "11 September 07"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cgicc-config \- script to get information about the installed version of cgicc
-.SH SYNOPSIS
-.B cgicc-config
-[\-\-prefix] [\-\-exec\-prefix] [\-\-version] [\-\-libs] [\-\-static-libs] [\-\-cflags]
-.SH DESCRIPTION
-.B cgicc-config
-displays information about the libcgicc installation
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-.TP
-.B \-\-prefix
-Display architecture-independent installation dir
-.TP
-.B \-\-exec\-prefix
-Display architecture-dependent installation dir
-.TP
-.B \-\-includedir
-Display header file installation dir
-.TP
-.B \-\-libdir
-Display object-code installation dir
-.TP
-.B \-\-host
-Display host information
-.TP
-.B \-\-version
-Display version information
-.TP
-.B \-\-help
-Display summary of options.
-.SH AUTHOR
-This manual page was written by Chris Butler <chr...@debian.org>,
-for the Debian project (but may be used by others).
diff -urN orig/debian/changelog mine/debian/changelog
--- orig/debian/changelog 2011-04-12 02:06:09.000000000 +0100
+++ mine/debian/changelog 2016-09-08 19:41:26.000000000 +0100
@@ -1,3 +1,18 @@
+libcgicc (3.2.16-0.1) unstable; urgency=low
+
+ * Non-maintainer 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.
+ * Added Multiarch support.
+ * Updated debian/*.install and removed the install directory where source and
+ destination directories are the same.
+ * Added patch to generate non-empty index.html in the documentation.
+ * Removed old-style config file.
+ * Commented out the broken Vcs URLs in debian/control.
+
+ -- Thomas Pircher <tehpeh-deb...@tty1.net> Thu, 08 Sep 2016 19:41:26 +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-09-08 19:41:26.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-09-08 19:41:26.000000000 +0100
@@ -2,11 +2,11 @@
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, doxygen, dh-autoreconf
+Standards-Version: 3.9.8
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-Git: git://git.crustynet.org.uk/libcgicc.git/
+#Vcs-Browser: http://git.crustynet.org.uk/libcgicc.git
Package: libcgicc-doc
Section: doc
@@ -32,6 +32,7 @@
Package: libcgicc5-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libcgicc5 (= ${binary:Version}), ${misc:Depends}
Provides: libcgicc-dev
Conflicts: libcgicc-dev, libcgicc1-dev
@@ -60,6 +61,7 @@
Conflicts: libcgicc1
Section: libs
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: C++ class library for writing CGI applications (library)
An ANSI C++ compliant class library that greatly simplifies the creation of
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-09-08 19:41:26.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff -urN orig/debian/libcgicc5-dev.dirs mine/debian/libcgicc5-dev.dirs
--- orig/debian/libcgicc5-dev.dirs 2011-04-08 00:49:34.000000000 +0100
+++ mine/debian/libcgicc5-dev.dirs 2016-09-08 19:41:26.000000000 +0100
@@ -1,3 +1 @@
-usr/bin
-usr/lib
usr/include/cgicc
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-09-08 19:41:26.000000000 +0100
@@ -1,6 +1,5 @@
-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/share/aclocal/*
diff -urN orig/debian/libcgicc5-dev.manpages mine/debian/libcgicc5-dev.manpages
--- orig/debian/libcgicc5-dev.manpages 2011-04-10 14:12:20.000000000 +0100
+++ mine/debian/libcgicc5-dev.manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/cgicc-config.1
diff -urN orig/debian/libcgicc5.dirs mine/debian/libcgicc5.dirs
--- orig/debian/libcgicc5.dirs 2011-04-08 00:49:34.000000000 +0100
+++ mine/debian/libcgicc5.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib
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-09-08 19:41:26.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-09-08 19:41:26.000000000 +0100
@@ -0,0 +1 @@
+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-09-08 19:41:26.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 2016-09-08 19:41:26.000000000 +0100
@@ -1,39 +1,21 @@
-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@
+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: cgicc is a C++ library for writing CGI applications
-+Version: @VERSION@
+
+ 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/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/0002-Non-empty-html-index.patch mine/debian/patches/0002-Non-empty-html-index.patch
--- orig/debian/patches/0002-Non-empty-html-index.patch 1970-01-01 01:00:00.000000000 +0100
+++ mine/debian/patches/0002-Non-empty-html-index.patch 2016-09-08 19:41:26.000000000 +0100
@@ -0,0 +1,11 @@
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -470,7 +470,7 @@
+ fi;
+ DATE=`date '+%-d %b %Y'` VERSION=$(VERSION) $(DOXYGEN) Doxyfile
+ cp $(IMAGES) cgicc-doc.css html
+- if test ! -d html/index.html; then \
++ if test ! -f html/index.html; then \
+ echo empty> html/index.html; \
+ fi;
+ mv html/index.html html/index.html.bak
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/003-no-old-style-config.patch mine/debian/patches/003-no-old-style-config.patch
--- orig/debian/patches/003-no-old-style-config.patch 1970-01-01 01:00:00.000000000 +0100
+++ mine/debian/patches/003-no-old-style-config.patch 2016-09-08 19:41:26.000000000 +0100
@@ -0,0 +1,20 @@
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -80,7 +80,7 @@
+ host_triplet = @host@
+ subdir = support
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+- $(srcdir)/cgicc-config.in compile config.guess config.sub \
++ compile config.guess config.sub \
+ depcomp install-sh missing ltmain.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+@@ -270,7 +270,7 @@
+ EXTRA_DIST = ac_cxx_namespaces.m4 ac_cxx_have_stl.m4 config.guess config.sub \
+ depcomp install-sh ltmain.sh missing
+
+-bin_SCRIPTS = cgicc-config
++bin_SCRIPTS =
+ all: all-am
+
+ .SUFFIXES:
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-09-08 19:41:26.000000000 +0100
@@ -1,3 +1,3 @@
0001-Create-a-pkg-config-file.patch
-0002-fix-g-4.3-FTBFS.patch
-0003-fix-autoconf-automake-files-to-fit-policy.patch
+0002-Non-empty-html-index.patch
+003-no-old-style-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-09-08 19:41:26.000000000 +0100
@@ -10,13 +10,14 @@
#export DH_VERBOSE=1
%:
- dh --with autoreconf $@
+ dh $@ --with autoreconf
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
override_dh_auto_configure:
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --htmldir=\$${prefix}/share/doc/libcgicc-doc/html --disable-demos
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --htmldir=\$${prefix}/share/doc/libcgicc-doc/html --disable-demos
override_dh_auto_install:
dh_auto_install
