diff options
-rw-r--r-- | debian/changelog | 16 | ||||
-rw-r--r-- | debian/libpsocksxx0.symbols.amd64 | 4 | ||||
-rw-r--r-- | debian/libpsocksxx0.symbols.i386 | 4 | ||||
-rw-r--r-- | debian/patches/0001-disable_network_test.patch (renamed from debian/patches/10_test_network.patch) | 0 | ||||
-rw-r--r-- | debian/patches/0700-ReproducibleBuilds.patch (renamed from debian/patches/0500-ReproducibleBuilds.patch) | 0 | ||||
-rw-r--r-- | debian/patches/0705-hurd.patch (renamed from debian/patches/0100-hurd.patch) | 0 | ||||
-rw-r--r-- | debian/patches/series | 6 | ||||
-rwxr-xr-x | debian/rules | 8 |
8 files changed, 26 insertions, 12 deletions
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 <debian@jff-webhosting.net> Sat, 20 Jun 2015 18:40:22 +0200 + -- Jörg Frings-Fürst <debian@jff-webhosting.net> 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/10_test_network.patch b/debian/patches/0001-disable_network_test.patch index 3861c55..3861c55 100644 --- a/debian/patches/10_test_network.patch +++ b/debian/patches/0001-disable_network_test.patch diff --git a/debian/patches/0500-ReproducibleBuilds.patch b/debian/patches/0700-ReproducibleBuilds.patch index 7451143..7451143 100644 --- a/debian/patches/0500-ReproducibleBuilds.patch +++ b/debian/patches/0700-ReproducibleBuilds.patch diff --git a/debian/patches/0100-hurd.patch b/debian/patches/0705-hurd.patch index 70dabaa..70dabaa 100644 --- a/debian/patches/0100-hurd.patch +++ b/debian/patches/0705-hurd.patch 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 + + |