The following commit has been merged in the master branch: commit 188b7dea1a999537e6acbb13971619d7a7ff7d42 Author: Peter Pentchev <r...@ringlet.net> Date: Sun Dec 5 20:05:43 2010 +0200
Convert to the 3.0 (quilt) format. diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 36fa149..0000000 --- a/debian/README.source +++ /dev/null @@ -1,17 +0,0 @@ -The matanza package uses quilt to maintain local changes -to the matanza distribution. The Debian-specific patches are -maintained in the debian/patches/ directory. - -To apply all the patches, preparing the source for building, use: - debian/rules patch - -To revert the patches, preparing to build a source package, use: - debian/rules unpatch - -You do not need to manually execute these targets when building -the package; they are part of the debian/rules target chain. - -For more information on the quilt integration with Debian packages, -as well as editing, adding or removing patches, please see -the quilt documentation; in recent versions of the Debian package of -quilt, start at the /usr/share/doc/quilt/README.source file. diff --git a/debian/changelog b/debian/changelog index 58137b4..94f80c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low * Use quilt for patch management. * Fix a typo in the Debian-supplied manual page and another one in the main matanza.w source. - * Specify the Debian source format as 1.0. + * Convert to the 3.0 (quilt) source format. -- Peter Pentchev <r...@ringlet.net> Sun, 24 Oct 2010 18:56:37 +0300 diff --git a/debian/control b/debian/control index 97151d9..0eb54df 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: extra Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Peter Pentchev <r...@ringlet.net> -Build-Depends: debhelper (>= 5), autotools-dev, texlive-extra-utils, libpng12-dev, quilt +Build-Depends: debhelper (>= 5), autotools-dev, texlive-extra-utils, libpng12-dev Standards-Version: 3.7.2 Homepage: http://bachue.com/matanza/ diff --git a/debian/rules b/debian/rules index 1fae102..e9821cb 100755 --- a/debian/rules +++ b/debian/rules @@ -12,10 +12,8 @@ else CFLAGS += -O2 endif -include /usr/share/quilt/quilt.make - build: build-stamp -build-stamp: ${QUILT_STAMPFN} +build-stamp: dh_testdir cp -f /usr/share/misc/config.sub . cp -f /usr/share/misc/config.guess . @@ -29,7 +27,6 @@ clean: [ ! -f Makefile ] || $(MAKE) distclean rm -f matanza.c ai.c config.sub config.guess build-stamp rm -f *.o - $(MAKE) -f debian/rules unpatch dh_clean install: build diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) -- matanza - a space ascii war game _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits