[oggvideotools] 01/03: Rewrite debian/rules to use dh instead of dh_*.

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository oggvideotools.

commit 4bace05d3a9f4e3fadd03518c425ed2bface8541
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Sep 22 10:04:12 2015 +0200

    Rewrite debian/rules to use dh instead of dh_*.
---
 debian/oggvideotools.install  |  2 ++
 debian/oggvideotools.manpages |  1 +
 debian/rules                  | 71 ++++---------------------------------------
 3 files changed, 9 insertions(+), 65 deletions(-)

diff --git a/debian/oggvideotools.install b/debian/oggvideotools.install
new file mode 100644
index 0000000..9bc3cbf
--- /dev/null
+++ b/debian/oggvideotools.install
@@ -0,0 +1,2 @@
+obj-*/src/ogg* usr/bin
+scripts/mkThumbs usr/bin
diff --git a/debian/oggvideotools.manpages b/debian/oggvideotools.manpages
new file mode 100644
index 0000000..7fc9e0a
--- /dev/null
+++ b/debian/oggvideotools.manpages
@@ -0,0 +1 @@
+docs/*.1
diff --git a/debian/rules b/debian/rules
index 1f3459e..4f94850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,71 +1,12 @@
 #!/usr/bin/make -f
-# Ron Lee 2003 - 2012
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+%:
+	dh $@ --buildsystem=cmake
 
-#export DH_VERBOSE=1
-export DH_OPTIONS
-
-SHELL = /bin/bash
-
-NUM_CPUS = $(shell getconf _NPROCESSORS_ONLN 2>/dev/null)
-PARALLEL = $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NJOBS    = -j$(or $(PARALLEL),$(NUM_CPUS),1)
-
-
-objdir := objs
-
-
-clean:
-	dh_testdir
-	dh_testroot
-	$(RM) *-stamp
-	$(RM) -r $(objdir)
-	dh_clean
-
-
-$(objdir)/Makefile:
-	dh_testdir
-	mkdir -p $(objdir)
-	cd $(objdir) &&	cmake ..
-
-build: build-arch
-build-arch: build-arch-stamp
-build-indep:
-
-build-arch-stamp: $(objdir)/Makefile
-	dh_testdir
-	$(MAKE) $(NJOBS) -C $(objdir)
-	touch $@
-
-
-binary: binary-arch
-
-binary-indep:
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_install $(objdir)/src/ogg* scripts/mkThumbs usr/bin
-	dh_installman docs/*.1
-	dh_installdocs
-	dh_installchangelogs
+override_dh_strip:
+	dh_strip --dbg-package=oggvideotools-dbg
 
 # Run our test suite until the upstream source get one
-check:
+override_dh_auto_test:
+	dh_auto_test
 	PATH=`pwd`/debian/oggvideotools/usr/bin:$$PATH ./debian/tests/test-oggjoin
-
-binary-arch: DH_OPTIONS = -a
-binary-arch: install check
-	dh_strip --dbg-package=oggvideotools-dbg
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: clean build build-arch build-indep binary binary-arch binary-indep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/oggvideotools.git