[SCM] libebml packaging branch, master, updated. debian/0.7.7-3.1-19-g5b61abc

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Jun 7 21:19:04 UTC 2010


The following commit has been merged in the master branch:
commit 340c98530d37bcf6b974ef3f5607405f77ac3e58
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 7 23:12:27 2010 +0200

    convert to Source Format 3.0 (quilt)

diff --git a/debian/control b/debian/control
index 1e23b2e..a54a790 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 5.0), quilt
+Build-Depends: debhelper (>= 5.0)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/libebml
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libebml/
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1615f89..a341b52 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,3 +4,5 @@ debian-branch = master
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
 pristine-tar = True
+compression = bzip2
+
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/rules b/debian/rules
index b79922f..8ef7c1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,6 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch configure-stamp
 
 build: build-stamp
@@ -29,8 +28,8 @@ clean:
 	rm -f build-stamp configure-stamp
 	rm -f debian/dirs debian/docs debian/*.files
 	-$(MAKE) -C make/linux clean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean
+	test ! -d .git || QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
 install: build
 	dh_testdir
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)

-- 
libebml packaging



More information about the pkg-multimedia-commits mailing list