[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-44-gb36a5b7

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Wed Jun 23 15:31:04 UTC 2010


The following commit has been merged in the experimental branch:
commit 0825b77227e7bcd9ead1625b3cb3cd8d6b1f481e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Jun 23 17:25:50 2010 +0200

    Fully switch to dpkg-source 3.0 (quilt).

diff --git a/debian/control b/debian/control
index 8daac44..d4e31c0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
 Build-Depends: debhelper (>= 7),
                dh-buildinfo,
                gettext,
-               quilt,
                nasm,
                yasm [amd64 kfreebsd-amd64],
                liba52-0.7.4-dev,
diff --git a/debian/rules b/debian/rules
index 6b7a2e4..01e028c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,6 @@ endif
 
 
 
-include /usr/share/quilt/quilt.make
-
 LDFLAGS = -Wl,--as-needed
 
 # configure flags
@@ -126,7 +124,7 @@ endif
 VIDDIR := usr/share/vlc
 
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	dh_testdir
 	# We need to build the static library apart
 	# Else it's a mess when we build the modules
@@ -170,8 +168,6 @@ clean:
 	rm -f mozilla/vlcintf.xpt mozilla/vlcintf.h
 	# Remove spurious autotools stuff
 	rm -f config.log confdefs.h
-	# Unpatch package
-	$(MAKE) -f debian/rules unpatch
 	dh_clean
 
 install: build

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list