r1231 - in /unstable/ffmpeg/debian: ./ changelog rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Tue Jun  3 19:48:21 2008
New Revision: 1231

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1231
Log:
refactor quilt usage: use /usr/share/quilt/quilt.make.

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

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Tue Jun  3 19:48:21 2008
@@ -1,3 +1,4 @@
 25 siretart at tauware.de-20080603151429-63o3ag2pl1pxd47p
 26 siretart at tauware.de-20080603192817-6gi4jdk5ilh2y4w9
 27 siretart at tauware.de-20080603193428-euj1k56qi0hhrjs4
+28 siretart at tauware.de-20080603194444-ar6pe875mdx4bay7

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Tue Jun  3 19:48:21 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-03 21:34:28.703000069 +0200
+timestamp: 2008-06-03 21:44:44.611000061 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
-	branch-nick: trivial.fixes
+	branch-nick: build.flavors

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1231&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Tue Jun  3 19:48:21 2008
@@ -25,10 +25,12 @@
     So there is indeed no point in having that interface in the header file for the
     debian package. (Closes: #483960).
   * remove 011_link_plugins.diff. It is completely unnecessary now.
+  * refactor quilt usage: use /usr/share/quilt/quilt.make.
   * support building in paralell. make snippet taken from the qemu package.
   * cleanups in debian/rules.
 
- --
+  -- Reinhard Tartler <siretart at tauware.de>  Mon, 02 Jun 2008 22:37:28 +0200
+
 
 ffmpeg-free (0.svn20080206-7) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1231&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Tue Jun  3 19:48:21 2008
@@ -90,9 +90,8 @@
 	sh debian/fixup-config.sh > config-extra-includes.h
 
 build: config-extra-includes.h build-stamp
-build-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+build-stamp: patch
+	dh_testdir
 
 	# Build static libraries
 	./configure $(static_build_confflags)
@@ -131,12 +130,11 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 	[ ! -f Makefile ] || [ ! -f config.mak ] || $(MAKE) distclean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	for d in $(LIBS); do \
 	  rm -f $$d/$$d.a.bak $$d-unistalled.pc $$d.pc ; \
 	done