r731 - in /experimental/ffmpeg/debian: changelog rules

sho at users.alioth.debian.org sho at users.alioth.debian.org
Thu Mar 29 22:28:36 CET 2007 

Author: sho
Date: Thu Mar 29 21:28:36 2007
New Revision: 731

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=731
Log:
  * debian/rules:
    + Huge cleanup.

Modified:
    experimental/ffmpeg/debian/changelog
    experimental/ffmpeg/debian/rules

Modified: experimental/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/changelog?rev=731&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Thu Mar 29 21:28:36 2007
@@ -18,6 +18,8 @@
   * debian/control:
     + Set pkg-multimedia-maintainers as main maintainer.
     + Updated VCS fields.
+  * debian/rules:
+    + Huge cleanup.
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 14 Mar 2007 19:40:42 +0100
 

Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=731&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Thu Mar 29 21:28:36 2007
@@ -51,74 +51,37 @@
 	
 	# Build static libraries
 	./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
-	cd doc && $(MAKE)
+	$(MAKE) -C doc
 	$(MAKE)
 	
 	# Backup static libraries
-	mv libavutil/libavutil.a libavutil/libavutil.a.bak
-	mv libpostproc/libpostproc.a libpostproc/libpostproc.a.bak
-	mv libavcodec/libavcodec.a libavcodec/libavcodec.a.bak
-	mv libavformat/libavformat.a libavformat/libavformat.a.bak
-	mv libswscale/libswscale.a libswscale/libswscale.a.bak
+	for d in libavutil libavcodec libpostproc libavformat libswscale; do \
+	  mv $$d/$$d.a $$d/$$d.a.bak ; \
+	done
 	
 	# Build ffmpeg and shared libraries
 	./configure $(confflags) --enable-shared --prefix=/usr
-	
 	sed 's/ldts/ldts_pic/' <config.mak >config.mak.pic
 	echo 'CFLAGS += -fPIC -DPIC' >> config.mak.pic
-	
-	cd libavutil && \
-	  $(MAKE) clean && \
-	  rm -f Makefile.pic && \
-	  sed 's/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
-	  $(MAKE) -f Makefile.pic && \
-	  rm -f Makefile.pic
-	
-	cd libavcodec && \
-	  $(MAKE) clean && \
-	  rm -f Makefile.pic && \
-	  sed 's/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
-	  $(MAKE) -f Makefile.pic && \
-	  rm -f Makefile.pic
-	
-	cd libpostproc && \
-	  $(MAKE) clean && \
-	  rm -f Makefile.pic && \
-	  sed 's/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
-	  $(MAKE) -f Makefile.pic && \
-	  rm -f Makefile.pic
-	
-	cd libavformat && \
-	  $(MAKE) clean && \
-	  rm -f Makefile.pic && \
-	  sed 's/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
-	  $(MAKE) -f Makefile.pic && \
-	  rm -f Makefile.pic
-	
-	cd libswscale && \
-	  $(MAKE) clean && \
-	  rm -f Makefile.pic && \
-	  sed 's/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
-	  $(MAKE) -f Makefile.pic && \
-	  rm -f Makefile.pic
-	
+	for d in libavutil libavcodec libpostproc libavformat libswscale; do \
+	  cd $$d && \
+	    $(MAKE) clean && \
+	    rm -f Makefile.pic && \
+	    sed 's/config.mak/config.mak.pic/' <Makefile >Makefile.pic && \
+	    $(MAKE) -f Makefile.pic && \
+	    rm -f Makefile.pic ; \
+	done
 	rm -f config.mak.pic
 	
-	# Restore static libraries
-	mv libavutil/libavutil.a.bak libavutil/libavutil.a
-	mv libpostproc/libpostproc.a.bak libpostproc/libpostproc.a
-	mv libavcodec/libavcodec.a.bak libavcodec/libavcodec.a
-	mv libavformat/libavformat.a.bak libavformat/libavformat.a
-	mv libswscale/libswscale.a.bak libswscale/libswscale.a
-	
-	# Fix timestamps
-	touch libavutil/libavutil.a libpostproc/libpostproc.a
-	touch libavcodec/libavcodec.a libavformat/libavformat.a
-	touch libswscale/libswscale.a
+	# Restore static libraries and fix timestamps
+	for d in libavutil libavcodec libpostproc libavformat libswscale; do \
+	  mv $$d/$$d.a.bak $$d/$$d.a ; \
+	  touch $$d/$$d.a ; \
+	done
 	touch ffmpeg ffmpeg_g ffplay ffplay_g
 	
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	-cd tests && $(MAKE)
+	-$(MAKE) -C tests
 endif
 	
 	touch build-stamp
@@ -127,23 +90,14 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-cd doc && $(MAKE) clean
-	-cd tests && $(MAKE) clean
+	-$(MAKE) -C doc clean
+	-$(MAKE) -C tests clean
 	-$(MAKE) distclean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -f libavutil/Makefile.pic libavcodec/Makefile.pic config.log
-	rm -f libpostproc/Makefile.pic libavformat/Makefile.pic
-	rm -f libswscale/Makefile.pic
-	rm -f libavutil/libavutil.a.bak
-	rm -f libpostproc/libpostproc.a.bak
-	rm -f libavcodec/libavcodec.a.bak
-	rm -f libavformat/libavformat.a.bak
-	rm -f libswscale/libswscale.a.bak
-	rm -f libavcodec-uninstalled.pc libavcodec.pc
-	rm -f libavutil-uninstalled.pc libavutil.pc
-	rm -f libavformat-uninstalled.pc libavformat.pc
-	rm -f libswscale-uninstalled.pc libswscale.pc
-	rm -f libpostproc-uninstalled.pc libpostproc.pc
+	for d in libavutil libavcodec libpostproc libavformat libswscale; do \
+	  rm -f $$d/Makefile.pic $$d/$$d.a.bak $$d-unistalled.pc $$d.pc ; \
+	done
+	rm -f config.log
 	dh_clean
 
 install: build
@@ -157,9 +111,9 @@
 	cp libpostproc/libpostproc.a debian/tmp/usr/lib
 	cp libpostproc/postprocess.h debian/tmp/usr/include/postproc
 	cp libpostproc.pc debian/tmp/usr/lib/pkgconfig/
-	
-	dh_install -ptmp libavutil/libavutil.so* libavcodec/libavcodec.so* libpostproc/libpostproc.so* libavformat/libavformat.so* libswscale/libswscale.so* /usr/lib
-	
+	for d in libavutil libavcodec libpostproc libavformat libswscale; do \
+	  cp $$d/$$d.so* tmp/usr/lib ; \
+	done
 	cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
 	cp doc/ffserver.conf debian/tmp/etc/
 	
@@ -178,7 +132,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs $(extradoc) doc/optimization.txt
-	dh_installdocs -A CREDITS doc/TODO debian/patents.txt debian/README.Debian
+	dh_installdocs -A MAINTAINERS CREDITS doc/TODO debian/patents.txt debian/README.Debian
 	dh_installexamples -pffmpeg doc/ffserver.conf
 	dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
 	dh_installmenu
@@ -190,11 +144,9 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -p libavutil1d -V 'libavutil1d (>= 0.cvs20070307)'
-	dh_makeshlibs -p libavcodec1d -V 'libavcodec1d (>= 0.cvs20070307)'
-	dh_makeshlibs -p libavformat1d -V 'libavformat1d (>= 0.cvs20070307)'
-	dh_makeshlibs -p libswscale1d -V 'libswscale1d (>= 0.cvs20070307)'
-	dh_makeshlibs -p libpostproc1d -V 'libpostproc1d (>= 0.cvs20070307)'
+	for d in libavutil libavcodec libpostproc libavformat libswscale; do \
+	  dh_makeshlibs -p $${d}1d -V "$${d}1d (>= 0.cvs20070307)" ; \
+	done
 	dh_installdeb
 	dh_shlibdeps -L libavutil1d -L libavcodec1d -L libpostproc1d -L libavformat1d -L libswscale1d -l debian/libavutil1d/usr/lib:debian/libavcodec1d/usr/lib:debian/libavformat1d/usr/lib:debian/libpostproc1d/usr/lib:debian/libswscale1d/usr/lib
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"

More information about the pkg-multimedia-commits mailing list