[SCM] dvbcut/master: Use the cmake system from the Qt4 patch

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Jul 2 13:47:12 UTC 2011


The following commit has been merged in the master branch:
commit e18ac1ecb7d450d42a410edfb3e6d27e0bcf803b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 2 14:50:38 2011 +0200

    Use the cmake system from the Qt4 patch

diff --git a/debian/control b/debian/control
index 9ba32f1..44f1926 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>
 Build-Depends: autotools-dev,
+ cmake,
  debhelper (>= 7),
  liba52-0.7.4-dev,
  libao-dev,
diff --git a/debian/rules b/debian/rules
index 368c5f5..bf7ee95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,27 +10,24 @@ ORIG_TAR_GZ := ../$(DEB_SOURCE)_$(UPSTREAM_VERSION)+svn$(SVN_VERSION).orig.tar.g
 build: build-stamp
 build-stamp:
 	dh_testdir
-	cp -v /usr/share/misc/config.sub .
-	cp -v /usr/share/misc/config.guess .
-	$(MAKE) FFMPEG=/usr
+	mkdir -p build
+	cd build && cmake -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..
+	$(MAKE) -C build
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	[ ! -f makefile ] || $(MAKE) distclean FFMPEG=/usr
-	dh_clean build-stamp config.sub config.guess
+	rm -rf build
+	dh_clean build-stamp
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs
-
-	$(MAKE) install PREFIX=/usr \
-		FFMPEG=/usr \
-		MANPATH=/usr/share/man \
-		DESTDIR=$(CURDIR)/debian/dvbcut
+	dh_install build/src/dvbcut usr/bin
+	dh_installman dvbcut.1
 
 get-orig-source:
 	TMPDIR=`mktemp -d` && \

-- 
dvbcut packaging



More information about the pkg-multimedia-commits mailing list