[tzdata] 02/03: debian/compat, debian/control, debian/rules: rewrite using dh and debhelper compatibility 9.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository tzdata.
commit cea291a65f5f0585c09f7b9b7fd276de74da0e04
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Feb 2 12:51:29 2016 +0100
debian/compat, debian/control, debian/rules: rewrite using dh and debhelper compatibility 9.
---
debian/changelog | 2 ++
debian/compat | 2 +-
debian/control | 2 +-
debian/rules | 61 ++++++++++----------------------------------------------
4 files changed, 14 insertions(+), 53 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ba2dfc7..a809cef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
tzdata (2016a-2) UNRELEASED; urgency=medium
* debian/rules: remove emdebian ifdefs.
+ * debian/compat, debian/control, debian/rules: rewrite using dh and
+ debhelper compatibility 9.
-- Aurelien Jarno <aurel32@debian.org> Tue, 02 Feb 2016 12:29:58 +0100
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 8c34e9f..655f935 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tzdata
Section: localization
Priority: required
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: po-debconf, default-jre-headless, rdfind, symlinks
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>
diff --git a/debian/rules b/debian/rules
index df075e1..af083b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,10 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
export LC_ALL=C
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
TZGEN := $(CURDIR)/tzgen
TZGEN_JAVA := $(CURDIR)/tzgen-java
-
VERSION := $(shell dpkg-parsechangelog | sed -e '/^Version/!d;s/^Version: //g;s/.*://g;s/-.*//g')
-
JHOME := /usr/lib/jvm/default-java/
TIMEZONES := africa \
@@ -44,13 +38,10 @@ TEMPLATES_AREAS := Africa \
US \
Etc
-build: build-arch build-indep
-build-arch:
-
-build-indep: build-indep-stamp
-build-indep-stamp:
- dh_testdir
+%:
+ dh $@
+override_dh_auto_build-indep:
# Build the "default" version
for zone in $(TIMEZONES); do \
/usr/sbin/zic -d $(TZGEN) -L /dev/null -y yearistype.sh $${zone} ; \
@@ -101,45 +92,13 @@ build-indep-stamp:
echo ; \
done ) > $(TEMPLATES_FILE)
debconf-updatepo
-
- touch $@
-clean:
- dh_testdir
- dh_testroot
- -rm -rf $(TZGEN) $(TZGEN_JAVA)
- rm -f build-indep-stamp
- rm -f patch-log
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- # Do nothing
+override_dh_auto_test:
+ # The upstream tests are related to the sources. Just skip it.
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
+override_dh_auto_install:
+ # Nothing to do.
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdebconf
- dh_installdirs
- dh_install
- dh_installchangelogs
- dh_link
- dh_installdocs
- dh_compress
- dh_fixperms
- # Upstream ships this 755 for some bizarre reason:
- chmod 644 debian/tzdata/usr/share/zoneinfo/leap-seconds.list
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
+override_dh_auto_clean:
+ -rm -rf $(TZGEN) $(TZGEN_JAVA)
+ dh_auto_clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/tzdata.git
Reply to: