diff -Nru wvstreams-4.6.1/debian/changelog wvstreams-4.6.1/debian/changelog --- wvstreams-4.6.1/debian/changelog 2011-08-14 20:34:26.000000000 -0500 +++ wvstreams-4.6.1/debian/changelog 2011-05-19 17:39:47.000000000 -0500 @@ -1,12 +1,13 @@ -wvstreams (4.6.1-1ubuntu1) maverick; urgency=low +wvstreams (4.6.1-2) unstable; urgency=low - * ipstreams/wvunixdgsocket.cc, streams/wvatomicfile.cc: - + remove defenition of MACOS and spurious #endif to fix chmod not - found gcc error and hence build problems (LP: #602134) - (forwarded upstream as - http://code.google.com/p/wvstreams/issues/detail?id=28) + * QA upload. + * Switch to format 3.0 (quilt). + * debian/patches/05_gcc.diff: + - Fix FTBFS with new gcc (Closes: #621990). + * Drop obsolete Conflicts/Replaces fields. + * Bump Standards-Version to 3.9.2. - -- Bhavani Shankar Thu, 12 Aug 2010 16:08:57 +0530 + -- Luca Falavigna Fri, 20 May 2011 00:39:34 +0200 wvstreams (4.6.1-1) unstable; urgency=low diff -Nru wvstreams-4.6.1/debian/control wvstreams-4.6.1/debian/control --- wvstreams-4.6.1/debian/control 2011-08-14 20:34:26.000000000 -0500 +++ wvstreams-4.6.1/debian/control 2011-05-19 17:39:59.000000000 -0500 @@ -1,11 +1,10 @@ Source: wvstreams Section: libs Priority: optional -Maintainer: Ubuntu Core Developers -XSBC-Original-Maintainer: Debian QA Group -Build-Depends: debhelper (>> 5.0.0), quilt, autotools-dev, libdb-dev, libpam0g-dev, libqt3-mt-dev, libssl-dev, libxplc0.3.13-dev, libpopt-dev, zlib1g-dev, doxygen, libdbus-1-dev +Maintainer: Debian QA Group +Build-Depends: debhelper (>> 5.0.0), autotools-dev, libdb-dev, libpam0g-dev, libqt3-mt-dev, libssl-dev, libxplc0.3.13-dev, libpopt-dev, zlib1g-dev, doxygen, libdbus-1-dev Build-Conflicts: valgrind -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Homepage: http://alumnit.ca Package: libwvstreams4.6-base @@ -38,8 +37,6 @@ Package: libuniconf4.6 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libuniconf4.0 (<< 4.0.2-5), libuniconf4.2, libuniconf4.3, libuniconf4.4 -Replaces: libuniconf4.4 Description: C++ network libraries for rapid application development UniConf is a configuration system that can serve as the centrepiece among many other, existing configuration systems, such as: @@ -54,6 +51,7 @@ Package: libwvstreams4.6-doc Architecture: all Section: doc +Depends: ${misc:Depends} Suggests: libwvstreams-dev (= ${binary:Version}) Description: Documentation for WvStreams Contains all the documentation available to program with WvStreams. diff -Nru wvstreams-4.6.1/debian/patches/05_gcc.diff wvstreams-4.6.1/debian/patches/05_gcc.diff --- wvstreams-4.6.1/debian/patches/05_gcc.diff 1969-12-31 18:00:00.000000000 -0600 +++ wvstreams-4.6.1/debian/patches/05_gcc.diff 2011-05-19 17:02:41.000000000 -0500 @@ -0,0 +1,41 @@ +Index: wvstreams-4.6.1/crypto/wvx509.cc +=================================================================== +--- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200 ++++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200 +@@ -1157,7 +1157,7 @@ + + if (ext) + { +- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext); + if (!method) + { + WvDynBuf buf; +Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc +=================================================================== +--- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200 ++++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200 +@@ -1,8 +1,6 @@ + #include "wvunixdgsocket.h" +-#ifdef MACOS + #include + #include +-#endif + + WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) + : socketfile(filename) +Index: wvstreams-4.6.1/streams/wvatomicfile.cc +=================================================================== +--- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200 ++++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200 +@@ -10,10 +10,7 @@ + #include "wvatomicfile.h" + #include "wvfileutils.h" + #include "wvstrutils.h" +- +-#ifdef MACOS + #include +-#endif + + WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) + : tmp_file(WvString::null) diff -Nru wvstreams-4.6.1/debian/patches/series wvstreams-4.6.1/debian/patches/series --- wvstreams-4.6.1/debian/patches/series 2011-08-14 20:34:26.000000000 -0500 +++ wvstreams-4.6.1/debian/patches/series 2011-05-19 17:04:26.000000000 -0500 @@ -2,3 +2,4 @@ 02_doc_path.diff 03_html_sgml.diff 04_signed_request.diff +05_gcc.diff diff -Nru wvstreams-4.6.1/debian/rules wvstreams-4.6.1/debian/rules --- wvstreams-4.6.1/debian/rules 2011-08-14 20:34:26.000000000 -0500 +++ wvstreams-4.6.1/debian/rules 2011-05-19 17:06:53.000000000 -0500 @@ -45,8 +45,6 @@ dh_testdir # Add here commands to configure the package. - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -94,8 +92,6 @@ [ ! -f xplc/Makefile ] || $(MAKE) -C xplc distclean [ ! -f Makefile ] || $(MAKE) distclean - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - rm -f config.sub config.guess rm -rf .pc diff -Nru wvstreams-4.6.1/debian/source/format wvstreams-4.6.1/debian/source/format --- wvstreams-4.6.1/debian/source/format 1969-12-31 18:00:00.000000000 -0600 +++ wvstreams-4.6.1/debian/source/format 2011-05-19 17:05:03.000000000 -0500 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc --- wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-08-14 20:34:26.000000000 -0500 +++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2009-05-13 16:42:52.000000000 -0500 @@ -1,6 +1,8 @@ #include "wvunixdgsocket.h" +#ifdef MACOS #include #include +#endif WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) : socketfile(filename) diff -Nru wvstreams-4.6.1/streams/wvatomicfile.cc wvstreams-4.6.1/streams/wvatomicfile.cc --- wvstreams-4.6.1/streams/wvatomicfile.cc 2011-08-14 20:34:26.000000000 -0500 +++ wvstreams-4.6.1/streams/wvatomicfile.cc 2009-05-13 16:42:52.000000000 -0500 @@ -10,7 +10,10 @@ #include "wvatomicfile.h" #include "wvfileutils.h" #include "wvstrutils.h" + +#ifdef MACOS #include +#endif WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) : tmp_file(WvString::null)