diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/patches/10_test_network.patch | 13 | ||||
| -rwxr-xr-x | debian/rules | 4 |
4 files changed, 29 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index bea6658..b6dbcc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +psocksxx (0.0.6-2) unstable; urgency=medium + + * debian/rules: + - Add *-indep rules to prevent build errors if only + architecture specific targets build. (Closes: #768183) + * debian/control: + - Move doxygen from Build-Depends to Build-Depends-Indep. + * debian/patches/10_test_network.patch: + - Disable test_connect_addr to prevent build errors. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 06 Nov 2014 13:10:19 +0100 + psocksxx (0.0.6-1) unstable; urgency=low * Initial release (Closes: #763432). diff --git a/debian/control b/debian/control index 4ab5ccb..b7f9be0 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,10 @@ Uploaders: Uditha Atukorala <udi@geniusse.com> Build-Depends: debhelper (>= 9), dh-autoreconf, - doxygen, libcunit1-dev, libcppunit-dev +Build-Depends-Indep: + doxygen Standards-Version: 3.9.6 Homepage: https://github.com/uditha-atukorala/psocksxx Vcs-Git: git://anonscm.debian.org/collab-maint/psocksxx.git diff --git a/debian/patches/10_test_network.patch b/debian/patches/10_test_network.patch index bfdcc56..3861c55 100644 --- a/debian/patches/10_test_network.patch +++ b/debian/patches/10_test_network.patch @@ -24,3 +24,16 @@ Index: trunk/test/nsockaddr_test.h 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/rules b/debian/rules index bc5d38c..977cdbd 100755 --- a/debian/rules +++ b/debian/rules @@ -18,10 +18,10 @@ export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall %: dh $@ --with autoreconf -override_dh_auto_build: +override_dh_auto_build-indep: dh_auto_build make -C doc doxygen-doc -override_dh_installdocs: +override_dh_installdocs-indep: cp -r $(CURDIR)/doc/doxygen/html/* $(CURDIR)/debian/libpsocksxx-doc/usr/share/doc/libpsocksxx-doc/docs/ dh_installdocs |