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

[siretart at users.alioth.debian.org]

Author: siretart
Date: Tue Jul  1 18:50:48 2008
New Revision: 1282

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1282
Log:
cleanups in debian/rules file. call dh_shlibdeps before dh_installdeb

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.. Tue Jul  1 18:50:48 2008
@@ -23,3 +23,4 @@
 56 siretart at tauware.de-20080630141223-97fhxp6a2gjl6hmd
 57 siretart at tauware.de-20080630141246-odn0am2o3zasimk3
 58 siretart at tauware.de-20080701084808-y1dwm9ghwiklfrmt
+60 siretart at tauware.de-20080701152048-xfy0kub1nho6mrha

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Tue Jul  1 18:50:48 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-07-01 10:48:08.351000071 +0200
+timestamp: 2008-07-01 17:20:48.052000046 +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=1282&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Tue Jul  1 18:50:48 2008
@@ -23,11 +23,9 @@
 	dh_testdir
 	mkdir -p debian-$*
 	cd debian-$* && ../configure $($*_build_confflags)
-
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> debian-$*/config.h
 endif
-
 	touch $@
 
 build-%: build-%-stamp
@@ -72,7 +70,8 @@
 endif
 
 define install_flavor
-	$(MAKE) -C debian-$(1) install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
+	$(MAKE) -C debian-$(1) install DESTDIR=`pwd`/debian/tmp/ \
+	    mandir=`pwd`/debian/tmp/usr/share/man
 
 endef
 
@@ -82,16 +81,12 @@
 	dh_clean -k
 	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
 	dh_installdirs -ptmp usr/share/doc/ffmpeg-doc/html
-
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
-
 	cp -a libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
 	cp debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
 	cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html/
 	cp doc/ffserver.conf debian/tmp/etc/
-
 	cp debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
-
 	dh_install --fail-missing --sourcedir=debian/tmp
 
 binary-indep: build install
@@ -104,18 +99,14 @@
 	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
-	dh_installcron
-	dh_installinfo
-	dh_installmime
 	dh_installchangelogs Changelog
 	dh_link
 	dh_strip --dbg-package=ffmpeg-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -V
+	dh_shlibdeps
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums
 	dh_builddeb