[Crosstoolchain-logs] [device-tree-compiler] 49/58: Switch to dh and debhelper compat level 10.

Vagrant Cascadian vagrant at moszumanska.debian.org
Mon Sep 25 16:23:49 UTC 2017


This is an automated email from the git hooks/post-receive script.

vagrant pushed a commit to branch debian/master
in repository device-tree-compiler.

commit 2dba57f3b231b4f0a4a26f5aadb8e6eaae3757ae
Author: Vagrant Cascadian <vagrant at debian.org>
Date:   Sun Sep 24 10:06:30 2017 -0700

    Switch to dh and debhelper compat level 10.
---
 debian/compat                        |  2 +-
 debian/control                       |  2 +-
 debian/device-tree-compiler.docs     |  4 +++
 debian/device-tree-compiler.manpages |  1 +
 debian/dirs                          |  1 -
 debian/rules                         | 64 +++++-------------------------------
 6 files changed, 16 insertions(+), 58 deletions(-)

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 6b92f22..d864a90 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Héctor Orón Martínez <zumbi at debian.org>
 Uploaders: Riku Voipio <riku.voipio at linaro.org>
 Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 5), flex, bison, texlive, texlive-latex-extra
+Build-Depends: debhelper (>= 10), flex, bison, texlive, texlive-latex-extra
 Homepage: https://git.kernel.org/cgit/utils/dtc/dtc.git
 Vcs-Git: https://anonscm.debian.org/git/crosstoolchain/device-tree-compiler.git
 Vcs-Browser: https://anonscm.debian.org/cgit/crosstoolchain/device-tree-compiler.git/
diff --git a/debian/device-tree-compiler.docs b/debian/device-tree-compiler.docs
new file mode 100644
index 0000000..e26bf9d
--- /dev/null
+++ b/debian/device-tree-compiler.docs
@@ -0,0 +1,4 @@
+Documentation/dtc-paper.dvi
+Documentation/dtc-paper.ps
+Documentation/dtc-paper.pdf
+Documentation/dtc-manual.txt
diff --git a/debian/device-tree-compiler.manpages b/debian/device-tree-compiler.manpages
new file mode 100644
index 0000000..4cd44fd
--- /dev/null
+++ b/debian/device-tree-compiler.manpages
@@ -0,0 +1 @@
+debian/manpages/*.1
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/rules b/debian/rules
index 1b82950..6f8396b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 export CFLAGS = -Wall -g -fPIC
 
@@ -21,55 +14,16 @@ else
 	CFLAGS += -O2
 endif
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE) CFLAGS="$(CFLAGS)"
-	$(MAKE) -C Documentation
-	touch build-stamp
+%:
+	dh $@
 
-clean: clean1
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
-	$(MAKE) clean
-	[ ! -f Documentation/Makefile ] || $(MAKE) -C Documentation clean
-	dh_clean
+override_dh_auto_build:
+	dh_auto_build 
+	$(MAKE) -C Documentation
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-	dh_install --list-missing --sourcedir=debian/tmp
-	touch install-stamp
 
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs Documentation/dtc-paper.dvi Documentation/dtc-paper.ps \
-		Documentation/dtc-paper.pdf Documentation/dtc-manual.txt
-	dh_installexamples
-	dh_installman debian/manpages/*
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_clean:
+	dh_auto_clean
+	[ ! -f Documentation/Makefile ] || $(MAKE) -C Documentation clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git



More information about the Crosstoolchain-logs mailing list