[SCM] liblivemedia/master: Drop quilt from rules due to dpkg-source 3.0 (quilt) format.

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Tue Nov 30 22:09:34 UTC 2010


The following commit has been merged in the master branch:
commit 1eecea56390f911e40f0f8bd03a88d6258dd9607
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Nov 30 23:06:42 2010 +0100

    Drop quilt from rules due to dpkg-source 3.0 (quilt) format.
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index b5e8079..36692c5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
 Uploaders: Reinhard Tartler <siretart at tauware.de>,
            Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Christophe Mutricy <xtophe at videolan.org>
-Build-Depends: debhelper (>= 5.0),
-               quilt
+Build-Depends: debhelper (>= 5.0)
 Standards-Version: 3.9.1
 Homepage: http://live555.com
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/liblivemedia.git
diff --git a/debian/rules b/debian/rules
index 4e47530..bc607d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -21,7 +19,7 @@ debian/upstream.changelog:
 	wget http://live555.com/liveMedia/public/changelog.txt -O $@
 
 configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
+configure-stamp:
 	dh_testdir
 	./genMakefiles linux
 	touch configure-stamp
@@ -39,8 +37,7 @@ build-stamp:  configure-stamp
 	CFLAGS="$(CFLAGS)" $(MAKE)
 	touch build-stamp
 
-clean: unpatch clean-real
-clean-real:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f changelog.txt
@@ -48,7 +45,7 @@ clean-real:
 	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f `find . -name '*.a'`
 	rm -f `find . -name Makefile`
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir

-- 
liblivemedia packaging



More information about the pkg-multimedia-commits mailing list