From af609a5fe23d2f920e7398307bc7d91957a9e7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Jun 2018 06:55:09 +0200 Subject: New upstream version 1.1.1 --- changelog | 4 ++++ configure.ac | 4 ++-- lib/psocksxx/sockstreambuf.cpp | 14 +++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/changelog b/changelog index 448bb56..771952c 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +1.1.1 - 14th June 2018 + * Drop ordered comparisons between pointers and zero + * Use NULL instead of 0 for pointers + 1.1.0 - 29th November 2015 * Add examples * Enforce Automake version check in configure.ac diff --git a/configure.ac b/configure.ac index 1a27829..e905f57 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([psocksxx], [1.1.0], [https://github.com/nukedzn/psocksxx/issues]) +AC_INIT([psocksxx], [1.1.1], [https://github.com/nukedzn/psocksxx/issues]) AC_CONFIG_AUX_DIR([aux-build]) AC_CONFIG_MACRO_DIR([aux-build/m4]) AC_CONFIG_HEADERS([include/config.h]) @@ -33,7 +33,7 @@ AC_CONFIG_HEADERS([include/config.h]) # CURRENT : REVISION : AGE # lib versions -LIBPSOCKSXX_LT_VERSION=1:3:1 +LIBPSOCKSXX_LT_VERSION=1:4:1 AC_SUBST(LIBPSOCKSXX_LT_VERSION) # init diff --git a/lib/psocksxx/sockstreambuf.cpp b/lib/psocksxx/sockstreambuf.cpp index c0a0c81..af3f308 100644 --- a/lib/psocksxx/sockstreambuf.cpp +++ b/lib/psocksxx/sockstreambuf.cpp @@ -68,7 +68,7 @@ namespace psocksxx { cleanup_buffers(); // cleanup timeout - if ( _timeout != 0 ) { + if ( _timeout ) { delete _timeout; } @@ -78,7 +78,7 @@ namespace psocksxx { void sockstreambuf::init_defaults() throw() { // timeout structure reference - _timeout = 0; + _timeout = NULL; // timed-out status _timed_out = false; @@ -165,7 +165,7 @@ namespace psocksxx { } // setup timeout if needed - if ( timeout > 0 ) { + if ( timeout ) { // make the socket non-blocking if ( fcntl( _socket, F_SETFL, ( s_flags | O_NONBLOCK ) ) == -1 ) { @@ -180,7 +180,7 @@ namespace psocksxx { } // check for timeout if set - if ( timeout > 0 ) { + if ( timeout ) { if (! ready( timeout ) ) { @@ -264,13 +264,13 @@ namespace psocksxx { void * sockstreambuf::clear_timeout() throw() { // sanity check - if ( _timeout != 0 ) { + if ( _timeout ) { // delete structure delete _timeout; // set a null pointer - _timeout = 0; + _timeout = NULL; } @@ -481,7 +481,7 @@ namespace psocksxx { _timed_out = false; // create timespec structure from timeval structure - if ( timeout != 0 ) { + if ( timeout ) { t_spec = new timespec; t_spec->tv_sec = timeout->tv_sec; t_spec->tv_nsec = ( timeout->tv_usec * 1000 ); -- cgit v1.2.3 From 7eb875f3a36b77bcb3b066bd7b8de66e223f807d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 29 Jun 2018 07:20:29 +0200 Subject: New upstream release 1.1.1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index eb664fc..c41136c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +psocksxx (1.1.1-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 + psocksxx (1.1.0-2) unstable; urgency=medium * debian/control: -- cgit v1.2.3 From b642e14cbc59e9b7413df1ede9085953d6a4b383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 09:27:22 +0200 Subject: Declare compliance with Debian Policy 4.1.5 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c41136c..6f21a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium * New upstream release. + * Declare compliance with Debian Policy 4.1.5 (No changes needed). -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 diff --git a/debian/control b/debian/control index d1a1c8a..c7a01f3 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: libcppunit-dev Build-Depends-Indep: doxygen -Standards-Version: 3.9.8 +Standards-Version: 4.1.5 Homepage: http://nukedzn.github.io/psocksxx Vcs-Git: git://anonscm.debian.org/collab-maint/psocksxx.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/psocksxx.git -- cgit v1.2.3 From f6f83e4a3023d099e370e587e1d6fd50e5facfa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 09:33:09 +0200 Subject: Migrate to debhelper 11 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f21a5a..79999b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium * New upstream release. + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. * Declare compliance with Debian Policy 4.1.5 (No changes needed). -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index c7a01f3..7792f6d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Uploaders: Uditha Atukorala Build-Depends: - debhelper (>= 10), + debhelper (>= 11), dh-autoreconf, libcunit1-dev, libcppunit-dev -- cgit v1.2.3 From 734fc0b24dd51994fbec12645dae7eace9f85f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 09:38:16 +0200 Subject: Change to my new mail address --- debian/changelog | 4 ++++ debian/control | 2 +- debian/copyright | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 79999b8..b1bc1e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. * Declare compliance with Debian Policy 4.1.5 (No changes needed). + * debian/control: + - Change to my new mail address. + * debian/copyright: + - Change to my new mail address. -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 diff --git a/debian/control b/debian/control index 7792f6d..30b005d 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: psocksxx Section: libs Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Uploaders: Uditha Atukorala Build-Depends: debhelper (>= 11), diff --git a/debian/copyright b/debian/copyright index d29bcc9..e266874 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,11 +7,11 @@ Copyright: 2013-2015 Uditha Atukorala License: LGPL-3+ Files: debian/* -Copyright: 2014-2016 Jörg Frings-Fürst +Copyright: 2014-2016 Jörg Frings-Fürst License: GPL-3+ Files: debian/patches/* -Copyright: 2014-2016 Jörg Frings-Fürst +Copyright: 2014-2016 Jörg Frings-Fürst License: LGPL-3+ License: LGPL-3+ -- cgit v1.2.3 From 2a6a643da9f6290441b18b1f03b3a3daddfdcf62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 09:56:34 +0200 Subject: Switch Vcs-* to new loacation --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b1bc1e5..570fe5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.1.5 (No changes needed). * debian/control: - Change to my new mail address. + - Switch Vcs-* to new loacation. * debian/copyright: - Change to my new mail address. diff --git a/debian/control b/debian/control index 30b005d..c883c4e 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends-Indep: doxygen Standards-Version: 4.1.5 Homepage: http://nukedzn.github.io/psocksxx -Vcs-Git: git://anonscm.debian.org/collab-maint/psocksxx.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/psocksxx.git +Vcs-Git: git://jff.email/opt/git/psocksxx.git +Vcs-Browser: https://jff.email/cgit/psocksxx.git/ Package: libpsocksxx0 Architecture: any -- cgit v1.2.3 From e9179515eb1e70495a34b70de6d00cc625bcbdd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 10:04:56 +0200 Subject: Remove now default dh-autoreconf --- debian/changelog | 3 +++ debian/control | 1 - debian/rules | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 570fe5d..4bffe0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,11 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium * debian/control: - Change to my new mail address. - Switch Vcs-* to new loacation. + - Remove now default Build-Depends dh-autoreconf. * debian/copyright: - Change to my new mail address. + * debian/rules: + - Remove now default --with autoreconf. -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 diff --git a/debian/control b/debian/control index c883c4e..9b66890 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Jörg Frings-Fürst Uploaders: Uditha Atukorala Build-Depends: debhelper (>= 11), - dh-autoreconf, libcunit1-dev, libcppunit-dev Build-Depends-Indep: diff --git a/debian/rules b/debian/rules index b8258ef..0d3b37d 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev) %: - dh $@ --with autoreconf + dh $@ override_dh_auto_build-indep: dh_auto_build -- cgit v1.2.3 From 9947ee8ffcf46121c8618882787a03f66b00716b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 10:07:58 +0200 Subject: Use secure URI for copyright format --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4bffe0b..98ed093 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium - Remove now default Build-Depends dh-autoreconf. * debian/copyright: - Change to my new mail address. + - Use secure URI for copyright format. * debian/rules: - Remove now default --with autoreconf. diff --git a/debian/copyright b/debian/copyright index e266874..c61597d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: psocksxx Source: https://github.com/nukedzn/psocksxx -- cgit v1.2.3 From b9c68817af94b3c2496061cb82b396c7ecf2a985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 10:11:43 +0200 Subject: Add year 2018 for packaging --- debian/changelog | 1 + debian/copyright | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98ed093..d2d766d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium * debian/copyright: - Change to my new mail address. - Use secure URI for copyright format. + - Add year 2018 for packaging. * debian/rules: - Remove now default --with autoreconf. diff --git a/debian/copyright b/debian/copyright index c61597d..2995e4c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,11 +7,11 @@ Copyright: 2013-2015 Uditha Atukorala License: LGPL-3+ Files: debian/* -Copyright: 2014-2016 Jörg Frings-Fürst +Copyright: 2014-2018 Jörg Frings-Fürst License: GPL-3+ Files: debian/patches/* -Copyright: 2014-2016 Jörg Frings-Fürst +Copyright: 2014-2018 Jörg Frings-Fürst License: LGPL-3+ License: LGPL-3+ -- cgit v1.2.3 From 6925013f5dec15d98f842a29f98bfb3b1790f518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 10:19:50 +0200 Subject: Replace parsing the output of dpkg-parsechangelog with --- debian/changelog | 1 + debian/rules | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2d766d..d4a8f93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium - Add year 2018 for packaging. * debian/rules: - Remove now default --with autoreconf. + - Replace parsing the output of dpkg-parsechangelog with $(DEB_VERSION_UPSTREAM). -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 diff --git a/debian/rules b/debian/rules index 0d3b37d..1a61a09 100755 --- a/debian/rules +++ b/debian/rules @@ -14,8 +14,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all # export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall -UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev) - %: dh $@ @@ -29,4 +27,4 @@ override_dh_installdocs-indep: override_dh_makeshlibs: dh_makeshlibs - dpkg-gensymbols -v$(UPSTREAM_VERSION) -plibpsocksxx0 + dpkg-gensymbols -v$(DEB_VERSION_UPSTREAM) -plibpsocksxx0 -- cgit v1.2.3 From 720915d1cd70cd2a5503d5698c17cce3ea73fcec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 10:44:36 +0200 Subject: Remove debian/libpsocksxx-doc.docs to remove twin install of README.md --- debian/changelog | 4 +++- debian/libpsocksxx-doc.docs | 1 - debian/rules | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 debian/libpsocksxx-doc.docs diff --git a/debian/changelog b/debian/changelog index d4a8f93..5debd9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,9 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium - Add year 2018 for packaging. * debian/rules: - Remove now default --with autoreconf. - - Replace parsing the output of dpkg-parsechangelog with $(DEB_VERSION_UPSTREAM). + - Replace parsing the output of dpkg-parsechangelog with + $(DEB_VERSION_UPSTREAM). + * Remove debian/libpsocksxx-doc.docs to remove twin install of README.md. -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 diff --git a/debian/libpsocksxx-doc.docs b/debian/libpsocksxx-doc.docs deleted file mode 100644 index b43bf86..0000000 --- a/debian/libpsocksxx-doc.docs +++ /dev/null @@ -1 +0,0 @@ -README.md diff --git a/debian/rules b/debian/rules index 1a61a09..d42cda7 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all # export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall +# +# for use $(DEB_ ... +# +include /usr/share/dpkg/default.mk + %: dh $@ -- cgit v1.2.3 From 64982c2fcf55f90a8064ebf65c7c77997bb72d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 17:55:55 +0200 Subject: New README.source to explain the branching model used --- debian/README.source | 18 ++++++++++++++++++ debian/changelog | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index 5debd9b..8116aed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,8 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium - Remove now default --with autoreconf. - Replace parsing the output of dpkg-parsechangelog with $(DEB_VERSION_UPSTREAM). - * Remove debian/libpsocksxx-doc.docs to remove twin install of README.md. + * Remove debian/libpsocksxx-doc.docs to prevent twin install of README.md. + * New README.source to explain the branching model used. -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 -- cgit v1.2.3 From 52b6b51f423a9d49941c3809ab7f09672355abac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 18:10:51 +0200 Subject: correct typo --- .pc/.dpkg-source-unapply | 0 .pc/.quilt_patches | 1 + .pc/.quilt_series | 1 + .pc/.version | 1 + debian/changelog | 2 +- debian/changelog.bak | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 .pc/.dpkg-source-unapply create mode 100644 .pc/.quilt_patches create mode 100644 .pc/.quilt_series create mode 100644 .pc/.version create mode 100644 debian/changelog.bak diff --git a/.pc/.dpkg-source-unapply b/.pc/.dpkg-source-unapply new file mode 100644 index 0000000..e69de29 diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches new file mode 100644 index 0000000..6857a8d --- /dev/null +++ b/.pc/.quilt_patches @@ -0,0 +1 @@ +debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series new file mode 100644 index 0000000..c206706 --- /dev/null +++ b/.pc/.quilt_series @@ -0,0 +1 @@ +series diff --git a/.pc/.version b/.pc/.version new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/.pc/.version @@ -0,0 +1 @@ +2 diff --git a/debian/changelog b/debian/changelog index 8116aed..750cb37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.1.5 (No changes needed). * debian/control: - Change to my new mail address. - - Switch Vcs-* to new loacation. + - Switch Vcs-* to new location. - Remove now default Build-Depends dh-autoreconf. * debian/copyright: - Change to my new mail address. diff --git a/debian/changelog.bak b/debian/changelog.bak new file mode 100644 index 0000000..8116aed --- /dev/null +++ b/debian/changelog.bak @@ -0,0 +1,96 @@ +psocksxx (1.1.1-1) UNRELEASED; urgency=medium + + * New upstream release. + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. + * Declare compliance with Debian Policy 4.1.5 (No changes needed). + * debian/control: + - Change to my new mail address. + - Switch Vcs-* to new loacation. + - Remove now default Build-Depends dh-autoreconf. + * debian/copyright: + - Change to my new mail address. + - Use secure URI for copyright format. + - Add year 2018 for packaging. + * debian/rules: + - Remove now default --with autoreconf. + - Replace parsing the output of dpkg-parsechangelog with + $(DEB_VERSION_UPSTREAM). + * Remove debian/libpsocksxx-doc.docs to prevent twin install of README.md. + * New README.source to explain the branching model used. + + -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 + +psocksxx (1.1.0-2) unstable; urgency=medium + + * debian/control: + - Bump Standards-Version to 3.9.8 (no changes required). + - Change VCS-Browser to secure URI. + * debian/watch: + - Bump version to 4 (no changes required). + * debian/copyright: + - Add 2016 to debian/* and debian/patches/*. + * Bump compatlevel to 10 (no changes required): + - Change debian/compat to 10. + - At debian/control change requested version of debhelper to >= 10. + + -- Jörg Frings-Fürst Sat, 15 Oct 2016 04:30:33 +0200 + +psocksxx (1.1.0-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix x32 symbols. + + -- Gianfranco Costamagna 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 Sun, 20 Mar 2016 17:14:44 +0100 + +psocksxx (1.1.0-1) unstable; urgency=medium + + * New upstream release. + * Make build results reproducible (Closes: #789399): + - New debian/patches/0700-ReproducibleBuilds.patch: + At doxygen setup change HTML_TIMESTAMP to NO. + * 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 symbols files (Closes: #802523). + - Rename libpsocksxx0.symbols.amd64 to libpsocksxx0.symbols to get + symbols for all architectures. + * debian/control: + - Change uploader email. + - Change homepage. + * debian/copyright: + - Change Source and upstream email. + - Add 2015. + + -- Jörg Frings-Fürst Mon, 14 Dec 2015 06:02:57 +0100 + +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 Thu, 06 Nov 2014 13:10:19 +0100 + +psocksxx (0.0.6-1) unstable; urgency=low + + * Initial release (Closes: #763432). + + -- Jörg Frings-Fürst Sat, 04 Oct 2014 12:40:08 +0200 -- cgit v1.2.3 From 6ca3a9d6ace43f7f8d6e641f5173010140cbc223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 18:11:56 +0200 Subject: d/changelog: change date/time --- .pc/.dpkg-source-unapply | 0 .pc/.quilt_patches | 1 - .pc/.quilt_series | 1 - .pc/.version | 1 - debian/changelog | 4 ++-- 5 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 .pc/.dpkg-source-unapply delete mode 100644 .pc/.quilt_patches delete mode 100644 .pc/.quilt_series delete mode 100644 .pc/.version diff --git a/.pc/.dpkg-source-unapply b/.pc/.dpkg-source-unapply deleted file mode 100644 index e69de29..0000000 diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches deleted file mode 100644 index 6857a8d..0000000 --- a/.pc/.quilt_patches +++ /dev/null @@ -1 +0,0 @@ -debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series deleted file mode 100644 index c206706..0000000 --- a/.pc/.quilt_series +++ /dev/null @@ -1 +0,0 @@ -series diff --git a/.pc/.version b/.pc/.version deleted file mode 100644 index 0cfbf08..0000000 --- a/.pc/.version +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/changelog b/debian/changelog index 750cb37..a39ae59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -psocksxx (1.1.1-1) UNRELEASED; urgency=medium +psocksxx (1.1.1-1) unstable; urgency=medium * New upstream release. * Migrate to debhelper 11: @@ -20,7 +20,7 @@ psocksxx (1.1.1-1) UNRELEASED; urgency=medium * Remove debian/libpsocksxx-doc.docs to prevent twin install of README.md. * New README.source to explain the branching model used. - -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 + -- Jörg Frings-Fürst Tue, 10 Jul 2018 18:11:11 +0200 psocksxx (1.1.0-2) unstable; urgency=medium -- cgit v1.2.3 From f6b346a25e872df149886713e8056725726f5ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 10 Jul 2018 18:33:02 +0200 Subject: Use secure URI for homepage --- debian/changelog | 3 +- debian/changelog.bak | 96 ---------------------------------------------------- debian/control | 2 +- 3 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 debian/changelog.bak diff --git a/debian/changelog b/debian/changelog index a39ae59..4f555f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ psocksxx (1.1.1-1) unstable; urgency=medium - Change to my new mail address. - Switch Vcs-* to new location. - Remove now default Build-Depends dh-autoreconf. + - Use secure URI for homepage. * debian/copyright: - Change to my new mail address. - Use secure URI for copyright format. @@ -20,7 +21,7 @@ psocksxx (1.1.1-1) unstable; urgency=medium * Remove debian/libpsocksxx-doc.docs to prevent twin install of README.md. * New README.source to explain the branching model used. - -- Jörg Frings-Fürst Tue, 10 Jul 2018 18:11:11 +0200 + -- Jörg Frings-Fürst Tue, 10 Jul 2018 18:30:20 +0200 psocksxx (1.1.0-2) unstable; urgency=medium diff --git a/debian/changelog.bak b/debian/changelog.bak deleted file mode 100644 index 8116aed..0000000 --- a/debian/changelog.bak +++ /dev/null @@ -1,96 +0,0 @@ -psocksxx (1.1.1-1) UNRELEASED; urgency=medium - - * New upstream release. - * Migrate to debhelper 11: - - Change debian/compat to 11. - - Bump minimum debhelper version in debian/control to >= 11. - * Declare compliance with Debian Policy 4.1.5 (No changes needed). - * debian/control: - - Change to my new mail address. - - Switch Vcs-* to new loacation. - - Remove now default Build-Depends dh-autoreconf. - * debian/copyright: - - Change to my new mail address. - - Use secure URI for copyright format. - - Add year 2018 for packaging. - * debian/rules: - - Remove now default --with autoreconf. - - Replace parsing the output of dpkg-parsechangelog with - $(DEB_VERSION_UPSTREAM). - * Remove debian/libpsocksxx-doc.docs to prevent twin install of README.md. - * New README.source to explain the branching model used. - - -- Jörg Frings-Fürst Thu, 28 Jun 2018 06:55:17 +0200 - -psocksxx (1.1.0-2) unstable; urgency=medium - - * debian/control: - - Bump Standards-Version to 3.9.8 (no changes required). - - Change VCS-Browser to secure URI. - * debian/watch: - - Bump version to 4 (no changes required). - * debian/copyright: - - Add 2016 to debian/* and debian/patches/*. - * Bump compatlevel to 10 (no changes required): - - Change debian/compat to 10. - - At debian/control change requested version of debhelper to >= 10. - - -- Jörg Frings-Fürst Sat, 15 Oct 2016 04:30:33 +0200 - -psocksxx (1.1.0-1.2) unstable; urgency=medium - - * Non-maintainer upload. - * Fix x32 symbols. - - -- Gianfranco Costamagna 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 Sun, 20 Mar 2016 17:14:44 +0100 - -psocksxx (1.1.0-1) unstable; urgency=medium - - * New upstream release. - * Make build results reproducible (Closes: #789399): - - New debian/patches/0700-ReproducibleBuilds.patch: - At doxygen setup change HTML_TIMESTAMP to NO. - * 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 symbols files (Closes: #802523). - - Rename libpsocksxx0.symbols.amd64 to libpsocksxx0.symbols to get - symbols for all architectures. - * debian/control: - - Change uploader email. - - Change homepage. - * debian/copyright: - - Change Source and upstream email. - - Add 2015. - - -- Jörg Frings-Fürst Mon, 14 Dec 2015 06:02:57 +0100 - -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 Thu, 06 Nov 2014 13:10:19 +0100 - -psocksxx (0.0.6-1) unstable; urgency=low - - * Initial release (Closes: #763432). - - -- Jörg Frings-Fürst Sat, 04 Oct 2014 12:40:08 +0200 diff --git a/debian/control b/debian/control index 9b66890..df723c3 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: Build-Depends-Indep: doxygen Standards-Version: 4.1.5 -Homepage: http://nukedzn.github.io/psocksxx +Homepage: https://nukedzn.github.io/psocksxx Vcs-Git: git://jff.email/opt/git/psocksxx.git Vcs-Browser: https://jff.email/cgit/psocksxx.git/ -- cgit v1.2.3