status form 2014-10-02

12 files changed, 91 insertions, 22 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 5604b8f..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,12 +0,0 @@
-psocksxx for Debian
--------------------
-
-The lintian warning "libpsocksxx-dev: embedded-javascript-library 
-usr/share/doc/libpsocksxx-dev/docs/jquery.js please use libjs-jquery"
-was overridden.
-
-The file jquery.js comes from the with doxygen generated documentation.
-
-The buildin jquery.js in doxygen would not removed (see Debian bug #736432).
-
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 30 Sep 2014 18:13:56 +0200
diff --git a/debian/control b/debian/control
index 0306a2e..51bd8e6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Build-Depends:
  debhelper (>= 9),
  dh-autoreconf,
  doxygen,
- libcunit1-dev (>= 1.12.1)
+ libcunit1-dev (>= 1.12.1),
+ libcppunit-dev
 Standards-Version: 3.9.6
 Homepage: https://github.com/uditha-atukorala/psocksxx
 Vcs-Git: git://anonscm.debian.org/collab-maint/psocksxx.git
@@ -15,8 +16,11 @@ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/psocksxx.git
 Package: libpsocksxx0
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libpsocksxx-doc
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends}
 Description: psocksxx is a C++ wrapper for POSIX sockets
  psocksxx library attempts to borrow the concepts from socket++ and
  socket-library, but not the code, and create a well documented (and
@@ -31,6 +35,7 @@ Multi-Arch: same
 Depends:
  libpsocksxx0 (= ${binary:Version}),
  ${misc:Depends}
+Suggests: libpsocksxx-doc
 Description: psocksxx is a C++ wrapper for POSIX sockets (development files)
  psocksxx library attempts to borrow the concepts from socket++ and
  socket-library, but not the code, and create a well documented (and
diff --git a/debian/copyright b/debian/copyright
index 8286787..5d9776a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,10 @@ Files: debian/*
 Copyright: 2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: GPL-3+
 
+Files: debian/patches/*
+Copyright: 2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
+License: LGPL-3+
+
 License: LGPL-3+
  This software library is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
diff --git a/debian/libpsocksxx-dev.install b/debian/libpsocksxx-dev.install
index 49d3492..34bfc00 100644
--- a/debian/libpsocksxx-dev.install
+++ b/debian/libpsocksxx-dev.install
@@ -1,3 +1,2 @@
 usr/include
 usr/lib/*/lib*.so
-usr/lib/*/lib*.a
diff --git a/debian/libpsocksxx-doc.lintian-overrides b/debian/libpsocksxx-doc.lintian-overrides
index 9b803c0..92e4f8c 100644
--- a/debian/libpsocksxx-doc.lintian-overrides
+++ b/debian/libpsocksxx-doc.lintian-overrides
@@ -1 +1,7 @@
-libpsocksxx-doc binary: embedded-javascript-library
\ No newline at end of file
+# The lintian warning "libpsocksxx-dev: embedded-javascript-library
+# usr/share/doc/libpsocksxx-dev/docs/jquery.js please use libjs-jquery"
+# was overridden.
+# The file jquery.js comes from the with doxygen generated documentation.
+# The buildin jquery.js in doxygen would not removed (see Debian bug #736432).
+#
+libpsocksxx-doc binary: embedded-javascript-library
diff --git a/debian/libpsocksxx0.docs b/debian/libpsocksxx0.docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/libpsocksxx0.docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/libpsocksxx0.symbols b/debian/libpsocksxx0.symbols
index 2886182..5662688 100644
--- a/debian/libpsocksxx0.symbols
+++ b/debian/libpsocksxx0.symbols
@@ -28,6 +28,8 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZN8psocksxx11osockstreamD0Ev@Base 0.0.5
  _ZN8psocksxx11osockstreamD1Ev@Base 0.0.5
  _ZN8psocksxx11osockstreamD2Ev@Base 0.0.5
+ _ZN8psocksxx12iosockstreamD0Ev@Base 0.0.5
+ _ZN8psocksxx12iosockstreamD1Ev@Base 0.0.5
  _ZN8psocksxx12iosockstreamD2Ev@Base 0.0.5
  _ZN8psocksxx13sockexceptionC1EPKc@Base 0.0.5
  _ZN8psocksxx13sockexceptionC2EPKc@Base 0.0.5
@@ -77,6 +79,11 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZN8psocksxx20socktimeoutexceptionD2Ev@Base 0.0.5
  _ZN8psocksxx7iosocks13clear_timeoutEv@Base 0.0.5
  _ZN8psocksxx7iosocks7timeoutEll@Base 0.0.5
+ _ZN8psocksxx7iosocksD0Ev@Base 0.0.5
+ _ZN8psocksxx7iosocksD1Ev@Base 0.0.5
+ _ZN8psocksxx8sockaddrD0Ev@Base 0.0.5
+ _ZN8psocksxx8sockaddrD1Ev@Base 0.0.5
+ _ZN8psocksxx8sockaddrD2Ev@Base 0.0.5
  _ZN8psocksxx9lsockaddrC1EPKc@Base 0.0.5
  _ZN8psocksxx9lsockaddrC2EPKc@Base 0.0.5
  _ZN8psocksxx9lsockaddrD0Ev@Base 0.0.5
@@ -101,6 +108,9 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZNK8psocksxx9nsockaddr4sizeEv@Base 0.0.5
  _ZNK8psocksxx9nsockaddr9psockaddrEv@Base 0.0.5
  _ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@Base 0.0.5
+ _ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 0.0.5
+ _ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 0.0.5
+ _ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 0.0.5
  _ZTI11sockaddr_in@Base 0.0.5
  _ZTI11sockaddr_un@Base 0.0.5
  _ZTIN8psocksxx11isockstreamE@Base 0.0.5
@@ -137,17 +147,21 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZTTN8psocksxx11lsockstreamE@Base 0.0.5
  _ZTTN8psocksxx11nsockstreamE@Base 0.0.5
  _ZTTN8psocksxx11osockstreamE@Base 0.0.5
+ _ZTTN8psocksxx12iosockstreamE@Base 0.0.5
  _ZTTN8psocksxx14tcpnsockstreamE@Base 0.0.5
  _ZTTN8psocksxx14udpnsockstreamE@Base 0.0.5
+ _ZTTN8psocksxx7iosocksE@Base 0.0.5
  _ZTVN8psocksxx11isockstreamE@Base 0.0.5
  _ZTVN8psocksxx11lsockstreamE@Base 0.0.5
  _ZTVN8psocksxx11nsockstreamE@Base 0.0.5
  _ZTVN8psocksxx11osockstreamE@Base 0.0.5
+ _ZTVN8psocksxx12iosockstreamE@Base 0.0.5
  _ZTVN8psocksxx13sockexceptionE@Base 0.0.5
  _ZTVN8psocksxx13sockstreambufE@Base 0.0.5
  _ZTVN8psocksxx14tcpnsockstreamE@Base 0.0.5
  _ZTVN8psocksxx14udpnsockstreamE@Base 0.0.5
  _ZTVN8psocksxx20socktimeoutexceptionE@Base 0.0.5
+ _ZTVN8psocksxx7iosocksE@Base 0.0.5
  _ZTVN8psocksxx8sockaddrE@Base 0.0.5
  _ZTVN8psocksxx9lsockaddrE@Base 0.0.5
  _ZTVN8psocksxx9nsockaddrE@Base 0.0.5
@@ -155,6 +169,8 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZThn16_N8psocksxx11lsockstreamD1Ev@Base 0.0.5
  _ZThn16_N8psocksxx11nsockstreamD0Ev@Base 0.0.5
  _ZThn16_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
+ _ZThn16_N8psocksxx12iosockstreamD0Ev@Base 0.0.5
+ _ZThn16_N8psocksxx12iosockstreamD1Ev@Base 0.0.5
  _ZThn16_N8psocksxx14tcpnsockstreamD0Ev@Base 0.0.5
  _ZThn16_N8psocksxx14tcpnsockstreamD1Ev@Base 0.0.5
  _ZThn16_N8psocksxx14udpnsockstreamD0Ev@Base 0.0.5
@@ -167,10 +183,14 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZTv0_n24_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
  _ZTv0_n24_N8psocksxx11osockstreamD0Ev@Base 0.0.5
  _ZTv0_n24_N8psocksxx11osockstreamD1Ev@Base 0.0.5
+ _ZTv0_n24_N8psocksxx12iosockstreamD0Ev@Base 0.0.5
+ _ZTv0_n24_N8psocksxx12iosockstreamD1Ev@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_n24_N8psocksxx7iosocksD0Ev@Base 0.0.5
+ _ZTv0_n24_N8psocksxx7iosocksD1Ev@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
@@ -179,6 +199,8 @@ libpsocksxx.so.0 libpsocksxx0 #MINVER#
  _ZTv0_n32_N8psocksxx11nsockstreamD1Ev@Base 0.0.5
  _ZTv0_n32_N8psocksxx11osockstreamD0Ev@Base 0.0.5
  _ZTv0_n32_N8psocksxx11osockstreamD1Ev@Base 0.0.5
+ _ZTv0_n32_N8psocksxx12iosockstreamD0Ev@Base 0.0.5
+ _ZTv0_n32_N8psocksxx12iosockstreamD1Ev@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
diff --git a/debian/patches/10_test_network.patch b/debian/patches/10_test_network.patch
new file mode 100644
index 0000000..6ca5012
--- /dev/null
+++ b/debian/patches/10_test_network.patch
@@ -0,0 +1,15 @@
+Index: trunk/test/nsockaddr_test.h
+===================================================================
+--- trunk.orig/test/nsockaddr_test.h	2014-10-01 10:48:56.499125525 +0200
++++ trunk/test/nsockaddr_test.h	2014-10-01 10:49:17.291557429 +0200
+@@ -31,8 +31,8 @@
+ 	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:
diff --git a/debian/patches/20_doxygen_cfg.patch b/debian/patches/20_doxygen_cfg.patch
new file mode 100644
index 0000000..98d169b
--- /dev/null
+++ b/debian/patches/20_doxygen_cfg.patch
@@ -0,0 +1,24 @@
+Index: trunk/doc/doxygen.cfg.in
+===================================================================
+--- trunk.orig/doc/doxygen.cfg.in	2013-08-24 18:10:34.000000000 +0200
++++ trunk/doc/doxygen.cfg.in	2014-10-01 12:51:35.462880232 +0200
+@@ -44,7 +44,7 @@
+ INLINE_GROUPED_CLASSES = NO
+ INLINE_SIMPLE_STRUCTS  = NO
+ TYPEDEF_HIDES_STRUCT   = NO
+-SYMBOL_CACHE_SIZE      = 0
++#SYMBOL_CACHE_SIZE      = 0
+ LOOKUP_CACHE_SIZE      = 0
+ 
+ 
+@@ -246,8 +246,8 @@
+ #---------------------------------------------------------------------------
+ GENERATE_XML           = NO
+ XML_OUTPUT             = xml
+-XML_SCHEMA             =
+-XML_DTD                =
++#XML_SCHEMA             =
++#XML_DTD                =
+ XML_PROGRAMLISTING     = YES
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8841396
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+20_doxygen_cfg.patch
+10_test_network.patch
diff --git a/debian/rules b/debian/rules
index 97d885b..f827959 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,19 +2,26 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 #
 # Hardening
 #
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+
+export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall
+#CPPFLAGS+= -Wall
+#export CPPFLAGS
+
 %:
 	dh $@ --with autoreconf
 
+override_dh_auto_build:
+	dh_auto_build
+	make -C doc doxygen-doc
 
 override_dh_installdocs:
-	make -C doc doxygen-doc
 	cp -r $(CURDIR)/doc/doxygen/html/* $(CURDIR)/debian/libpsocksxx-doc/usr/share/doc/libpsocksxx-doc/docs/
 	dh_installdocs
 	
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 22a4de9..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,2 +0,0 @@
-compression = xz
-compression-level = 9