[glibc-doc-reference] 05/13: Switch to dh with compat 10.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc-doc-reference.
commit bf744c0ae8a0ca043f1de083bdb19bfea49d75b8
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Dec 2 18:01:00 2017 +0100
Switch to dh with compat 10.
---
debian/changelog | 1 +
debian/compat | 2 +-
debian/control | 2 +-
debian/glibc-doc-reference.links | 2 +-
debian/rules | 55 +++++-----------------------------------
5 files changed, 11 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7a96fde..6993672 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ glibc-doc-reference (2.25-1) UNRELEASED; urgency=medium
* Add a get-orig-source target.
* Instead of patching the upstream Makefile, provide minimal Makeconfig,
Rules and config.make.
+ * Switch to dh with compat 10.
-- Aurelien Jarno <aurel32@debian.org> Sat, 02 Dec 2017 15:39:35 +0100
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+10
diff --git a/debian/control b/debian/control
index 4f5e157..a97064a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: glibc-doc-reference
Section: non-free/doc
Priority: optional
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 10)
Build-Depends-Indep: texinfo, gawk, texlive-base-bin, texlive-latex-base
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: GOTO Masanori <gotom@debian.org>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>
diff --git a/debian/glibc-doc-reference.links b/debian/glibc-doc-reference.links
index 8e68553..a03a8ea 100644
--- a/debian/glibc-doc-reference.links
+++ b/debian/glibc-doc-reference.links
@@ -1 +1 @@
-usr/share/doc/glibc-doc-reference/html/libc.html usr/share/doc/glibc-doc-reference/html/index.html
+usr/share/doc/glibc-doc-reference/html/index.html usr/share/doc/glibc-doc-reference/html/libc.html
diff --git a/debian/rules b/debian/rules
index b8b4887..cd8cea4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export LC_ALL=C
-
DEB_VERSION = $(shell dpkg-parsechangelog | awk '/^Version/ {print $$2}')
UPSTREAM_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-.*//')
GLIBC_GIT = git://sourceware.org/git/glibc.git
@@ -11,9 +7,10 @@ GLIBC_TAG = glibc-$(UPSTREAM_VERSION)
DEB_DIR = glibc-doc-reference-$(UPSTREAM_VERSION)
DEB_ORIG = ../glibc-doc-reference_$(UPSTREAM_VERSION).orig.tar.xz
-build-indep: build-stamp
-build-stamp:
- dh_testdir
+%:
+ dh $@
+
+override_dh_auto_build-indep:
mkdir -p $(CURDIR)/build
echo "MAKEINFO = makeinfo" > $(CURDIR)/build/config.make
echo "AWK = gawk" >> $(CURDIR)/build/config.make
@@ -21,45 +18,10 @@ build-stamp:
echo "PKGVERSION_TEXI = (Debian glibc-doc-reference $(DEB_VERSION))" >> $(CURDIR)/build/config.make
echo "REPORT_BUGS_TEXI = @uref{http://www.debian.org/Bugs/}"; >> $(CURDIR)/build/config.make
$(MAKE) -C manual objdir=$(CURDIR)/build info html pdf
- touch $@
-
-build-arch:
-# We have nothing to do by default.
-
-build: build-indep build-arch
-
-clean:
- dh_testdir
- dh_testroot
- rm -rf build
- rm -f build-stamp
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- # Do nothing
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdirs
- dh_install
- dh_installchangelogs
- dh_installdocs
- dh_installinfo
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+override_dh_auto_clean:
+ rm -fr $(CURDIR)/build
+ dh_auto_clean
get-orig-source: $(DEB_ORIG)
$(DEB_ORIG):
@@ -72,6 +34,3 @@ $(DEB_ORIG):
$(DEB_DIR)/scripts/move-if-change \
`find $(DEB_DIR) -name "libm-test-ulps*"`
rm -rf $(DEB_DIR)
-
-binary: binary-indep binary-arch
-.PHONY: build-indep build-arch build clean binary-indep binary-arch binary install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc-doc-reference.git
Reply to: