From 6ecc9f7c370a9c33692ec787c81a32c0e5795f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 23 Oct 2015 21:22:08 +0200 Subject: changes for symbols files; rename patches --- debian/changelog | 16 +++++++---- debian/libpsocksxx0.symbols.amd64 | 4 +-- debian/libpsocksxx0.symbols.i386 | 4 +-- debian/patches/0001-disable_network_test.patch | 39 ++++++++++++++++++++++++++ debian/patches/0100-hurd.patch | 21 -------------- debian/patches/0500-ReproducibleBuilds.patch | 19 ------------- debian/patches/0700-ReproducibleBuilds.patch | 19 +++++++++++++ debian/patches/0705-hurd.patch | 21 ++++++++++++++ debian/patches/10_test_network.patch | 39 -------------------------- debian/patches/series | 6 ++-- debian/rules | 8 ++++++ 11 files changed, 105 insertions(+), 91 deletions(-) create mode 100644 debian/patches/0001-disable_network_test.patch delete mode 100644 debian/patches/0100-hurd.patch delete mode 100644 debian/patches/0500-ReproducibleBuilds.patch create mode 100644 debian/patches/0700-ReproducibleBuilds.patch create mode 100644 debian/patches/0705-hurd.patch delete mode 100644 debian/patches/10_test_network.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d19ba30..6f26bea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ -psocksxx (0.0.6-3) UNRELEASED; urgency=low +psocksxx (0.0.6-3) unstable; urgency=low * Make build results reproducible (Closes: #789399): - - New debian/patches/0500-ReproducibleBuilds.patch: + - New debian/patches/0700-ReproducibleBuilds.patch: At doxygen setup change HTML_TIMESTAMP to NO. - * New debian/patches/0100-hurd.patch: - - Add missing hurd/system.h. + * New debian/patches/0705-hurd.patch: + - Add missing hurd/socket.h. + * Rename debian/patches/10_test_network.patch to + 0001-disable_network_test.patch. + * debian/rules: + - Add override_dh_makeshlibs to remove the debian_revision for + dpkg-gensymbols. + - Refresh symbol files (Closes: #802523). - -- Jörg Frings-Fürst Sat, 20 Jun 2015 18:40:22 +0200 + -- Jörg Frings-Fürst Tue, 20 Oct 2015 23:58:27 +0200 psocksxx (0.0.6-2) unstable; urgency=medium diff --git a/debian/libpsocksxx0.symbols.amd64 b/debian/libpsocksxx0.symbols.amd64 index 2886182..0111303 100644 --- a/debian/libpsocksxx0.symbols.amd64 +++ b/debian/libpsocksxx0.symbols.amd64 @@ -100,7 +100,7 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER# _ZNK8psocksxx9lsockaddr9psockaddrEv@Base 0.0.5 _ZNK8psocksxx9nsockaddr4sizeEv@Base 0.0.5 _ZNK8psocksxx9nsockaddr9psockaddrEv@Base 0.0.5 - _ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@Base 0.0.5 +#MISSING: 0.0.6-3# _ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@Base 0.0.5 _ZTI11sockaddr_in@Base 0.0.5 _ZTI11sockaddr_un@Base 0.0.5 _ZTIN8psocksxx11isockstreamE@Base 0.0.5 @@ -148,7 +148,7 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER# _ZTVN8psocksxx14tcpnsockstreamE@Base 0.0.5 _ZTVN8psocksxx14udpnsockstreamE@Base 0.0.5 _ZTVN8psocksxx20socktimeoutexceptionE@Base 0.0.5 - _ZTVN8psocksxx8sockaddrE@Base 0.0.5 +#MISSING: 0.0.6-3# _ZTVN8psocksxx8sockaddrE@Base 0.0.5 _ZTVN8psocksxx9lsockaddrE@Base 0.0.5 _ZTVN8psocksxx9nsockaddrE@Base 0.0.5 _ZThn16_N8psocksxx11lsockstreamD0Ev@Base 0.0.5 diff --git a/debian/libpsocksxx0.symbols.i386 b/debian/libpsocksxx0.symbols.i386 index 7e69f87..c1dc076 100644 --- a/debian/libpsocksxx0.symbols.i386 +++ b/debian/libpsocksxx0.symbols.i386 @@ -100,7 +100,7 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER# _ZNK8psocksxx9lsockaddr9psockaddrEv@Base 0.0.5 _ZNK8psocksxx9nsockaddr4sizeEv@Base 0.0.5 _ZNK8psocksxx9nsockaddr9psockaddrEv@Base 0.0.5 - _ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@Base 0.0.5 +#MISSING: 0.0.6-3# _ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@Base 0.0.5 _ZTI11sockaddr_in@Base 0.0.5 _ZTI11sockaddr_un@Base 0.0.5 _ZTIN8psocksxx11isockstreamE@Base 0.0.5 @@ -148,7 +148,7 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER# _ZTVN8psocksxx14tcpnsockstreamE@Base 0.0.5 _ZTVN8psocksxx14udpnsockstreamE@Base 0.0.5 _ZTVN8psocksxx20socktimeoutexceptionE@Base 0.0.5 - _ZTVN8psocksxx8sockaddrE@Base 0.0.5 +#MISSING: 0.0.6-3# _ZTVN8psocksxx8sockaddrE@Base 0.0.5 _ZTVN8psocksxx9lsockaddrE@Base 0.0.5 _ZTVN8psocksxx9nsockaddrE@Base 0.0.5 _ZThn8_N8psocksxx11lsockstreamD0Ev@Base 0.0.5 diff --git a/debian/patches/0001-disable_network_test.patch b/debian/patches/0001-disable_network_test.patch new file mode 100644 index 0000000..3861c55 --- /dev/null +++ b/debian/patches/0001-disable_network_test.patch @@ -0,0 +1,39 @@ +Description: disable network tests + disable network tests to prevent errors on buildsystems + without any networks. +Author: Jörg Frings-Fürst +Last-Update: 2014-10-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/test/nsockaddr_test.h +=================================================================== +--- trunk.orig/test/nsockaddr_test.h ++++ trunk/test/nsockaddr_test.h +@@ -28,11 +28,11 @@ class nsockaddr_test : public CppUnit::T + // setup the test suite + CPPUNIT_TEST_SUITE( nsockaddr_test ); + CPPUNIT_TEST( test_constructor_localhost ); +- CPPUNIT_TEST( test_constructor_remote ); ++// CPPUNIT_TEST( test_constructor_remote ); + CPPUNIT_TEST( test_constructor_fail ); + CPPUNIT_TEST( test_constructor_local_any ); +- CPPUNIT_TEST( test_constructor_local_service ); +- CPPUNIT_TEST( test_constructor_remote_service ); ++// CPPUNIT_TEST( test_constructor_local_service ); ++// CPPUNIT_TEST( test_constructor_remote_service ); + CPPUNIT_TEST_SUITE_END(); + + public: +Index: trunk/test/lsockstream_test.h +=================================================================== +--- trunk.orig/test/lsockstream_test.h ++++ trunk/test/lsockstream_test.h +@@ -39,7 +39,7 @@ class lsockstream_test : public CppUnit: + CPPUNIT_TEST( test_connect_fail ); + CPPUNIT_TEST( test_connect_addr_fail ); + CPPUNIT_TEST( test_connect ); +- CPPUNIT_TEST( test_connect_addr ); ++// CPPUNIT_TEST( test_connect_addr ); + CPPUNIT_TEST( test_read_timeout ); + CPPUNIT_TEST_SUITE_END(); + diff --git a/debian/patches/0100-hurd.patch b/debian/patches/0100-hurd.patch deleted file mode 100644 index 70dabaa..0000000 --- a/debian/patches/0100-hurd.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Add hurd/system.h -Author: Jörg Frings-Fürst -Last-Update: 2015-06-21 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/lib/psocksxx/sockstreambuf.h -=================================================================== ---- trunk.orig/lib/psocksxx/sockstreambuf.h -+++ trunk/lib/psocksxx/sockstreambuf.h -@@ -25,6 +25,11 @@ - - #include - #include -+ -+#if defined(__GNU__) || defined(__gnu_hurd__) -+#include -+#endif -+ - #include - #include - diff --git a/debian/patches/0500-ReproducibleBuilds.patch b/debian/patches/0500-ReproducibleBuilds.patch deleted file mode 100644 index 7451143..0000000 --- a/debian/patches/0500-ReproducibleBuilds.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Remove timestamp from doxygen generated files -Author: Jörg Frings-Fürst -Forwarded: not-needed -Last-Update: 2015-02-23 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/doc/doxygen.cfg.in -=================================================================== ---- trunk.orig/doc/doxygen.cfg.in -+++ trunk/doc/doxygen.cfg.in -@@ -156,7 +156,7 @@ HTML_EXTRA_FILES = - HTML_COLORSTYLE_HUE = 220 - HTML_COLORSTYLE_SAT = 100 - HTML_COLORSTYLE_GAMMA = 80 --HTML_TIMESTAMP = YES -+HTML_TIMESTAMP = NO - HTML_DYNAMIC_SECTIONS = NO - HTML_INDEX_NUM_ENTRIES = 100 - GENERATE_DOCSET = NO diff --git a/debian/patches/0700-ReproducibleBuilds.patch b/debian/patches/0700-ReproducibleBuilds.patch new file mode 100644 index 0000000..7451143 --- /dev/null +++ b/debian/patches/0700-ReproducibleBuilds.patch @@ -0,0 +1,19 @@ +Description: Remove timestamp from doxygen generated files +Author: Jörg Frings-Fürst +Forwarded: not-needed +Last-Update: 2015-02-23 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/doxygen.cfg.in +=================================================================== +--- trunk.orig/doc/doxygen.cfg.in ++++ trunk/doc/doxygen.cfg.in +@@ -156,7 +156,7 @@ HTML_EXTRA_FILES = + HTML_COLORSTYLE_HUE = 220 + HTML_COLORSTYLE_SAT = 100 + HTML_COLORSTYLE_GAMMA = 80 +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + HTML_DYNAMIC_SECTIONS = NO + HTML_INDEX_NUM_ENTRIES = 100 + GENERATE_DOCSET = NO diff --git a/debian/patches/0705-hurd.patch b/debian/patches/0705-hurd.patch new file mode 100644 index 0000000..70dabaa --- /dev/null +++ b/debian/patches/0705-hurd.patch @@ -0,0 +1,21 @@ +Description: Add hurd/system.h +Author: Jörg Frings-Fürst +Last-Update: 2015-06-21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/psocksxx/sockstreambuf.h +=================================================================== +--- trunk.orig/lib/psocksxx/sockstreambuf.h ++++ trunk/lib/psocksxx/sockstreambuf.h +@@ -25,6 +25,11 @@ + + #include + #include ++ ++#if defined(__GNU__) || defined(__gnu_hurd__) ++#include ++#endif ++ + #include + #include + diff --git a/debian/patches/10_test_network.patch b/debian/patches/10_test_network.patch deleted file mode 100644 index 3861c55..0000000 --- a/debian/patches/10_test_network.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: disable network tests - disable network tests to prevent errors on buildsystems - without any networks. -Author: Jörg Frings-Fürst -Last-Update: 2014-10-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/test/nsockaddr_test.h -=================================================================== ---- trunk.orig/test/nsockaddr_test.h -+++ trunk/test/nsockaddr_test.h -@@ -28,11 +28,11 @@ class nsockaddr_test : public CppUnit::T - // setup the test suite - CPPUNIT_TEST_SUITE( nsockaddr_test ); - CPPUNIT_TEST( test_constructor_localhost ); -- CPPUNIT_TEST( test_constructor_remote ); -+// CPPUNIT_TEST( test_constructor_remote ); - CPPUNIT_TEST( test_constructor_fail ); - CPPUNIT_TEST( test_constructor_local_any ); -- CPPUNIT_TEST( test_constructor_local_service ); -- CPPUNIT_TEST( test_constructor_remote_service ); -+// CPPUNIT_TEST( test_constructor_local_service ); -+// CPPUNIT_TEST( test_constructor_remote_service ); - CPPUNIT_TEST_SUITE_END(); - - public: -Index: trunk/test/lsockstream_test.h -=================================================================== ---- trunk.orig/test/lsockstream_test.h -+++ trunk/test/lsockstream_test.h -@@ -39,7 +39,7 @@ class lsockstream_test : public CppUnit: - CPPUNIT_TEST( test_connect_fail ); - CPPUNIT_TEST( test_connect_addr_fail ); - CPPUNIT_TEST( test_connect ); -- CPPUNIT_TEST( test_connect_addr ); -+// CPPUNIT_TEST( test_connect_addr ); - CPPUNIT_TEST( test_read_timeout ); - CPPUNIT_TEST_SUITE_END(); - diff --git a/debian/patches/series b/debian/patches/series index 544092b..8d660a8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -0500-ReproducibleBuilds.patch -10_test_network.patch -0100-hurd.patch +0700-ReproducibleBuilds.patch +0001-disable_network_test.patch +0705-hurd.patch diff --git a/debian/rules b/debian/rules index 977cdbd..b6c8c00 100755 --- a/debian/rules +++ b/debian/rules @@ -25,3 +25,11 @@ override_dh_auto_build-indep: override_dh_installdocs-indep: cp -r $(CURDIR)/doc/doxygen/html/* $(CURDIR)/debian/libpsocksxx-doc/usr/share/doc/libpsocksxx-doc/docs/ dh_installdocs + +UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev) + +override_dh_makeshlibs: + dh_makeshlibs + dpkg-gensymbols -c0 -v$(UPSTREAM_VERSION) -plibpsocksxx0 + + -- cgit v1.2.3