[debian-edu-commits] debian-edu/ 01/01: Switch to compat 9 and dh style building.

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu-doc.

commit f763e5e4fe9192057a35a2ca059959d525e6303f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 4 15:40:07 2014 +0200

    Switch to compat 9 and dh style building.
---
 debian/changelog |  1 +
 debian/compat    |  2 +-
 debian/control   |  2 +-
 debian/rules     | 43 +++++++++----------------------------------
 4 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e6190b..5c67e4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ debian-edu-doc (1.6~20141005) UNRELEASED; urgency=medium
     removes the need for network access during build of all targets, which is
     a serious bug. Now network is only needed for get-orig-source which is
     obviously needs it.
+  * Switch to compat 9 and dh style building.
 
   [ Petter Reinholdtsen ]
   * Added Dutch (nl) audacity manual by Frans Spiesschaert (Closes:
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 abb2f18..ca41ef8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: debian-edu-doc
 Section: doc
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: dblatex,
                      dbtoepub,
                      docbook-utils,
diff --git a/debian/rules b/debian/rules
index 1fec3e2..c709bc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,51 +6,26 @@ DESTPATH = usr/share/doc/debian-edu-doc
 
 get-orig-source:
 	$(MAKE) get-orig-source
-	
-dist-clean: clean
 
-clean:
+%:
+	dh $@
+
+override_dh_clean:
 	$(MAKE) dist-clean
-	rm -f build-stamp
 	rm -rf $(DESTDIR)/debian-edu-doc-?? $(DESTDIR)/debian-edu-doc
 	dh_clean
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	touch build-stamp
-	$(MAKE)
-
-binary: binary-arch binary-indep
-
-binary-arch:
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	#
-	# build manuals
-	#
+override_dh_install:
 	$(MAKE) install DESTDIR="$(DESTDIR)"
 
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installdocs 
+override_dh_installdocs:
+	dh_installdocs
 	dh_installdocs -A debian/README
 	dh_installdocs -p debian-edu-doc-en \
 		documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations \
 		documentation/debian-edu-jessie/README.debian-edu-jessie-manual-translations \
 		documentation/rosegarden/README.rosegarden-manual-translations \
 		documentation/audacity/README.audacity-manual-translations
-	dh_installchangelogs
-	dh_link
+
+override_dh_compress:
 	dh_compress -X.pdf -X.html
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git