From 0bbac1c83633408455731c7ed7c3149109413fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 11 Oct 2021 16:06:27 +0200 Subject: Fix ftbfs with GCC-11 --- debian/changelog | 7 +++++++ debian/rules | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f555f7..e281b50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +psocksxx (1.1.1-2) UNRELEASED; urgency=medium + + * Fix ftbfs with GCC-11 (Closes: #984299): + - debian rules: Add -std=c++14 to buildflags. + + -- Jörg Frings-Fürst Sun, 22 Aug 2021 11:27:06 +0200 + psocksxx (1.1.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/rules b/debian/rules index d42cda7..3578e5e 100755 --- a/debian/rules +++ b/debian/rules @@ -4,20 +4,26 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 + +include /usr/share/dpkg/buildtools.mk + # -# Hardening +# for use $(DEB_ ... # -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk + # -# add -Wall to compilerflags +# Hardening # -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # -# for use $(DEB_ ... +# add -Wall to compilerflags # -include /usr/share/dpkg/default.mk +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall -std=c++14 +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -Wall -std=c++14 + %: dh $@ -- cgit v1.2.3 From ace8f06d355de3327e1fb18b0fcc7a1ed50df9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 11 Oct 2021 17:59:46 +0200 Subject: Declare compliance with Debian Policy 4.6.0.1; Migrate to debhelper-compat 13 --- debian/changelog | 6 ++++++ debian/compat | 1 - debian/control | 4 ++-- debian/not-installed | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/not-installed diff --git a/debian/changelog b/debian/changelog index e281b50..6d501fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,12 @@ psocksxx (1.1.1-2) UNRELEASED; urgency=medium * Fix ftbfs with GCC-11 (Closes: #984299): - debian rules: Add -std=c++14 to buildflags. + * Declare compliance with Debian Policy 4.6.0.1 (No changes needed). + * Migrate to debhelper-compat 13: + - Remove debian/compat. + - debian/control: + + Bump minimum debhelper-compat version to = 13. + - New debian/not-installed. -- Jörg Frings-Fürst Sun, 22 Aug 2021 11:27:06 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index df723c3..db4d9f3 100644 --- a/debian/control +++ b/debian/control @@ -4,12 +4,12 @@ Priority: optional Maintainer: Jörg Frings-Fürst Uploaders: Uditha Atukorala Build-Depends: - debhelper (>= 11), + debhelper-compat (= 13), libcunit1-dev, libcppunit-dev Build-Depends-Indep: doxygen -Standards-Version: 4.1.5 +Standards-Version: 4.6.0.1 Homepage: https://nukedzn.github.io/psocksxx Vcs-Git: git://jff.email/opt/git/psocksxx.git Vcs-Browser: https://jff.email/cgit/psocksxx.git/ diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 0000000..795466a --- /dev/null +++ b/debian/not-installed @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libpsocksxx.a -- cgit v1.2.3 From b7f7d810bde1bbce424d64170a1a9fcc54262b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 11 Oct 2021 18:20:31 +0200 Subject: Remove useless d/libpsocksxx-doc.lintian-overrides --- debian/changelog | 1 + debian/libpsocksxx-doc.lintian-overrides | 7 ------- debian/rules | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 debian/libpsocksxx-doc.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 6d501fe..a0a1a74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ psocksxx (1.1.1-2) UNRELEASED; urgency=medium - debian/control: + Bump minimum debhelper-compat version to = 13. - New debian/not-installed. + * Remove useless debian/libpsocksxx-doc.lintian-overrides. -- Jörg Frings-Fürst Sun, 22 Aug 2021 11:27:06 +0200 diff --git a/debian/libpsocksxx-doc.lintian-overrides b/debian/libpsocksxx-doc.lintian-overrides deleted file mode 100644 index fa402e9..0000000 --- a/debian/libpsocksxx-doc.lintian-overrides +++ /dev/null @@ -1,7 +0,0 @@ -# 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 built-in jquery.js in doxygen is not going to be removed (see Debian bug #736432). -# -libpsocksxx-doc binary: embedded-javascript-library diff --git a/debian/rules b/debian/rules index 3578e5e..1e136b7 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ include /usr/share/dpkg/default.mk # # Hardening # -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # # add -Wall to compilerflags -- cgit v1.2.3 From 4f1c11568889df885aa704650286c5b79160a5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Nov 2021 15:06:20 +0100 Subject: Add missing DEP-3 headers --- debian/changelog | 1 + debian/patches/0001-disable_network_test.patch | 5 +++-- debian/patches/0115-doxygen_path.patch | 20 ++++++++++++++++++++ debian/patches/0120-privicy.patch | 19 +++++++++++++++++++ debian/patches/series | 2 ++ debian/psocksxx.svg | 1 + debian/psocksxx_ver.svg | 1 + 7 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 debian/patches/0115-doxygen_path.patch create mode 100644 debian/patches/0120-privicy.patch create mode 100644 debian/psocksxx.svg create mode 100644 debian/psocksxx_ver.svg diff --git a/debian/changelog b/debian/changelog index a0a1a74..7396367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ psocksxx (1.1.1-2) UNRELEASED; urgency=medium + Bump minimum debhelper-compat version to = 13. - New debian/not-installed. * Remove useless debian/libpsocksxx-doc.lintian-overrides. + * Add some missing DEP-3 headers. -- Jörg Frings-Fürst Sun, 22 Aug 2021 11:27:06 +0200 diff --git a/debian/patches/0001-disable_network_test.patch b/debian/patches/0001-disable_network_test.patch index 3861c55..1bf6b98 100644 --- a/debian/patches/0001-disable_network_test.patch +++ b/debian/patches/0001-disable_network_test.patch @@ -1,8 +1,9 @@ Description: disable network tests disable network tests to prevent errors on buildsystems without any networks. -Author: Jörg Frings-Fürst -Last-Update: 2014-10-03 +Forwarded: not-needed +Author: Jörg Frings-Fürst +Last-Update: 2021-11-26 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/test/nsockaddr_test.h diff --git a/debian/patches/0115-doxygen_path.patch b/debian/patches/0115-doxygen_path.patch new file mode 100644 index 0000000..2fecb4d --- /dev/null +++ b/debian/patches/0115-doxygen_path.patch @@ -0,0 +1,20 @@ +Description: Remove fullpath from doxygen generated files +Author: Jörg Frings-Fürst +Forwarded: not-needed +Last-Update: 2021-11-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +Index: trunk/doc/doxygen.cfg.in +=================================================================== +--- trunk.orig/doc/doxygen.cfg.in ++++ trunk/doc/doxygen.cfg.in +@@ -16,7 +16,7 @@ REPEAT_BRIEF = YES + ABBREVIATE_BRIEF = + ALWAYS_DETAILED_SEC = NO + INLINE_INHERITED_MEMB = NO +-FULL_PATH_NAMES = YES ++FULL_PATH_NAMES = NO + STRIP_FROM_PATH = + STRIP_FROM_INC_PATH = + SHORT_NAMES = NO diff --git a/debian/patches/0120-privicy.patch b/debian/patches/0120-privicy.patch new file mode 100644 index 0000000..ade70b1 --- /dev/null +++ b/debian/patches/0120-privicy.patch @@ -0,0 +1,19 @@ +Description: Remove external links +Author: Jörg Frings-Fürst +Forwarded: not-needed +Last-Update: 2021-11-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/README.md +=================================================================== +--- trunk.orig/README.md ++++ trunk/README.md +@@ -1,8 +1,6 @@ + psocksxx + ======== + +-[![GitHub release](https://img.shields.io/github/release/nukedzn/psocksxx.svg)](https://github.com/nukedzn/psocksxx/releases) +-[![Build Status](https://travis-ci.org/nukedzn/psocksxx.svg)](https://travis-ci.org/nukedzn/psocksxx) + + A C++ wrapper for POSIX sockets + diff --git a/debian/patches/series b/debian/patches/series index 8d660a8..4b23f3e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ 0700-ReproducibleBuilds.patch 0001-disable_network_test.patch 0705-hurd.patch +0115-doxygen_path.patch +0120-privicy.patch diff --git a/debian/psocksxx.svg b/debian/psocksxx.svg new file mode 100644 index 0000000..738e29e --- /dev/null +++ b/debian/psocksxx.svg @@ -0,0 +1 @@ +buildbuildpassingpassing \ No newline at end of file diff --git a/debian/psocksxx_ver.svg b/debian/psocksxx_ver.svg new file mode 100644 index 0000000..c340708 --- /dev/null +++ b/debian/psocksxx_ver.svg @@ -0,0 +1 @@ +release: v1.1.1releasev1.1.1 \ No newline at end of file -- cgit v1.2.3 From 9fff71874885001aa697c692710048258a2c3a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Nov 2021 15:14:19 +0100 Subject: Add new patches into changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7396367..5728b2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ psocksxx (1.1.1-2) UNRELEASED; urgency=medium + Bump minimum debhelper-compat version to = 13. - New debian/not-installed. * Remove useless debian/libpsocksxx-doc.lintian-overrides. + * New debian/0115-doxygen_path.patch to remove full path from documentation. + * New debian/0120-privicy.patch to remove external links from documentation. * Add some missing DEP-3 headers. -- Jörg Frings-Fürst Sun, 22 Aug 2021 11:27:06 +0200 -- cgit v1.2.3 From 2bae4a4cb0e079377440067902e7332c0b773bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Nov 2021 15:17:14 +0100 Subject: d/control: Add Rules-Requires-Root: no --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5728b2c..fdd02b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ psocksxx (1.1.1-2) UNRELEASED; urgency=medium * New debian/0115-doxygen_path.patch to remove full path from documentation. * New debian/0120-privicy.patch to remove external links from documentation. * Add some missing DEP-3 headers. + * debian/control: + - Add Rules-Requires-Root: no. -- Jörg Frings-Fürst Sun, 22 Aug 2021 11:27:06 +0200 diff --git a/debian/control b/debian/control index db4d9f3..b27adbf 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: Build-Depends-Indep: doxygen Standards-Version: 4.6.0.1 +Rules-Requires-Root: no 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 From 11a44073b76333f5b128b5198bb067b669c2c92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Nov 2021 15:21:30 +0100 Subject: Add debian/files into .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d86a163..4b3a6bd 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ Makefile.in # project specific build/* +debian/files -- cgit v1.2.3 From 835a83b5952298538c6a812c24028b2bb914941f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 26 Nov 2021 15:32:23 +0100 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fdd02b4..bc8d6e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -psocksxx (1.1.1-2) UNRELEASED; urgency=medium +psocksxx (1.1.1-2) unstable; urgency=medium * Fix ftbfs with GCC-11 (Closes: #984299): - debian rules: Add -std=c++14 to buildflags. @@ -15,7 +15,7 @@ psocksxx (1.1.1-2) UNRELEASED; urgency=medium * debian/control: - Add Rules-Requires-Root: no. - -- Jörg Frings-Fürst Sun, 22 Aug 2021 11:27:06 +0200 + -- Jörg Frings-Fürst Fri, 26 Nov 2021 15:31:46 +0100 psocksxx (1.1.1-1) unstable; urgency=medium -- cgit v1.2.3