r1260 - in /unstable/ffmpeg/debian: ./ rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Wed Jun 18 20:46:06 2008
New Revision: 1260

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1260
Log:
cleanups. make debian/rules more readable

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/rules

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Wed Jun 18 20:46:06 2008
@@ -13,3 +13,4 @@
 37 siretart at tauware.de-20080604072935-wpiy49wwnqeq80zu
 38 siretart at tauware.de-20080606155027-qustr96yjphr850a
 39 siretart at tauware.de-20080606155320-sratr392q859ze2s
+45 siretart at tauware.de-20080618204601-vdk7hs1t71u59j4d

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Jun 18 20:46:06 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-06 17:53:20.321000099 +0200
+timestamp: 2008-06-18 22:46:01.160000086 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: unstable

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1260&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Wed Jun 18 20:46:06 2008
@@ -85,7 +85,7 @@
 config-extra-includes.h:
 	sh debian/fixup-config.sh > config-extra-includes.h
 
-build: config-extra-includes.h patch build-stamp
+build: config-extra-includes.h $(QUILT_STAMPFN) build-stamp
 build-stamp:
 	dh_testdir
 
@@ -127,7 +127,7 @@
 	-$(MAKE) test
 endif
 
-	touch build-stamp
+	touch $@
 
 clean: unpatch
 	dh_testdir
@@ -157,7 +157,9 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc usr/include/ffmpeg usr/lib usr/bin usr/share/man/man1 usr/include/postproc usr/share/doc/ffmpeg-doc/html
+	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc usr/include/ffmpeg
+	dh_installdirs -ptmp usr/lib usr/bin usr/share/man/man1 usr/include/postproc
+	dh_installdirs -ptmp usr/share/doc/ffmpeg-doc/html
 
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
 	cp libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
@@ -169,7 +171,8 @@
 	cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html/
 	cp doc/ffserver.conf debian/tmp/etc/
 
-	sed -e s/@FIREWIRELIBS@/$(FIREWIRELIBS)/ -e s/@VERSION@/$(DEB_VERSION)/ ffmpeg-config.in > debian/tmp/usr/bin/ffmpeg-config
+	sed -e s/@FIREWIRELIBS@/$(FIREWIRELIBS)/ -e s/@VERSION@/$(DEB_VERSION)/ \
+		ffmpeg-config.in > debian/tmp/usr/bin/ffmpeg-config
 	chmod 644 debian/tmp/usr/bin/ffmpeg-config
 	cp ffmpeg-config.1 debian/tmp/usr/share/man/man1/ffmpeg-config.1
 	cp tools/qt-faststart debian/tmp/usr/bin/qt-faststart
@@ -185,7 +188,8 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs $(extradoc) doc/optimization.txt
-	dh_installdocs -A MAINTAINERS CREDITS doc/TODO debian/patents.txt debian/README.Debian
+	dh_installdocs -A MAINTAINERS CREDITS doc/TODO
+	dh_installdocs -A debian/patents.txt debian/README.Debian
 	dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
 	dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
 	dh_installmenu