Merge branch 'release/debian/3.1.2-14'debian/3.1.2-14

6 files changed, 26 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 303eebc..28b487b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+xbase64 (3.1.2-14) unstable; urgency=medium
+
+  * Migrate to debhelper-compat 13:
+    - debian/control: Add debhelper-compat (= 13).
+    - Remove debian/compat.
+    - debian/not-installed:
+      + Add usr/bin/xbase64-config.
+      + Add usr/lib/${DEB_HOST_MULTIARCH}/libxbase64.la.
+  * Declare compliance with Debian Policy 4.6.1.0 (No changes needed).
+  * debian/copyright:
+    - Add year 2022 to myself.
+  * Disable Link time optimization (Closes: #1015707):
+    - debian/rules: Add optimize=-lto to DEB_BUILD_MAINT_OPTIONS.
+  * debian/control: Add Rules-Requires-Root: no.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 28 Jul 2022 07:45:46 +0200
+
 xbase64 (3.1.2-13) unstable; urgency=medium
 
   * Change to my new mail address:
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 f31cf13..2b02071 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: xbase64
 Priority: optional
 Section: libs
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.2.1
+Standards-Version: 4.6.1.0
+Rules-Requires-Root: no
 Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
  doxygen
 Homepage: http://sourceforge.net/projects/xdb/
 Vcs-Git: git://jff.email/opt/git/xbase64.git
diff --git a/debian/copyright b/debian/copyright
index e354bb2..5c9c210 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,7 @@ Copyright: 1997-2003  Gary A. Kunkel <gkunkel@zhsac.com>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2014-2018 Jörg Frings-Fürst <debian@jff.email>
+Copyright: 2014-2022 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3.0+
 
 License: LGPL-2.1+
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..988670b
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+usr/bin/xbase64-config 
+usr/lib/${DEB_HOST_MULTIARCH}/libxbase64.la
diff --git a/debian/rules b/debian/rules
index d95b933..6424b10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all, optimize=-lto
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
         INSTALL_PROGRAM += -s
@@ -15,6 +15,8 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
 
+
+
 %:
 	dh $@