Change Maintainer, some buildsystem changes

5 files changed, 23 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 060a0cda..1f4d1cb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 libunistring (0.9.7-1) UNRELEASED; urgency=medium
 
   * New maintainer (Closes: #858605).
+    - Many thanks to Andreas Rottmann <rotty@debian.org>.
   * New upstream release.
+  * debian/control:
+    - Add myself as Maintainer.
+  * debian/copyright:
+    - Add myself to debian/*.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 27 Mar 2017 21:42:44 +0200
 
diff --git a/debian/compat b/debian/compat
index ec635144..f599e28b 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 4a2bfef9..7ea7aceb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,10 @@
 Source: libunistring
 Priority: optional
-Maintainer: Andreas Rottmann <rotty@debian.org>
-Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 9.20160403~), autotools-dev, dh-autoreconf
+Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Build-Depends: 
+# cdbs (>= 0.4.93~),
+ debhelper (>= 10),
+ dh-autoreconf
 Standards-Version: 3.9.8
 Section: libs
 Homepage: http://www.gnu.org/software/libunistring/
diff --git a/debian/copyright b/debian/copyright
index 8ca9a378..c8aaec9f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -75,7 +75,8 @@ License: MIT
  tium.
 
 Files: debian/*
-Copyright: 2009, Andreas Rottmann <rotty@debian.org>
+Copyright: 2009      Andreas Rottmann <rotty@debian.org>
+           2017      Jörg Frings-Fürst <debian@jff-webhsoting.net>
 License: GPL-3+
 
 License: LGPL-3+
diff --git a/debian/rules b/debian/rules
index e7fbeecb..87543ae7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,13 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/buildvars.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
+#include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/class/autotools.mk
+#include /usr/share/cdbs/1/rules/buildvars.mk
+#include /usr/share/cdbs/1/rules/autoreconf.mk
+
+# hardening
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 ifneq ($(findstring $(DEB_BUILD_ARCH), mips mipsel),)
 	CFLAGS += -mplt
@@ -16,3 +19,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror \
 DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR)
 
 DEB_MAKE_CHECK_TARGET = check
+
+%:
+	dh $@ --with autoreconf