[SCM] dvbcut/master: use debhelper tiny form

fabricesp-guest at users.alioth.debian.org fabricesp-guest at users.alioth.debian.org
Sat Feb 4 05:43:26 UTC 2012


The following commit has been merged in the master branch:
commit 9a8d194e949e8f7413a6a29f6ae923c52192629c
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Sun Jan 22 17:29:28 2012 +0100

    use debhelper tiny form

diff --git a/debian/changelog b/debian/changelog
index 79415cc..e544210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dvbcut (0.5.4+svn178-2) UNRELEASED; urgency=low
 
-  * 
+  [ Fabrice Coutadeur ]
+  * debian/rules: use tiny debhelper form
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Jan 2012 13:28:55 +0100
 
diff --git a/debian/control b/debian/control
index 481fb00..4cf1aaa 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
 Build-Depends:
  autotools-dev,
  cmake,
- debhelper (>= 7),
+ debhelper (>= 7.0.50~),
  liba52-0.7.4-dev,
  libao-dev,
  libavcodec-dev (>> 4:0.7~),
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..94bd809
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+dvbcut.1
diff --git a/debian/rules b/debian/rules
index 8ca53b3..8573b53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,34 +8,17 @@ SVN_URL := http://dvbcut.svn.sourceforge.net/svnroot/dvbcut/trunk
 ORIG_TAR_GZ := ../$(DEB_SOURCE)_$(UPSTREAM_VERSION)+svn$(SVN_VERSION).orig.tar.gz
 CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-CMAKE_FLAGS := -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_VERBOSE_MAKEFILE=1
-CMAKE_FLAGS += -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
-	mkdir -p build
-	cd build && cmake $(CMAKE_FLAGS) ..
-	$(MAKE) -C build
-	touch build-stamp
+%:
+	dh $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf build
+override_dh_auto_configure:
+	dh_auto_configure --buildsystem=cmake -- -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
+
+override_dh_auto_clean:
 	rm -rf ffmpeg.src
 	rm -rf ffmpeg-patches
-	dh_clean build-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_install build/src/dvbcut usr/bin
-	dh_installman dvbcut.1
+	dh_auto_clean
 
 get-orig-source:
 	TMPDIR=`mktemp -d` && \
@@ -45,25 +28,3 @@ get-orig-source:
 	rm -rf $${TMPDIR}/dvbcut/ffmpeg-patches && \
 	rm -rf $${TMPDIR}/dvbcut/debian && \
 	tar czvf $(ORIG_TAR_GZ) -C $${TMPDIR} dvbcut
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source

-- 
dvbcut packaging



More information about the pkg-multimedia-commits mailing list