[SCM] LibASS packaging branch, master, updated. debian/0.9.9-1-10-g31211a5

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Wed Aug 18 19:40:51 UTC 2010


The following commit has been merged in the master branch:
commit 722cc03657a2c61052f62b9ff00e5a2db2a4d9d1
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Tue Aug 17 22:44:38 2010 +0100

    Switch to format 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 78d46b1..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for details how to use quilt.
diff --git a/debian/control b/debian/control
index 68cb71a..1dff0d5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Priority: extra
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Mutricy <xtophe at videolan.org>
 Build-Depends: debhelper (>= 7), 
-               quilt,
                libfreetype6-dev,
                libenca-dev,
                libfontconfig1-dev,
diff --git a/debian/rules b/debian/rules
index ce25ee7..2d75130 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -20,7 +19,7 @@ CONFFLAGS = $(CROSS)
 CONFFLAGS += --prefix=/usr --mandir=\$${prefix}/share/man 
 CONFFLAGS += CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
 
-config.status: $(QUILT_STAMPFN) configure
+config.status: configure
 	dh_testdir
 	touch configure
 	./configure $(CONFFLAGS)
@@ -31,13 +30,11 @@ build-stamp:  config.status
 	$(MAKE)
 	touch $@
 
-clean: unpatch clean-real
-clean-real:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -rf .pc 
 	dh_clean 
 
 install: build
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
LibASS packaging



More information about the pkg-multimedia-commits mailing list