import NMUs

2 files changed, 85 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index 9719977..d13c380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+psocksxx (1.1.0-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix x32 symbols.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 20 Mar 2016 19:37:09 +0100
+
+psocksxx (1.1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix symbols file, by restricting 64 bit architectures.
+  * Fix sparc64 symbol.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 20 Mar 2016 17:14:44 +0100
+
 psocksxx (1.1.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/libpsocksxx0.symbols b/debian/libpsocksxx0.symbols
index 30168ed..80de09d 100644
--- a/debian/libpsocksxx0.symbols
+++ b/debian/libpsocksxx0.symbols
@@ -48,7 +48,9 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZN8psocksxx13sockstreambuf6listenEi@Base 0.0.5
  _ZN8psocksxx13sockstreambuf7connectEPKNS_8sockaddrEP7timeval@Base 0.0.5
  _ZN8psocksxx13sockstreambuf7connectEPKNS_8sockaddrEj@Base 0.0.5
- _ZN8psocksxx13sockstreambuf7timeoutEll@Base 0.0.5
+ (arch=!sparc64 !x32)_ZN8psocksxx13sockstreambuf7timeoutEll@Base 0.0.5
+ (arch=sparc64)_ZN8psocksxx13sockstreambuf7timeoutEli@Base 1.1.0
+ (arch=x32)_ZN8psocksxx13sockstreambuf7timeoutExx@Base 1.1.0
  _ZN8psocksxx13sockstreambuf8overflowEi@Base 0.0.5
  _ZN8psocksxx13sockstreambuf9underflowEv@Base 0.0.5
  _ZN8psocksxx13sockstreambufC1Ei@Base 0.0.5
@@ -76,7 +78,9 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZN8psocksxx20socktimeoutexceptionD1Ev@Base 0.0.5
  _ZN8psocksxx20socktimeoutexceptionD2Ev@Base 0.0.5
  _ZN8psocksxx7iosocks13clear_timeoutEv@Base 0.0.5
- _ZN8psocksxx7iosocks7timeoutEll@Base 0.0.5
+ (arch=!sparc64 !x32)_ZN8psocksxx7iosocks7timeoutEll@Base 0.0.5
+ (arch=sparc64)_ZN8psocksxx7iosocks7timeoutEli@Base 1.1.0
+ (arch=x32)_ZN8psocksxx7iosocks7timeoutExx@Base 1.1.0
  _ZN8psocksxx9lsockaddrC1EPKc@Base 0.0.5
  _ZN8psocksxx9lsockaddrC2EPKc@Base 0.0.5
  _ZN8psocksxx9lsockaddrD0Ev@Base 0.0.5
@@ -149,35 +153,67 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZTVN8psocksxx20socktimeoutexceptionE@Base 0.0.5
  _ZTVN8psocksxx9lsockaddrE@Base 0.0.5
  _ZTVN8psocksxx9nsockaddrE@Base 0.0.5
- _ZThn16_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
- _ZThn16_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
- _ZThn16_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
- _ZThn16_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
- _ZThn16_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
- _ZThn16_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
- _ZThn16_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
- _ZThn16_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx11isockstreamD0Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx11isockstreamD1Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx11osockstreamD0Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx11osockstreamD1Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
- _ZTv0_n24_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx11isockstreamD0Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx11isockstreamD1Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx11osockstreamD0Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx11osockstreamD1Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
- _ZTv0_n32_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZThn16_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZThn16_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZThn16_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZThn16_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZThn16_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZThn16_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZThn16_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZThn16_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx11isockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx11isockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx11osockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx11osockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n24_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx11isockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx11isockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx11osockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx11osockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
+ (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZTv0_n32_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZThn8_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZThn8_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZThn8_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZThn8_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZThn8_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZThn8_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZThn8_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZThn8_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx11isockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx11isockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx11osockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx11osockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n12_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx11isockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx11isockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx11lsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx11osockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx11osockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
+ (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZTv0_n16_N8psocksxx14udpnsockstreamD1Ev@Base 0.0.5