[Pkg-voip-commits] [libcommoncpp2] 02/04: Imported Debian patch 1.8.1-5
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 11:47:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository libcommoncpp2.
commit c4fa1d7d35e53d78880c85d66e521d186b7c5879
Merge: fc8e786 0f436bc
Author: Mark Purcell <msp at debian.org>
Date: Sat Jun 23 16:02:03 2012 +1000
Imported Debian patch 1.8.1-5
ChangeLog | 14 +
Makefile.in | 212 +-
TODO | 14 +
aclocal.m4 | 328 +-
autoconf/config.guess | 107 +-
autoconf/config.sub | 67 +-
autoconf/depcomp | 87 +-
autoconf/install-sh | 5 +-
autoconf/ltmain.sh | 803 +-
autoconf/missing | 49 +-
autoconf/texinfo.tex | 913 +-
autogen.sh | 60 +-
commoncpp2.list | 22 +-
commoncpp2.spec | 4 +-
config.h.in | 259 +-
configure | 29577 ++++++++---------------
configure.ac | 344 +-
debian/README.source | 27 +
debian/changelog | 64 +
debian/compat | 2 +-
debian/control | 36 +-
debian/copyright | 6 +-
debian/libccgnu2-1.7-0.install | 1 -
debian/libccgnu2-1.8-0.install | 1 +
debian/libcommoncpp2-dev.install | 8 +-
debian/libcommoncpp2-doc.doc-base | 9 +
debian/libcommoncpp2-doc.lintian-overrides | 1 -
debian/patches/00list | 3 -
debian/patches/applog-inc-fcntl.patch | 52 +
debian/patches/caddr.diff | 16 +
debian/patches/cleaning_doc.dpatch | 11 +-
debian/patches/const_cast_conversion.dpatch | 28 -
debian/patches/cstdlib_sparc.dpatch | 19 -
debian/patches/fix_ciddr_ftbfs.dpatch | 30 +
debian/patches/series | 5 +
debian/patches/spelling-error-in-manpage.patch | 76 +
debian/rules | 20 +-
debian/source/format | 1 +
demo/Makefile.am | 9 +-
demo/Makefile.in | 113 +-
demo/SampleSocketPort.cpp | 502 +-
demo/cmdlineopt.cpp | 4 +-
demo/crc32.cpp | 17 +-
demo/test_alog.cpp | 120 +
doc/Makefile.am | 5 +
doc/Makefile.in | 195 +-
inc/Makefile.am | 2 +-
inc/Makefile.in | 142 +-
inc/cc++/Makefile.am | 11 +-
inc/cc++/Makefile.in | 130 +-
inc/cc++/address.h | 1449 +-
inc/cc++/applog.h | 593 +
inc/cc++/buffer.h | 456 +-
inc/cc++/cmdoptns.h | 568 +-
inc/cc++/common.h | 10 +-
inc/cc++/counter.h | 62 +-
inc/cc++/digest.h | 148 +-
inc/cc++/exception.h | 44 +-
inc/cc++/export.h | 12 +-
inc/cc++/file.h | 1372 +-
inc/cc++/functions.h | 16 +-
inc/cc++/mime.h | 206 +-
inc/cc++/misc.h | 1033 +-
inc/cc++/missing.h | 42 +-
inc/cc++/network.h | 72 +-
inc/cc++/numbers.h | 351 +-
inc/cc++/objcount.h | 17 +-
inc/cc++/object.h | 756 +-
inc/cc++/objlink.h | 45 +-
inc/cc++/objmap.h | 93 +-
inc/cc++/objsync.h | 22 +-
inc/cc++/oststring.h | 30 +-
inc/cc++/persist.h | 519 +-
inc/cc++/pointer.h | 136 +-
inc/cc++/process.h | 444 +-
inc/cc++/serial.h | 1264 +-
inc/cc++/slog.h | 352 +-
inc/cc++/socket.h | 3173 +--
inc/cc++/socketport.h | 532 +-
inc/cc++/ssl.h | 52 +-
inc/cc++/strchar.h | 100 +-
inc/cc++/string.h | 1510 +-
inc/cc++/template.h | 8 +-
inc/cc++/thread.h | 2276 +-
inc/cc++/tokenizer.h | 370 +-
inc/cc++/unix.h | 532 +-
inc/cc++/url.h | 720 +-
inc/cc++/xml.h | 436 +-
inc/cc++/zstream.h | 84 +-
m4/Makefile.am | 10 +-
m4/Makefile.in | 56 +-
m4/libtool.m4 | 144 +-
m4/ltoptions.m4 | 2 +-
m4/ltsugar.m4 | 20 +-
m4/ltversion.m4 | 10 +-
m4/ost_cxx.m4 | 597 +-
m4/ost_debug.m4 | 52 +-
m4/ost_dynamic.m4 | 65 +-
m4/ost_endian.m4 | 83 +-
m4/ost_getopt.m4 | 64 +-
m4/ost_maint.m4 | 96 +-
m4/ost_misc.m4 | 40 +-
m4/ost_poll.m4 | 30 +-
m4/ost_posix.m4 | 72 +-
m4/ost_prog.m4 | 78 +-
m4/ost_pthread.m4 | 803 +-
m4/ost_reentrant.m4 | 96 +-
m4/ost_signal.m4 | 70 +-
m4/ost_socket.m4 | 384 +-
m4/ost_ssl.m4 | 62 +-
m4/ost_stlport.m4 | 105 +-
m4/ost_string.m4 | 32 +-
m4/ost_systime.m4 | 24 +-
m4/ost_types.m4 | 59 +-
m4/ost_win32.m4 | 64 +-
m4/win32msc.m4 | 128 +-
src/Makefile.am | 10 +-
src/Makefile.in | 226 +-
src/applog.cpp | 1197 +
src/assoc.cpp | 52 +-
src/buffer.cpp | 343 +-
src/ccgnu2-config | 31 +-
src/ccgnu2-config.in | 27 +-
src/cidr.cpp | 362 +-
src/cmdoptns.cpp | 886 +-
src/date.cpp | 878 +-
src/digest.cpp | 164 +-
src/dir.cpp | 466 +-
src/dso.cpp | 343 +-
src/engine.cpp | 541 +-
src/event.cpp | 90 +-
src/exception.cpp | 38 +-
src/file.cpp | 2374 +-
src/friends.cpp | 102 +-
src/in6addr.cpp | 562 +-
src/inaddr.cpp | 536 +-
src/keydata.cpp | 981 +-
src/libccext2.pc | 4 +-
src/libccgnu2.pc | 4 +-
src/linked.cpp | 180 +-
src/lockfile.cpp | 272 +-
src/map.cpp | 236 +-
src/md5.cpp | 382 +-
src/mempager.cpp | 271 +-
src/mime.cpp | 86 +-
src/missing.cpp | 164 +-
src/mutex.cpp | 595 +-
src/nat.cpp | 389 +-
src/network.cpp | 176 +-
src/numbers.cpp | 210 +-
src/peer.cpp | 196 +-
src/persist.cpp | 72 +-
src/pointer.cpp | 60 +-
src/process.cpp | 638 +-
src/runlist.cpp | 186 +-
src/semaphore.cpp | 119 +-
src/serial.cpp | 2569 +-
src/simplesocket.cpp | 307 +-
src/slog.cpp | 736 +-
src/socket.cpp | 5287 ++--
src/socketport.cpp | 1326 +-
src/ssl.cpp | 588 +-
src/strchar.cpp | 270 +-
src/string.cpp | 1046 +-
src/thread.cpp | 2095 +-
src/threadkey.cpp | 38 +-
src/timer.cpp | 242 +-
src/tokenizer.cpp | 139 +-
src/unix.cpp | 842 +-
src/url.cpp | 1310 +-
src/urlstring.cpp | 346 +-
src/xml.cpp | 820 +-
src/zstream.cpp | 433 +-
tests/Makefile.in | 92 +-
w32/Makefile.in | 142 +-
w32/cc++/config.h | 118 +-
w32/ccext2.dsp | 4 +-
w32/ccext2.vcproj | 16 +-
w32/ccgnu2.dsp | 4 +-
w32/ccgnu2.vcproj | 24 +-
w32/vs2008/Makefile.in | 48 +-
w32/vs2008/ccext2.vcproj | 16 +-
w32/vs2008/ccgnu2.vcproj | 24 +-
183 files changed, 42483 insertions(+), 48530 deletions(-)
diff --cc debian/README.source
index 0000000,0000000..f6a9643
new file mode 100644
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,0 +1,27 @@@
++This package uses dpatch to manage all modifications to the upstream
++source. Changes are stored in the source package as diffs in
++debian/patches and applied during the build.
++
++To get the fully patched source after unpacking the source package, cd
++to the root level of the source package and run:
++
++ debian/rules patch
++
++Removing a patch is as simple as removing its entry from the
++debian/patches/00list file, and please also remove the patch file
++itself.
++
++Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
++where you should replace XX with a new number and patchname with a
++descriptive shortname of the patch. You can then simply edit all the
++files your patch wants to edit, and then simply "exit 0" from the shell
++to actually create the patch file.
++
++To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
++and replace XX_patchname with the actual filename from debian/patches
++you want to use.
++
++To clean up afterwards again, "debian/rules unpatch" will do the
++work for you - or you can of course choose to call
++"fakeroot debian/rules clean" all together.
++
diff --cc debian/changelog
index 5384d52,0000000..d9aaee6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,555 -1,0 +1,619 @@@
++libcommoncpp2 (1.8.1-5) unstable; urgency=low
++
++ * wheezey polish
++
++ * Update Standards Version 3.9.3
++ * debian/compat -> 9 hardening and multiarch
++ * Added spelling-error-in-manpage.patch
++ * minor lintian cleanups
++
++ -- Mark Purcell <msp at debian.org> Sat, 23 Jun 2012 16:02:03 +1000
++
++libcommoncpp2 (1.8.1-4) unstable; urgency=low
++
++ * Fix "FTBFS on kfreebsd-*: sys/kern/types.h:87:17: error: expected
++ unqualified-id before 'char'" patch from Robert Millan
++ (Closes: #673530)
++
++ -- Mark Purcell <msp at debian.org> Sat, 19 May 2012 11:03:29 +1000
++
++libcommoncpp2 (1.8.1-3) unstable; urgency=low
++
++ * source/format -> 3.0 quilt
++ * Switch to dh - drop cdbs/ dpatch
++ * Fix gcc-4.7 FTBFS debian/patches/applog-inc-fcntl.patch
++ * Fix "Getting rid of unneeded *.la / emptying dependency_libs"
++ added overide_dh_install (Closes: #633280)
++ * Fix "overwriting const argument in cidr::set" patch from Stefan Potyra
++ (Closes: #547352)
++
++ -- Mark Purcell <msp at debian.org> Sat, 19 May 2012 10:40:33 +1000
++
++libcommoncpp2 (1.8.1-2) unstable; urgency=low
++
++ * Upload to unstable - coordinated through debian-release
++
++ -- Mark Purcell <msp at debian.org> Tue, 15 May 2012 08:16:35 +1000
++
++libcommoncpp2 (1.8.1-1) experimental; urgency=low
++
++ * New upstream release
++ * Drop cstdlib_sparc.dpatch - included upstream
++
++ -- Mark Purcell <msp at debian.org> Sat, 29 Jan 2011 18:05:27 +1100
++
++libcommoncpp2 (1.8.0-1) experimental; urgency=low
++
++ * New upstream release
++ * NEW package libccgnu2-1.8-0 soname-match
++ * NEW Package libcommoncpp2-dbg (Closes: #532780)
++
++ [ Kilian Krause ]
++ * Remove -N from wget args in get-orig-source target as -O is already
++ used.
++
++ [ Mark Purcell ]
++ * Removed const_cast_conversion.dpatch included upstream
++ * Lintian cleanups:
++ - patch-system-but-no-source-readme
++ - duplicate-long-description
++ - copyright-with-old-dh-make-debian-copyright (Closes: #532784)
++ - out-of-date-standards-version
++
++ -- Mark Purcell <msp at debian.org> Sun, 07 Mar 2010 04:15:23 +1100
++
+libcommoncpp2 (1.7.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS due to invalid constant string to char* conversion in
+ src/cidr.cpp (added const_cast_conversion.dpatch) (Closes: #560463)
+
+ -- Mehdi Dogguy <mehdi at debian.org> Mon, 01 Feb 2010 15:16:29 +0100
+
+libcommoncpp2 (1.7.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump debian/compat -> 7
+ * Remove (c) -fixes:copyright-with-old-dh-make-debian-copyright
+ * Update debian/rules help2man -> debian/libcommoncpp2-dev.manpages
+
+ -- Mark Purcell <msp at debian.org> Thu, 02 Apr 2009 22:22:50 +1100
+
+libcommoncpp2 (1.7.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Update debian/copyright
+
+ -- Mark Purcell <msp at debian.org> Mon, 16 Feb 2009 22:22:47 +1100
+
+libcommoncpp2 (1.7.0-1) experimental; urgency=low
+
+ * New upstream release
+ * NEW package libccext2-1.7-0
+ - fixes package-name-doesnt-match-sonames
+ * debian/libcommoncpp2-doc.lintian-overrides - cover up doxygen
+ * Add ${misc:Depends}
+
+ -- Mark Purcell <msp at debian.org> Tue, 23 Dec 2008 16:36:07 +1100
+
+libcommoncpp2 (1.6.3-1) experimental; urgency=low
+
+ * New Upstream Release
+
+ [ Patrick Matthäi ]
+ * Bumped to Standards-Version 3.8.0.
+
+ [ Mark Purcell ]
+ * Debian patches included upstream
+ - 01_debian.dpatch
+ - no-include-bits_atomicity.h.dpatch
+ - gnutls.dpatch
+
+ -- Mark Purcell <msp at debian.org> Sun, 09 Nov 2008 21:07:01 +1100
+
+libcommoncpp2 (1.6.2-2) unstable; urgency=high
+
+ * Upload to fix FTBFS on sparc thus, urgency=high
+ * add dpatch to add missing include on src/mempager.cpp (Closes: #477505)
+ Thanks for Jurij Smakov & Martin Zobel-Helas for the patch.
+ * lintian cleanup:
+ - dpatch-missing-description: no-include-bits_atomicity.h.dpatch
+ - copyright-without-copyright-notice: debian/copyright
+
+ -- Mark Purcell <msp at debian.org> Mon, 25 Aug 2008 21:26:37 +1000
+
+libcommoncpp2 (1.6.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Tue, 22 Apr 2008 18:54:14 +1000
+
+libcommoncpp2 (1.6.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Mon, 24 Mar 2008 21:45:37 +1100
+
+libcommoncpp2 (1.6.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump to libcommoncpp2-1.6-0 to match upstream soname
+ * Cleanup get-orig-source VARS
+
+ -- Mark Purcell <msp at debian.org> Sat, 01 Dec 2007 20:36:12 +0100
+
+libcommoncpp2 (1.5.9-1) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * New upstream release.
+
+ -- Mark Purcell <msp at debian.org> Sat, 20 Oct 2007 11:29:05 +0100
+
+libcommoncpp2 (1.5.7-2) unstable; urgency=high
+
+ * Urgency high for fixing RC bug.
+ * Remove bits/atomicity.h detection from sources (Closes: #439117, #441163)
+ * Bump Standards-Version to 3.7.2.
+
+ -- Kilian Krause <kilian at debian.org> Sun, 09 Sep 2007 12:33:14 +0200
+
+libcommoncpp2 (1.5.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fix building twice in a row. (Closes: #424498)
+ * Remove debian/patches/sp_is_running_always_true.dpatch: Applied upstream.
+ * Convert Source-Version into binary:Version to allow binNMUs.
+ * Bump Build-Depends on debhelper to satisfy cdbs debhelper.mk requirements.
+
+ -- Kilian Krause <kilian at debian.org> Sat, 11 Aug 2007 13:20:39 +0000
+
+libcommoncpp2 (1.5.6-3) unstable; urgency=low
+
+ * Actually apply gcc4.3 patch, Thanks Martin (Closes: #417329)
+
+ -- Mark Purcell <msp at debian.org> Sun, 15 Apr 2007 07:38:55 +0100
+
+libcommoncpp2 (1.5.6-2) unstable; urgency=low
+
+ * Patch from Stephan Suerken fixes
+ - threads: isRunning() always returns true (Closes: #410219)
+ * Patch from Martin Michlmayr fixes:
+ - FTBFS with GCC 4.3: missing #includes (Closes: #417329)
+ * Switch to cdbs
+
+ -- Mark Purcell <msp at debian.org> Thu, 12 Apr 2007 19:01:19 +0100
+
+libcommoncpp2 (1.5.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Remove debian/patches/kFreeBSD.dpatch encorporated upstream
+ * Update debian/patches/soname-1.5.3.dpatch
+
+ -- Mark Purcell <msp at debian.org> Thu, 12 Apr 2007 16:22:05 +0100
+
+libcommoncpp2 (1.5.5-1) unstable; urgency=low
+
+ [ Mark Purcell ]
+ * New upstream release
+ * Patch from Peter Salinger (Closes: #403719: libcommoncpp2: FTBFS on
+ GNU/kFreeBSD
+ * Remove ccgnu2-config.8 from debian/patches/01_debian.dpatch
+ * Cleanup gnutls.dpatch for new upstream version
+ * delete debian/patches/no_udp_reuseaddr.dpatch - incorporated
+ upstream
+ * Cleanup debian/patches again
+
+ -- Mark Purcell <msp at debian.org> Sat, 17 Feb 2007 12:50:52 +0000
+
+libcommoncpp2 (1.5.3-4) unstable; urgency=low
+
+ * Fix typo in Depends: pkgconfig => pkg-config.
+
+ -- Kilian Krause <kilian at debian.org> Fri, 19 Jan 2007 11:13:55 +0100
+
+libcommoncpp2 (1.5.3-3) unstable; urgency=low
+
+ * Add depends on pkgconfig to libcommoncpp2-dev. (Closes: #407296)
+ * Fix debhelper depends to compat level to shutup linda.
+
+ -- Kilian Krause <kilian at debian.org> Fri, 19 Jan 2007 00:01:06 +0100
+
+libcommoncpp2 (1.5.3-2) unstable; urgency=medium
+
+ * Urgency medium as this fixes a RC bug & has been discussed with debian-release
+ * debian/patches/soname-1.5.3.dpatch - upstream is not ABI compatable - bump soname
+ - twinkle: symbol lookup error when hanging up (Closes: #402009)
+
+ -- Mark Purcell <msp at debian.org> Sat, 9 Dec 2006 09:31:44 +0000
+
+libcommoncpp2 (1.5.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Build-Depends: autotools-dev & remove config.[sub,guess] changes
+ from debian/patches
+ - Fixes: reverting patch 01_debian from ./ ... fails durring rebuild (Closes:
+ #399481)
+
+ -- Mark Purcell <msp at debian.org> Sun, 3 Dec 2006 12:03:19 +0000
+
+libcommoncpp2 (1.5.1-4) unstable; urgency=low
+
+ * Let's Add Build-Depends: libgnutls-dev, libgcrypt11-dev | libgcrypt-
+ dev as well
+ - missing dependency on libgnutls-dev (Closes: #396996)
+
+ -- Mark Purcell <msp at debian.org> Sat, 4 Nov 2006 10:40:45 +0000
+
+libcommoncpp2 (1.5.1-3) unstable; urgency=low
+
+ * Add Depends: libgnutls-dev, zlib1g-dev, libgcrypt11-dev | libgcrypt-
+ dev
+ - missing dependency on libgnutls-dev (Closes: #396996)
+
+ -- Mark Purcell <msp at debian.org> Sat, 4 Nov 2006 10:23:02 +0000
+
+libcommoncpp2 (1.5.1-2) unstable; urgency=low
+
+ [ Mikael Magnusson ]
+ * Link libccext2 against ssl libraries
+ * Disable REUSEADDR on UDP sockets
+
+ -- Mark Purcell <msp at debian.org> Wed, 25 Oct 2006 17:50:43 +0100
+
+libcommoncpp2 (1.5.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 22 Oct 2006 21:00:31 +0100
+
+libcommoncpp2 (1.5.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump soname: package-name-doesnt-match-sonames libccext2-1.5-0
+ libccgnu2-1.5-0
+
+ -- Mark Purcell <msp at debian.org> Mon, 2 Oct 2006 08:44:47 +0800
+
+libcommoncpp2 (1.4.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Lintian cleanup: manpage-has-useless-whatis-entry
+ usr/share/man/man1/ccgnu2-config.1.gz
+
+ -- Mark Purcell <msp at debian.org> Sun, 3 Sep 2006 11:09:52 +0100
+
+libcommoncpp2 (1.4.2-2) unstable; urgency=low
+
+ * Thanks to Jonas Meyer & Amaya for picking up a typo in the
+ debian/patches/
+ - Fixes: makes other packages FTBFS with G++ 4.1: endKeydata was not declared
+ in this scope (Closes: #356601)
+
+ -- Mark Purcell <msp at debian.org> Tue, 15 Aug 2006 22:37:34 +0100
+
+libcommoncpp2 (1.4.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 6 Jul 2006 19:57:37 +0100
+
+libcommoncpp2 (1.4.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Wed, 10 May 2006 18:29:14 +0100
+
+libcommoncpp2 (1.4.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump soname libcommoncpp2-1.4-0
+
+ -- Mark Purcell <msp at debian.org> Sun, 7 May 2006 11:08:08 +0100
+
+libcommoncpp2 (1.3.26-4) unstable; urgency=low
+
+ * ost_check2.m4 provided by -doc in i386 while by -dev in other arches
+ (Closes: #366148)
+
+ -- Mark Purcell <msp at debian.org> Sat, 6 May 2006 00:08:57 +0100
+
+libcommoncpp2 (1.3.26-3) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * debian/rules: Don't build arch=all in binary-arch target.
+
+ [ Mark Purcell ]
+ * Add debian/patches/bug360492.dpatch. Fixes: pointer.h:55:
+ error: invalid function declaration (Closes: #360492)
+ * debian/control: Conflict and Replace with only libcommoncpp2-1.3c2a (1.3.26-1)
+
+ -- Mark Purcell <msp at debian.org> Tue, 18 Apr 2006 23:19:15 +0100
+
+libcommoncpp2 (1.3.26-2) unstable; urgency=low
+
+ * Bump soname
+
+ -- Mark Purcell <msp at debian.org> Thu, 13 Apr 2006 12:57:47 +0100
+
+libcommoncpp2 (1.3.26-1) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * debian/rules: Add get-orig-source target.
+
+ [ Mark Purcell ]
+ * New upstream release
+ * debian/watch to use svn-upgrade
+ * Update debian/patches/01_debian.dpatch
+
+ -- Mark Purcell <msp at debian.org> Wed, 12 Apr 2006 19:23:19 +0100
+
+libcommoncpp2 (1.3.25-3) unstable; urgency=low
+
+ * Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+ * Build-Depends: dpatch
+ * libcommoncpp2-doc Architecture: all
+
+ -- Mark Purcell <msp at debian.org> Tue, 28 Mar 2006 22:24:10 +0100
+
+libcommoncpp2 (1.3.25-2) unstable; urgency=low
+
+ * Update libcommoncpp2-dev.manpages, libcommoncpp2-dev.dirs, libcommoncpp2-dev.examples
+ - Cleanup debian/rules for the above
+ * Update DH_COMPAT=4
+ * Split off Architecture: any libcommoncpp2-doc package
+ * Apply G++ 4.1 patch from Martin Michlmayr (Closes: Bug#356601)
+
+ -- Mark Purcell <msp at debian.org> Sun, 19 Mar 2006 14:35:45 +0000
+
+libcommoncpp2 (1.3.25-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 12 Mar 2006 19:51:06 +0000
+
+libcommoncpp2 (1.3.24-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sat, 18 Feb 2006 12:18:28 +0000
+
+libcommoncpp2 (1.3.22-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sat, 21 Jan 2006 11:40:07 +0000
+
+libcommoncpp2 (1.3.21-2) unstable; urgency=low
+
+ * library package needs to be renamed (libstdc++ allocator change)
+ (Closes: #339198)
+ * Disable TODO in doc/Doxyfile
+ - libcommoncpp2-dev: file conflict with libccrtp-dev:
+ /usr/share/man/man3/todo.3.gz (Closes: #338397)
+
+ -- Mark Purcell <msp at debian.org> Mon, 21 Nov 2005 21:41:18 +0000
+
+libcommoncpp2 (1.3.21-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 14:37:39 +0100
+
+libcommoncpp2 (1.3.19-1) unstable; urgency=low
+
+ * New upstream release
+ * Lintian cleanup old-fsf-address-in-copyright-file
+
+ -- Mark Purcell <msp at debian.org> Sun, 4 Sep 2005 22:35:08 +0100
+
+libcommoncpp2 (1.3.14-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Tue, 19 Jul 2005 00:08:54 +1000
+
+libcommoncpp2 (1.3.13-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 7 Jul 2005 05:11:57 +0100
+
+libcommoncpp2 (1.3.10-4) unstable; urgency=low
+
+ * Merge ubuntu changes for C++ ABI change (Thanks Stephen)
+ - Please feel free to submit other ubuntu changes directly to the Debian
+ BTS
+
+ -- Mark Purcell <msp at debian.org> Thu, 7 Jul 2005 04:00:50 +0100
+
+libcommoncpp2 (1.3.10-3ubuntu1) breezy; urgency=low
+
+ * Add Conflicts/Replaces: libcommoncpp2-1.0-0c102 (= 1.0.13-5ubuntu1)
+ * debian/rules: moved test on config.{guess,sub} to configure
+
+ -- Stephan Hermann <sh at sourcecode.de> Mon, 06 Jun 2005 20:28:45 +0200
+
+libcommoncpp2 (1.3.10-3) unstable; urgency=low
+
+ * Add Conflicts/Replaces: libcommoncpp2-1.0-0c102 (=1.3.10-1) (Closes:
+ Bug#311397)
+ * Closes: #311149: FTBFS: dh_installdocs: cp: cannot stat `doc/html':
+ No such file or directory
+ - Add Build-Depends doxygen
+
+ -- Mark Purcell <msp at debian.org> Wed, 1 Jun 2005 22:41:13 +0100
+
+libcommoncpp2 (1.3.10-2) unstable; urgency=low
+
+ * soname change requires lib package bump to libcommoncp2-1.3
+
+ -- Mark Purcell <msp at debian.org> Sat, 28 May 2005 17:39:30 +0100
+
+libcommoncpp2 (1.3.10-1) unstable; urgency=low
+
+ * New upstream release
+ - Closes: #264994: Underquoted AC_DEFUNs in automake macro
+ - Closes: #294611: Underquoted definitions in m4
+ * Add GENERATE_TODOLIST=NO & SHOW_DIRECTORIES=NO to doc/Doxyfile.in
+ * Closes: #246529: Developer package should include html documentation
+
+ -- Mark Purcell <msp at debian.org> Sat, 28 May 2005 16:30:15 +0100
+
+libcommoncpp2 (1.0.13-5) unstable; urgency=low
+
+ * Apply gcc-3.4 patch from Andreas Jochens (Closes: Bug#259384)
+
+ -- Mark Purcell <msp at debian.org> Thu, 15 Jul 2004 08:17:20 +1000
+
+libcommoncpp2 (1.0.13-4) unstable; urgency=low
+
+ * ./reconf
+ * Closes: Bug#251485: libcommoncpp2: FTBFS: old libtool version.
+
+ -- Mark Purcell <msp at debian.org> Thu, 1 Jul 2004 22:33:31 +1000
+
+libcommoncpp2 (1.0.13-3) unstable; urgency=low
+
+ * Unset CFLAGGS/CXXFLAGS for configure (Closes: Bug#234912)
+ * Build ccgnu2-config.1 using help2man
+ * Closes: #92368: /usr/include/cc++/config.h defines PACKAGE and
+ VERSION
+ * Closes: #179991: commonc++: Not fully conform to
+ STDC++ (warnings with g++-3.2)
+
+ -- Mark Purcell <msp at debian.org> Fri, 5 Mar 2004 18:18:56 +1100
+
+libcommoncpp2 (1.0.13-2) unstable; urgency=low
+
+ * Update upstream URL in debian/control (Closes: Bug#233034)
+
+ -- Mark Purcell <msp at debian.org> Tue, 24 Feb 2004 11:50:43 +1100
+
+libcommoncpp2 (1.0.13-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Mon, 18 Aug 2003 20:37:28 +1000
+
+libcommoncpp2 (1.0.12-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 26 Jun 2003 21:31:23 +1000
+
+libcommoncpp2 (1.0.10-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sat, 24 May 2003 14:56:07 +1000
+
+libcommoncpp2 (1.0.9-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 17 Apr 2003 19:46:00 +1000
+
+libcommoncpp2 (1.0.8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 13 Mar 2003 18:49:32 +1100
+
+libcommoncpp2 (1.0.7-4) unstable; urgency=low
+
+ * Adding throw() to nanosleep, Thanks Peter Toneby (Closes:
+ Bug#176525)
+
+ -- Mark Purcell <msp at debian.org> Tue, 14 Jan 2003 20:06:35 +1100
+
+libcommoncpp2 (1.0.7-3) unstable; urgency=low
+
+ * Fixup unsigned int bug in include/c++/socket.h, Thanks Gerhard Tonn
+ (Closes: Bug#173081)
+
+ -- Mark Purcell <msp at debian.org> Sun, 12 Jan 2003 23:54:16 +1100
+
+libcommoncpp2 (1.0.7-2) unstable; urgency=low
+
+ * Rebuild for gcc-3.2
+
+ -- Mark Purcell <msp at debian.org> Thu, 9 Jan 2003 22:12:54 +1100
+
+libcommoncpp2 (1.0.7-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 8 Dec 2002 20:59:24 +1100
+
+libcommoncpp2 (1.0.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 10 Nov 2002 20:08:17 +1100
+
+libcommoncpp2 (1.0.3-2) unstable; urgency=low
+
+ * Rebuild with standard g++
+
+ -- Mark Purcell <msp at debian.org> Sun, 6 Oct 2002 19:52:45 +1000
+
+libcommoncpp2 (1.0.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 6 Oct 2002 19:08:45 +1000
+
+libcommoncpp2 (1.0.2-2) unstable; urgency=low
+
+ * Source Section: devel
+
+ -- Mark Purcell <msp at debian.org> Sun, 22 Sep 2002 21:15:43 +1000
+
+libcommoncpp2 (1.0.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Renamed Source: libcommoncpp2
+ * Updated to Standards-Version: 3.5.2
+
+ -- Mark Purcell <msp at debian.org> Sun, 22 Sep 2002 13:08:14 +1000
+
+commoncpp2 (1.0.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: Bug#154911)
+
+ -- Mark Purcell <msp at debian.org> Tue, 3 Sep 2002 20:45:49 +1000
+
+commoncpp2 (0.99.6-3) unstable; urgency=low
+
+ * New Maintainer.
+
+ -- Mark Purcell <msp at debian.org> Sun, 4 Aug 2002 10:29:11 +1000
+
+commoncpp2 (0.99.6-2.1) unstable; urgency=low
+
+ * NMU
+ * Can't include <asm/atomic.h> in user space. Especially with g++, since
+ it has non-g++'isms in it. Closes: #154911
+
+ -- LaMont Jones <lamont at debian.org> Tue, 30 Jul 2002 23:05:10 -0600
+
+commoncpp2 (0.99.6-2) unstable; urgency=low
+
+ * Fix g++-3.x problems. Tested to compile cleanly with g++-3.1
+ (Closes: #151888)
+
+ -- Matt Zimmerman <mdz at debian.org> Thu, 4 Jul 2002 11:37:53 -0400
+
+commoncpp2 (0.99.6-1) unstable; urgency=low
+
+ * New upstream release
+ * I am neglecting this package somewhat because I no longer use it actively.
+ If you do, and want to adopt it, contact me.
+
+ -- Matt Zimmerman <mdz at debian.org> Thu, 4 Jul 2002 00:19:27 -0400
+
+commoncpp2 (0.99.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #142598)
+
+ -- Matt Zimmerman <mdz at debian.org> Fri, 15 Mar 2002 21:46:06 -0500
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 2af421e,0000000..b93f44b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,51 -1,0 +1,75 @@@
+Source: libcommoncpp2
+Section: devel
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
- Build-Depends: debhelper (>= 7), libxml2-dev, zlib1g-dev, help2man, doxygen, dpatch, libgnutls-dev, libgcrypt11-dev | libgcrypt-dev, autotools-dev, cdbs, dpkg-dev (>= 1.13.19)
- Standards-Version: 3.8.0
++Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.19), autotools-dev, doxygen,
++ libxml2-dev, zlib1g-dev, libgnutls-dev, libgcrypt11-dev | libgcrypt-dev
++Standards-Version: 3.9.3
+Homepage: http://www.gnu.org/software/commoncpp/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/libcommoncpp2/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/?op=log
+
+Package: libcommoncpp2-dev
+Section: libdevel
+Architecture: any
- Depends: ${misc:Depends}, libccgnu2-1.7-0 (= ${binary:Version}), libgnutls-dev, zlib1g-dev, libgcrypt11-dev | libgcrypt-dev, pkg-config
++Depends: ${misc:Depends}, libccgnu2-1.8-0 (= ${binary:Version}), libgnutls-dev, zlib1g-dev, libgcrypt11-dev | libgcrypt-dev, pkg-config
+Suggests: libcommoncpp2-doc
+Description: Header files and static libraries for Common C++ "2"
+ Common C++ is a GNU package which offers portable "abstraction" of system
+ services such as threads, networks, and sockets. Common C++ also offers
+ individual frameworks generally useful to developing portable C++
+ applications including a object persistence engine, math libraries,
+ threading, sockets, etc. Common C++ is small, and highly portable.
+ Common C++ will support most Unix operating systems as well
+ as Win32, in addition to GNU/Linux.
++ .
++ This package contains the development files.
+
- Package: libccgnu2-1.7-0
++Package: libccgnu2-1.8-0
+Section: libs
+Architecture: any
++Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: A GNU package for creating portable C++ programs
++Multi-Arch: same
++Description: GNU package for creating portable C++ programs
+ Common C++ "2" is a GNU package which offers portable "abstraction"
+ of system services such as threads, networks, and sockets. Common
+ C++ also offers individual frameworks generally useful to developing
+ portable C++ applications including a object persistence engine, math
+ libraries, threading, sockets, etc. Common C++ is small, and highly
+ portable. Common C++ will support most Unix operating systems as
+ well as Win32, in addition to GNU/Linux.
++ .
++ This package contains the runtime libraries.
+
+Package: libcommoncpp2-doc
- Replaces: libcommoncpp2-dev (<= 1.3.25-1)
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Documentation files for Common C++ "2"
+ Common C++ "2" is a GNU package which offers portable "abstraction"
+ of system services such as threads, networks, and sockets. Common
+ C++ also offers individual frameworks generally useful to developing
+ portable C++ applications including a object persistence engine, math
+ libraries, threading, sockets, etc. Common C++ is small, and highly
+ portable. Common C++ will support most Unix operating systems as
+ well as Win32, in addition to GNU/Linux.
++ .
++ This package contains the library development documentation.
++
++Package: libcommoncpp2-dbg
++Section: debug
++Priority: extra
++Architecture: any
++Depends: ${misc:Depends}, libccgnu2-1.8-0 (= ${binary:Version})
++Description: Debug symbols for Common C++ "2"
++ Common C++ is a GNU package which offers portable "abstraction" of system
++ services such as threads, networks, and sockets. Common C++ also offers
++ individual frameworks generally useful to developing portable C++
++ applications including a object persistence engine, math libraries,
++ threading, sockets, etc. Common C++ is small, and highly portable.
++ Common C++ will support most Unix operating systems as well
++ as Win32, in addition to GNU/Linux.
++ .
++ This package contains the debug symbols.
diff --cc debian/copyright
index 5a156c1,0000000..60086b7
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,89 -1,0 +1,89 @@@
+This package was debianized by Mark Purcell <msp at debian.org> on
+Sun, 22 Sep 2002 12:48:26 +1000.
+
+It was downloaded from http://ftp.gnu.org/pub/gnu/commoncpp/
+
+Upstream Authors:
+
+David Sugar <dyfet at ostel.com> originally designed and implemented APE.
+Daniel Silverstone designed original Common C++ classes (persistence
+ engine, math libs, etc...)
+Sean Cavanaugh contributed the AtomicCounter class.
+Gianni Mariani contributed poll support for port and tcpservice.cpp demo app.
+Henner Zeller contributed many recent enhancements, some new classes, and
+ fixed the win32 build process.
+John Connors has contributed many recent improvements for the win32
+ source tree.
+Eric Schendel <esche at users.sourceforge.net> recent improvements on the serial
+ I/O classes along with some similar enhancements on the socket classes.
+Gary Lawrence contributed a serial I/O example.
+Robert Prouse contributed to the updating of the win32 source tree and
+ production of merged win32/posix sources for sockets.
+Frediano Ziglio has provided help with the win32 target and with the
+ development and testing for GNU Common C++ "2".
+
+Copyright:
+
+// Copyright 1999-2005 Open Source Telecom Corporation.
+// Copyright 2006-2008 David Sugar, Tycho Softworks.
+
+License:
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+//
+// As a special exception, you may use this file as part of a free software
+// library without restriction. Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License. This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+//
+// This exception applies only to the code released under the name GNU
+// Common C++. If you copy code from other releases into a copy of GNU
+// Common C++, as the General Public License permits, the exception does
+// not apply to the code that you add in this way. To avoid misleading
+// anyone as to the status of such modified files, you must delete
+// this exception notice from them.
+//
+// If you write modifications of your own for GNU Common C++, it is your choice
+// whether to permit this exception to apply to your modifications.
+// If you do not wish that, delete this exception notice.
+
+On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
++Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
- The Debian packaging is (C) 2002-2008, Mark Purcell <msp at debian.org> and
- is licensed under the GPL, see above.
++The Debian packaging is (Copyright) 2002-2008, Mark Purcell <msp at debian.org> and
++is licensed under the GPL-2, see above.
+
+Other Portions:
+
+src/nat.cpp:
+ [Copyright: 2004-2005 TintaDigital - STI, LDA]
+
+src/simplesocket.cpp:
+ [Copyright: 2002-2005 Wizzer Works]
+
+src/cidr.cpp:
+ [Copyright: 2006 David Sugar, Tycho Softworks]
+
+src/network.cpp:
+ [Copyright: 2002-2005 Christian Prochnow <cproch at seculogix.de>]
+
+src/cmdoptns.cpp:
+ [Copyright: 2001-2005 Gianni Mariani]
+
diff --cc debian/libccgnu2-1.8-0.install
index 0000000,0000000..3ddde58
new file mode 100644
--- /dev/null
+++ b/debian/libccgnu2-1.8-0.install
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib/*/lib*.so.*
diff --cc debian/libcommoncpp2-dev.install
index 961a908,0000000..b7aa351
mode 100644,000000..100644
--- a/debian/libcommoncpp2-dev.install
+++ b/debian/libcommoncpp2-dev.install
@@@ -1,7 -1,0 +1,7 @@@
+usr/include/*
- usr/lib/lib*.a
- usr/lib/lib*.so
- usr/lib/lib*.la
++usr/lib/*/lib*.a
++usr/lib/*/lib*.so
++usr/lib/*/lib*.la
+usr/bin/*
+usr/share/aclocal/*
- usr/lib/pkgconfig/*
++usr/lib/*/pkgconfig/*
diff --cc debian/libcommoncpp2-doc.doc-base
index 0000000,0000000..b925fb9
new file mode 100644
--- /dev/null
+++ b/debian/libcommoncpp2-doc.doc-base
@@@ -1,0 -1,0 +1,9 @@@
++Document: libccommon2-doc
++Title: CCcommon2 Library Reference
++Abstract: CCcommon2 library reference documents are generated by parsing the source
++ with doxygen, which generates the most current API reference documentation.
++Section: Programming/C++
++
++Format: HTML
++Index: /usr/share/doc/libcommoncpp2-doc/html/index.html
++Files: /usr/share/doc/libcommoncpp2-doc/html/*.html
diff --cc debian/libcommoncpp2-doc.lintian-overrides
index 82fa7ee,0000000..037c4d2
mode 100644,000000..100644
--- a/debian/libcommoncpp2-doc.lintian-overrides
+++ b/debian/libcommoncpp2-doc.lintian-overrides
@@@ -1,4 -1,0 +1,3 @@@
+# cover up doxygen's errors
+libcommoncpp2-doc: manpage-has-bad-whatis-entry
- libcommoncpp2-doc: manpage-has-errors-from-man
+libcommoncpp2-doc: hyphen-used-as-minus-sign
diff --cc debian/patches/applog-inc-fcntl.patch
index 0000000,0000000..97468b0
new file mode 100644
--- /dev/null
+++ b/debian/patches/applog-inc-fcntl.patch
@@@ -1,0 -1,0 +1,52 @@@
++Description: Fix gcc-4.7 FTBFS
++
++Index: libcommoncpp2-1.8.1/src/applog.cpp
++===================================================================
++--- libcommoncpp2-1.8.1.orig/src/applog.cpp 2010-11-01 10:11:55.000000000 +1100
+++++ libcommoncpp2-1.8.1/src/applog.cpp 2012-05-19 10:11:19.000000000 +1000
++@@ -45,6 +45,9 @@
++ #include <cstdlib>
++ #include <stdarg.h>
++ #include <errno.h>
+++#include <fcntl.h>
+++#include <sys/types.h>
+++#include <sys/stat.h>
++
++ // TODO sc: test if has to move up now that it is into commoncpp
++ // NOTE: the order of inclusion is important do not move following include line
++@@ -297,7 +300,7 @@
++ else
++ {
++ // create pipe
++- int err = mkfifo(_nomeFile.c_str(), S_IREAD | S_IWRITE);
+++ int err = mkfifo(_nomeFile.c_str(), S_IRUSR | S_IWUSR);
++ if (err == 0 || errno == EEXIST)
++ {
++ // and open it
++@@ -342,7 +345,7 @@
++ else
++ {
++ // create pipe
++- int err = mkfifo(_nomeFile.c_str(), S_IREAD | S_IWRITE);
+++ int err = mkfifo(_nomeFile.c_str(), S_IRUSR | S_IWUSR);
++ if (err == 0 || errno == EEXIST)
++ {
++ // and open it
++@@ -456,7 +459,7 @@
++ else
++ {
++ // create pipe
++- int err = mkfifo(d->_nomeFile.c_str(), S_IREAD | S_IWRITE);
+++ int err = mkfifo(d->_nomeFile.c_str(), S_IRUSR | S_IWUSR);
++ if (err == 0 || errno == EEXIST)
++ {
++ // and open it
++@@ -562,7 +565,7 @@
++ else
++ {
++ // create pipe
++- int err = mkfifo(d->_nomeFile.c_str(), S_IREAD | S_IWRITE);
+++ int err = mkfifo(d->_nomeFile.c_str(), S_IRUSR | S_IWUSR);
++ if (err == 0 || errno == EEXIST)
++ {
++ // and open it
diff --cc debian/patches/caddr.diff
index 0000000,0000000..73f2378
new file mode 100644
--- /dev/null
+++ b/debian/patches/caddr.diff
@@@ -1,0 -1,0 +1,16 @@@
++Description: include <sys/types.h>
++
++--- a/inc/cc++/file.h
+++++ b/inc/cc++/file.h
++@@ -93,10 +93,7 @@
++
++ typedef unsigned long pos_t;
++ #ifndef WIN32
++-// use a define so that if the sys/types.h header already defines caddr_t
++-// as it may on BSD systems, we do not break it by redefining again.
++-#undef caddr_t
++-#define caddr_t char *
+++#include <sys/types.h>
++ typedef size_t ccxx_size_t;
++ #else
++ #if !defined(__BORLANDC__) || __BORLANDC__ >= 0x0560
diff --cc debian/patches/cleaning_doc.dpatch
index fa2a06e,0000000..d29c0a8
mode 100644,000000..100644
--- a/debian/patches/cleaning_doc.dpatch
+++ b/debian/patches/cleaning_doc.dpatch
@@@ -1,28 -1,0 +1,29 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cleaning_doc.dpatch by Rene Mayorga <rmayorga at debian.org.sv>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: adding clean-docs target to doc/Makefile.in (Debian bug #424498)
+
+ at DPATCH@
- diff -urNad libcommoncpp2-1.5.9~/doc/Makefile.in libcommoncpp2-1.5.9/doc/Makefile.in
- --- libcommoncpp2-1.5.9~/doc/Makefile.in 2007-09-30 13:06:15.000000000 +0200
- +++ libcommoncpp2-1.5.9/doc/Makefile.in 2007-10-02 09:16:57.000000000 +0200
- @@ -274,12 +274,16 @@
++Index: libcommoncpp2-1.8.1/doc/Makefile.in
++===================================================================
++--- libcommoncpp2-1.8.1.orig/doc/Makefile.in 2010-11-01 09:10:19.000000000 +1100
+++++ libcommoncpp2-1.8.1/doc/Makefile.in 2012-05-19 10:13:01.000000000 +1000
++@@ -307,12 +307,16 @@
+ Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+-mostlyclean-libtool:
++mostlyclean-libtool: clean-docs
+ -rm -f *.lo
+
+ clean-libtool:
+ -rm -rf .libs _libs
+
++clean-docs:
++ -rm -rf html
++ -rm -rf latex
++
+ .texi.info:
+ restore=: && backupdir="$(am__leading_dot)am$$$$" && \
- am__cwd=`pwd` && cd $(srcdir) && \
++ am__cwd=`pwd` && $(am__cd) $(srcdir) && \
diff --cc debian/patches/fix_ciddr_ftbfs.dpatch
index 0000000,0000000..a4111b2
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_ciddr_ftbfs.dpatch
@@@ -1,0 -1,0 +1,30 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## fix_ciddr_ftbfs.dpatch by Stefan Potyra <sistpoty at ubuntu.com>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: do not overwrite the const argument, but rather make use of the
++## DP: buffer in ciddr::set
++
++ at DPATCH@
++Index: libcommoncpp2-1.8.1/src/cidr.cpp
++===================================================================
++--- libcommoncpp2-1.8.1.orig/src/cidr.cpp 2010-11-01 10:15:28.000000000 +1100
+++++ libcommoncpp2-1.8.1/src/cidr.cpp 2012-05-19 10:52:26.000000000 +1000
++@@ -199,7 +199,7 @@
++ bitset((bit_t *)&netmask, getMask(cp));
++ setString(cbuf, sizeof(cbuf), cp);
++
++- ep = (char *)strchr(cp, '/');
+++ ep = (char *)strchr(cbuf, '/');
++
++ if(ep)
++ *ep = 0;
++@@ -328,7 +328,7 @@
++ memset(&netmask, 0, sizeof(netmask));
++ bitset((bit_t *)&netmask, getMask(cp));
++ setString(cbuf, sizeof(cbuf), cp);
++- ep = (char *)strchr(cp, '/');
+++ ep = (char *)strchr(cbuf, '/');
++ if(ep)
++ *ep = 0;
++
diff --cc debian/patches/series
index 0000000,0000000..e7386da
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,5 @@@
++spelling-error-in-manpage.patch
++applog-inc-fcntl.patch
++cleaning_doc.dpatch
++fix_ciddr_ftbfs.dpatch
++caddr.diff
diff --cc debian/patches/spelling-error-in-manpage.patch
index 0000000,0000000..7358e61
new file mode 100644
--- /dev/null
+++ b/debian/patches/spelling-error-in-manpage.patch
@@@ -1,0 -1,0 +1,76 @@@
++Description: spelling-error-in-manpage
++
++Index: libcommoncpp2-1.8.1/inc/cc++/address.h
++===================================================================
++--- libcommoncpp2-1.8.1.orig/inc/cc++/address.h 2010-11-01 09:22:45.000000000 +1100
+++++ libcommoncpp2-1.8.1/inc/cc++/address.h 2012-06-23 15:59:12.000000000 +1000
++@@ -510,7 +510,7 @@
++ /**
++ * Internet addresses used specifically as masking addresses (such as "
++ * 255.255.255.0") are held in the IPV4Mask derived object. The
++- * seperate class is used so that C++ type casting can automatically
+++ * separate class is used so that C++ type casting can automatically
++ * determine when an IPV4Address object is really a mask address object
++ * rather than simply using the base class. This also allows manipulative
++ * operators for address masking to operate only when presented with a
++@@ -904,7 +904,7 @@
++ /**
++ * Internet addresses used specifically as masking addresses (such as "
++ * 255.255.255.0") are held in the IPV6Mask derived object. The
++- * seperate class is used so that C++ type casting can automatically
+++ * separate class is used so that C++ type casting can automatically
++ * determine when an IPV6Address object is really a mask address object
++ * rather than simply using the base class. This also allows manipulative
++ * operators for address masking to operate only when presented with a
++Index: libcommoncpp2-1.8.1/inc/cc++/file.h
++===================================================================
++--- libcommoncpp2-1.8.1.orig/inc/cc++/file.h 2010-11-01 09:32:15.000000000 +1100
+++++ libcommoncpp2-1.8.1/inc/cc++/file.h 2012-06-23 15:59:51.000000000 +1000
++@@ -757,7 +757,7 @@
++ public:
++ /**
++ * Open a file for mapping. More than one segment of a file
++- * may be mapped into seperate regions of memory.
+++ * may be mapped into separate regions of memory.
++ *
++ * @param fname file name to access for mapping.
++ * @param mode access mode to map file.
++Index: libcommoncpp2-1.8.1/inc/cc++/socket.h
++===================================================================
++--- libcommoncpp2-1.8.1.orig/inc/cc++/socket.h 2010-11-01 09:47:54.000000000 +1100
+++++ libcommoncpp2-1.8.1/inc/cc++/socket.h 2012-06-23 16:00:13.000000000 +1000
++@@ -1856,7 +1856,7 @@
++
++ /**
++ * The TCP session is used to primarily to represent a client connection
++- * that can be managed on a seperate thread. The TCP session also supports
+++ * that can be managed on a separate thread. The TCP session also supports
++ * a non-blocking connection scheme which prevents blocking during the
++ * constructor and moving the process of completing a connection into the
++ * thread that executes for the session.
++Index: libcommoncpp2-1.8.1/inc/cc++/socketport.h
++===================================================================
++--- libcommoncpp2-1.8.1.orig/inc/cc++/socketport.h 2010-11-01 09:48:20.000000000 +1100
+++++ libcommoncpp2-1.8.1/inc/cc++/socketport.h 2012-06-23 16:00:03.000000000 +1000
++@@ -278,7 +278,7 @@
++ * attached socket ports. Multiple pool objects may be created and
++ * multiple socket ports may be attached to the same thread of execution.
++ * This allows one to balance threads and sockets they service rather than
++- * either using a single thread for all connections or a seperate thread
+++ * either using a single thread for all connections or a separate thread
++ * for each connection. Features can be added through supported virtual
++ * methods.
++ *
++Index: libcommoncpp2-1.8.1/inc/cc++/unix.h
++===================================================================
++--- libcommoncpp2-1.8.1.orig/inc/cc++/unix.h 2010-11-01 09:51:05.000000000 +1100
+++++ libcommoncpp2-1.8.1/inc/cc++/unix.h 2012-06-23 15:58:46.000000000 +1000
++@@ -325,7 +325,7 @@
++
++ /**
++ * The Unix domain session is used to primarily to represent a client connection
++- * that can be managed on a seperate thread. The Unix domain session also supports
+++ * that can be managed on a separate thread. The Unix domain session also supports
++ * a non-blocking connection scheme which prevents blocking during the
++ * constructor and moving the process of completing a connection into the
++ * thread that executes for the session.
diff --cc debian/rules
index 5a5fc96,0000000..d711eb4
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,18 -1,0 +1,16 @@@
+#!/usr/bin/make -f
++%:
++ dh $@ --parallel
+
- FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
- URL = http://ftp.gnu.org/pub/gnu/commoncpp/commoncpp2-$(DEB_UPSTREAM_VERSION).tar.gz
++override_dh_install:
++ dh_install --list-missing
++ # Drop content of dependency_libs to avoid having to recompile
++ # if the path of the libs that appear there changes
++ sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/autotools.mk
- include /usr/share/cdbs/1/rules/dpatch.mk
-
- get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(FILENAME) from $(URL) ...
- @@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
++override_dh_strip:
++ dh_strip --dbg-package=libcommoncpp2-dbg
+
+help2man:
+ /usr/bin/help2man -N -S 'Debian GNU/Linux' -o debian/ccgnu2-config.8 ccgnu2-config \
+ -n 'script to get information about the installed version of libcommoncpp2'
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libcommoncpp2.git
More information about the Pkg-voip-commits
mailing list