r1273 - in /unstable/ffmpeg/debian: ./ .bzr-builddeb/ .bzr-builddeb/default.conf changelog patches/900_doxyfile patches/series rules

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Jun 30 10:29:10 UTC 2008 

Author: siretart
Date: Mon Jun 30 10:29:10 2008
New Revision: 1273

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1273
Log:
  * Added patch 900_doxyfile: tell doxyfile to ignore debian* directories.
  * debian/rules:
    - Reworked building so that separate source & build directories are
      used. This makes cleanup simpler and speeds up maintenance by avoiding
      complete rebuilds when using "debuild binary".
    - Removed some file installation 'cp' commands, made unnecessary due to
      the build reworking.
    - Unpatching is now done *after* cleaning.

Added:
    unstable/ffmpeg/debian/.bzr-builddeb/
    unstable/ffmpeg/debian/.bzr-builddeb/default.conf
    unstable/ffmpeg/debian/patches/900_doxyfile
Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/patches/series
    unstable/ffmpeg/debian/rules

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:ancestry:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:ancestry:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Mon Jun 30 10:29:10 2008
@@ -1,1 +1,2 @@
 siretart at tauware.de-20080606155302-8gcwcbgeck7qnv5k
+siretart at tauware.de-20080630101725-l4lwqf63oiqmwtyx

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Mon Jun 30 10:29:10 2008
@@ -1,0 +1,3 @@
+.bzr-builddeb	bzrbuilddeb-20080628082620-zxaj07pvp5lz4yr1-1
+.bzr-builddeb/default.conf	default.conf-20080628082620-zxaj07pvp5lz4yr1-2
+patches/900_doxyfile	900_doxyfile-20080628082845-lbwcc1t9l54y4mmf-1

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Mon Jun 30 10:29:10 2008
@@ -15,3 +15,4 @@
 39 siretart at tauware.de-20080606155320-sratr392q859ze2s
 45 siretart at tauware.de-20080618204601-vdk7hs1t71u59j4d
 50 siretart at tauware.de-20080622093402-afmkqeqt3h21qf7l
+51 siretart at tauware.de-20080630102856-77rwx9cthv955qja

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Mon Jun 30 10:29:10 2008
@@ -1,5 +1,5 @@
-timestamp: 2008-06-22 11:34:02.411999941 +0200
+timestamp: 2008-06-30 12:28:56.588000059 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
+	author: Darren Salt <linux at youmustbejoking.demon.co.uk>
 	branch-nick: unstable
-	rebase-of: siretart at tauware.de-20080622093402-jc1mehdxohcw61rl

Added: unstable/ffmpeg/debian/.bzr-builddeb/default.conf
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/.bzr-builddeb/default.conf?rev=1273&op=file
==============================================================================
--- unstable/ffmpeg/debian/.bzr-builddeb/default.conf (added)
+++ unstable/ffmpeg/debian/.bzr-builddeb/default.conf Mon Jun 30 10:29:10 2008
@@ -1,0 +1,2 @@
+[BUILDDEB]
+merge = True

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1273&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Mon Jun 30 10:29:10 2008
@@ -25,6 +25,16 @@
     debian/patches/010_ffmpeg-config.diff:
     + Removed ffmpeg-config, use pkg-config instead (maintainers of affected
       packages have been informed, see #487917 to #487922).
+
+  [ Darren Salt ]
+  * Added patch 900_doxyfile: tell doxyfile to ignore debian* directories.
+  * debian/rules:
+    - Reworked building so that separate source & build directories are
+      used. This makes cleanup simpler and speeds up maintenance by avoiding
+      complete rebuilds when using "debuild binary".
+    - Removed some file installation 'cp' commands, made unnecessary due to
+      the build reworking.
+    - Unpatching is now done *after* cleaning.
 
  -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 25 Jun 2008 10:26:13 +0200
 

Added: unstable/ffmpeg/debian/patches/900_doxyfile
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/900_doxyfile?rev=1273&op=file
==============================================================================
--- unstable/ffmpeg/debian/patches/900_doxyfile (added)
+++ unstable/ffmpeg/debian/patches/900_doxyfile Mon Jun 30 10:29:10 2008
@@ -1,0 +1,13 @@
+Index: ffmpeg-0.svn20080626/Doxyfile
+===================================================================
+--- ffmpeg-0.svn20080626.orig/Doxyfile	2008-06-26 15:36:33.000000000 +0100
++++ ffmpeg-0.svn20080626/Doxyfile	2008-06-26 15:37:40.000000000 +0100
+@@ -359,7 +359,7 @@
+ # excluded from the INPUT source files. This way you can easily exclude a
+ # subdirectory from a directory tree whose root is specified with the INPUT tag.
+ 
+-EXCLUDE                =
++EXCLUDE                = debian debian-shared debian-static
+ 
+ # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
+ # that are symbolic links (a Unix filesystem feature) are excluded from the input.

Modified: unstable/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/series?rev=1273&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/series (original)
+++ unstable/ffmpeg/debian/patches/series Mon Jun 30 10:29:10 2008
@@ -1,6 +1,6 @@
 010_proper_rpath.diff
-010_ffmpeg-config.diff
 013_strip_unneeded_linker_flags.diff
 015_reenable-img_convert.diff
 020_fix_libswscale_pic_code
 300_c++_compliant_headers.diff
+900_doxyfile

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1273&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Mon Jun 30 10:29:10 2008
@@ -50,6 +50,7 @@
 static_build_confflags += --disable-ffplay
 
 # Configuration flags for the optimized shared libraries
+# not used anywhere atm
 opt_shared_build_confflags := $(confflags)
 opt_shared_build_confflags += --enable-shared
 opt_shared_build_confflags += --extra-cflags="-fPIC -DPIC"
@@ -101,68 +102,47 @@
 config-extra-includes.h:
 	sh debian/fixup-config.sh > config-extra-includes.h
 
-build: config-extra-includes.h $(QUILT_STAMPFN) build-stamp
-build-stamp:
-	dh_testdir
-
-	# Build static libraries
-	./configure $(static_build_confflags)
+configure-%: configure-%-stamp
+configure-%-stamp: $(QUILT_STAMPFN) config-extra-includes.h
+	dh_testdir
+	mkdir -p debian-$*
+	cd debian-$* && ../configure $($*_build_confflags)
 
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
-	echo "#include \"config-extra-includes.h\"" >> config.h
-endif
-
-	$(MAKE) -j $(NJOBS)
-
-	# Backup static libraries
-	for d in $(LIBS); do \
-	  mv -f $$d/$$d.a $$d/$$d.a.bak ; \
-	done
-
-	$(MAKE) clean
-
-	# Build ffmpeg and shared libraries
-	./configure $(shared_build_confflags)
-
-ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
-	echo "#include \"config-extra-includes.h\"" >> config.h
-endif
-
-	$(MAKE) -j $(NJOBS)
-
-	# Restore static libraries and fix timestamps
-	for d in $(LIBS); do \
-	  mv -f $$d/$$d.a.bak $$d/$$d.a ; \
-	  touch $$d/$$d.a ; \
-	done
-	touch ffmpeg ffmpeg_g ffplay ffplay_g
-
-	# Build qt-faststart
-	$(MAKE) tools/qt-faststart
-
-	# Build doxygen documentation
+	echo "#include \"config-extra-includes.h\"" >> debian-$*/config.h
+endif
+
+	touch $@
+
+build-%: build-%-stamp
+build-%-stamp: configure-%-stamp
+	dh_testdir
+	$(MAKE) -C debian-$* -j $(NJOBS)
+	touch $@
+
+debian-shared/tools/qt-faststart: build-shared-stamp
+	$(MAKE) -C debian-shared tools/qt-faststart
+
+build-doxy: $(QUILT_STAMPFN) build-doxy-stamp
+build-doxy-stamp:
+	dh_testdir
 	doxygen
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	-$(MAKE) test
-endif
-
-	touch $@
-
-clean: unpatch
+	touch $@
+
+build: build-doxy build-stamp
+build-stamp: config-extra-includes.h build-static-stamp build-shared-stamp debian-shared/tools/qt-faststart
+	touch $@
+
+clean: clean-real unpatch
+clean-real:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || [ ! -f config.mak ] || $(MAKE) distclean
-	for d in $(LIBS); do \
-	  rm -f $$d/$$d.a.bak $$d-unistalled.pc $$d.pc ; \
-	done
-	rm -rf doxy/
-	dh_clean config.log config-extra-includes.h config.h
+	rm -f build-stamp build-*-stamp configure-*-stamp patch-stamp
+	rm -rf debian-static debian-shared doxy
+	dh_clean config-extra-includes.h debian/tmp.debhelper.log
 
 get-orig-source:
 	dh_testdir
-
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
         # Disable potentially dangerous patented code
 	chmod +x debian/strip.sh
@@ -178,21 +158,17 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	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/html etc
 	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
-	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/
-	for d in $(LIBS); do cp $$d/$$d.so* debian/tmp/usr/lib; done
-	cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
+	$(MAKE) -C debian-static install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
+	$(MAKE) -C debian-shared install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
+	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 tools/qt-faststart debian/tmp/usr/bin/qt-faststart
+	cp debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 
 	dh_install --fail-missing --sourcedir=debian/tmp
 
@@ -223,4 +199,10 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+
+.PHONY: build build-shared build-static build-doxy \
+	clean clean-real \
+	configure configure-shared configure-static \
+	binary binary-indep binary-arch \
+	install \
+	patch

More information about the pkg-multimedia-commits mailing list