Imported Upstream version 3.20

Change-Id: Ied13eac84170040d87323a626e43566300781a35
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/debian/changelog b/debian/changelog
index 40962dc..e94da24 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+hostname (3.20) unstable; urgency=medium
+
+  * Removed old alioth list from maintainers field.
+
+ -- Michael Meskes <meskes@debian.org>  Wed, 31 Jan 2018 13:08:15 +0100
+
+hostname (3.19) unstable; urgency=medium
+
+  * Bumped Standards-Version to 4.1.3, no changes needed.
+  * Switched to debhelper 11
+  * Fix lintian warnings.
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 30 Jan 2018 11:34:44 +0100
+
 hostname (3.18) unstable; urgency=medium
 
   * Make sure memory is initialized to zero before attempting to read hostname.

diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11

diff --git a/debian/control b/debian/control
index 0cbbb9e..38116a5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,9 @@
 Source: hostname
 Section: admin
 Priority: required
-Maintainer: Debian Hostname Team <hostname-devel@lists.alioth.debian.org>
-Uploaders: Michael Meskes <meskes@debian.org>
-Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 9)
+Maintainer: Michael Meskes <meskes@debian.org>
+Standards-Version: 4.1.3
+Build-Depends: debhelper (>= 11)
 
 Package: hostname
 Architecture: any

diff --git a/debian/rules b/debian/rules
index 83d8be9..ecdaa5a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEBVERSION := $(shell dpkg-parsechangelog | awk '/Version:/ { print substr($$2,1,4)}')
+include /usr/share/dpkg/pkg-info.mk
 PRGVERSION := $(shell awk '/define VERSION/ { print substr($$3,2,length($$3)-2)}' hostname.c)
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 CFLAGS = `dpkg-buildflags --get CFLAGS`
 CFLAGS += -Wall
 LDFLAGS = `dpkg-buildflags --get LDFLAGS`
 CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
-DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
        CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
@@ -27,7 +28,7 @@ build-stamp:
        dh_testdir
 
        # Building package
-       [ "$(DEBVERSION)" = "$(PRGVERSION)" ] || exit 1
+       [ "$(DEB_VERSION)" = "$(PRGVERSION)" ] || exit 1
        CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) $(CROSS)
 
        touch build-stamp

diff --git a/hostname.c b/hostname.c
index 823ba82..d81aff3 100644 (file)
--- a/hostname.c
+++ b/hostname.c
@@ -43,7 +43,7 @@
 #include <ctype.h>
 #include <err.h>
 
-#define VERSION "3.18"
+#define VERSION "3.20"
 
 enum type_t { DEFAULT, DNS, FQDN, SHORT, ALIAS, IP, NIS, NIS_DEF, ALL_FQDNS, ALL_IPS };