Merge branch 'release/debian/1.1.1-2'debian/1.1.1-2

13 files changed, 81 insertions, 17 deletions

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
diff --git a/debian/changelog b/debian/changelog
index 4f555f7..bc8d6e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+psocksxx (1.1.1-2) unstable; 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.
+  * 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.
+  * debian/control:
+    - Add Rules-Requires-Root: no.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 26 Nov 2021 15:31:46 +0100
+
 psocksxx (1.1.1-1) unstable; urgency=medium
 
   * New upstream release.
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..b27adbf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,13 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Uploaders: Uditha Atukorala <ua@nuked.zone>
 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
+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/
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/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
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 <debian@jff-webhosting.net>
-Last-Update: 2014-10-03
+Forwarded: not-needed
+Author: Jörg Frings-Fürst <debian@jff.email>
+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 <debian@jff.email>
+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 <debian@jff.email>
+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 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="90" height="20"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><rect rx="3" width="90" height="20" fill="#555"/><rect rx="3" x="37" width="53" height="20" fill="#4c1"/><path fill="#4c1" d="M37 0h4v20h-4z"/><rect rx="3" width="90" height="20" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="15" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="14">build</text><text x="62.5" y="15" fill="#010101" fill-opacity=".3">passing</text><text x="62.5" y="14">passing</text></g></svg>
\ 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 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="94" height="20" role="img" aria-label="release: v1.1.1"><title>release: v1.1.1</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="94" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="49" height="20" fill="#555"/><rect x="49" width="45" height="20" fill="#007ec6"/><rect width="94" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="255" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="390">release</text><text x="255" y="140" transform="scale(.1)" fill="#fff" textLength="390">release</text><text aria-hidden="true" x="705" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="350">v1.1.1</text><text x="705" y="140" transform="scale(.1)" fill="#fff" textLength="350">v1.1.1</text></g></svg>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index d42cda7..1e136b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+
+include /usr/share/dpkg/buildtools.mk
+
+#
+# for use $(DEB_ ...
+#
+include /usr/share/dpkg/default.mk
+
+
 #
 # Hardening
 #
@@ -12,12 +21,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 #
 # add -Wall to compilerflags
 #
-export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall
+export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -Wall -std=c++14
+export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -Wall -std=c++14
 
-#
-# for use $(DEB_ ...
-#
-include /usr/share/dpkg/default.mk
 
 %:
 	dh $@