diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 17:46:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 17:46:08 +0200 |
| commit | fca7bba70ed6535e3ab731d193d8efa59a310f0a (patch) | |
| tree | 69e612c5cf0ccc9a8db7295bf50f841d92833ed8 | |
| parent | 0cf6fbbdfb6abc144a7dfb2093b0573de3b4f5d7 (diff) | |
Bump compat level to 10; rewrite d/rules
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 24 |
4 files changed, 12 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index 8f832e2..0c32c0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ simple-scan (3.22.0.1-1) UNRELEASED; urgency=medium * New upstream release. + * Bump compat to 10: + - Change debian/compat to 10. + - Change debhelper version at debian/control to >= 10. + * debian/rules: + - remove useless comments and calls. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 21 Sep 2016 21:16:54 +0200 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 55e29f8..9e61795 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> Standards-Version: 3.9.8 Build-Depends: - debhelper (>= 9), + debhelper (>= 10), dh-autoreconf, gnome-pkg-tools (>= 0.10), libcairo2-dev, diff --git a/debian/rules b/debian/rules index 500ea2e..9eec217 100755 --- a/debian/rules +++ b/debian/rules @@ -15,26 +15,16 @@ # # - remove override_dh_auto_test # - -# -# Hardening -# -export DEB_BUILD_MAINT_OPTIONS = hardening=+all - +# 2016-10-02 Jörg Frings-Fürst <debian@jff-webhosting.net> # -# Test for gcc-6 support +# - remove gcc-6 comments +# - remove override_dh_auto_build # -#export CC=gcc-6 -#export CXX=g++-6 -#CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -#LDLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -#export CXXFLAGS+= -std=c++98 -#export LDFLAGS += -fPIC # -# end of gcc-6 test +# Hardening # - +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: @@ -51,10 +41,6 @@ override_dh_auto_clean: [ ! -h gnome-doc-utils.make ] || \ rm gnome-doc-utils.make -override_dh_auto_build: -# cd po; intltool-update -p - dh_auto_build - override_dh_strip: dh_strip -psimple-scan --dbg-package=simple-scan-dbg |