[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f
The following commit has been merged in the master branch: commit 4823299e4c8dea43d7822bd13cd8a0989e4fb0bd Author: Peter Pentchev r...@ringlet.net Date: Sun Dec 5 22:29:51 2010 +0200 Bump Standards-Version to 3.9.1 with no changes (checked). diff --git a/debian/changelog b/debian/changelog index 4d6d09f..cc0315b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,9 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low - TODO: policy 3.9.1 TODO: dpkg-buildflags TODO: debhelper 8 TODO: DEP 5 copyright TODO: Vcs-* tags - TODO: appease lintian * New maintainer. Closes: #442045 * Use quilt for patch management. @@ -13,6 +11,7 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low the main matanza.w source. * Convert to the 3.0 (quilt) source format with bzip2 compression. * Refer to the GPL-2 file instead of the GPL symlink. + * Bump Standards-Version to 3.9.1 with no changes. -- Peter Pentchev r...@ringlet.net Sun, 24 Oct 2010 18:56:37 +0300 diff --git a/debian/control b/debian/control index 0eb54df..d0c74b4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ 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 -Standards-Version: 3.7.2 +Standards-Version: 3.9.1 Homepage: http://bachue.com/matanza/ Package: matanza -- 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
[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f
The following commit has been merged in the master branch: commit 7755f71920692190308f862e6d36c9aa227a4fa5 Author: Peter Pentchev r...@ringlet.net Date: Sun Dec 5 22:44:45 2010 +0200 Convert the copyright file to the DEP 5 format and add my copyright notice. diff --git a/debian/changelog b/debian/changelog index cc0315b..2aee282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low TODO: dpkg-buildflags TODO: debhelper 8 - TODO: DEP 5 copyright TODO: Vcs-* tags * New maintainer. Closes: #442045 @@ -12,6 +11,7 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low * Convert to the 3.0 (quilt) source format with bzip2 compression. * Refer to the GPL-2 file instead of the GPL symlink. * Bump Standards-Version to 3.9.1 with no changes. + * Convert the copyright file to the DEP 5 format and add my notice. -- Peter Pentchev r...@ringlet.net Sun, 24 Oct 2010 18:56:37 +0300 diff --git a/debian/copyright b/debian/copyright index 7ce926c..2175f85 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,33 +1,44 @@ -This package was debianized by Polkan Alexis Garcia Rodriguez pagar...@slcolombia.org on -Mon, 28 Jun 2004 15:19:37 -0500. - -It was downloaded from http://bachue.com/matanza/ - -Author: - -Alejandro Forero Cuervo al...@bachue.com - -Copyright: - -Copyright (C) 1999, 2000 Alejandro Forero Cuervo -Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - -Licence: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this package; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -02110-1301, USA - -On Debian systems, the complete text of the GNU General -Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=135 +Name: matanza +Maintainer: Alejandro Forero Cuervo al...@bachue.com + +Files: * +Copyright: 1999, 2000 Alejandro Forero Cuervo +License: GPL-2+ + +Files: ascii.h asciitab.h iasciitab.h latin1tab.h utf8tab.h + xmldef.h xmlparse.c xmlparse.h xmlrole.c xmlrole.h + xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h +Copyright: 1998, 1999, 2000 Thai Open Source Software Center Ltd +License: GPL-2+ + +Files: getopt1.c +Copyright: 1987,88,89,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. +License: GPL-2+ + +Files: getopt.c +Copyright: 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc. +License: GPL-2+ + +Files: getopt.h +Copyright: 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc. +License: GPL-2+ + +Files: debian/* +Copyright: 2004, 2005 Polkan Alexis Garcia Rodriguez pagar...@slcolombia.org + 2005 Anand Kumria wildf...@progsoc.org + 2006 Paul Wise pa...@bonedaddy.net + 2006 Clint Adams sch...@debian.org + 2007 Michael Tautschnig tauts...@model.in.tum.de + 2008 Frank Lichtenheld dj...@debian.org + 2010 Peter Pentchev r...@ringlet.net +License: GPL-2+ + +Licence: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. -- 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
[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f
The following commit has been merged in the master branch: commit 957a2c969db574fa014c21e44589f4631bf35534 Author: Peter Pentchev r...@ringlet.net Date: Sun Dec 5 22:48:48 2010 +0200 Add the Vcs-Git and Vcs-Browser fields. diff --git a/debian/changelog b/debian/changelog index 2aee282..f639d6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low TODO: dpkg-buildflags TODO: debhelper 8 - TODO: Vcs-* tags * New maintainer. Closes: #442045 * Use quilt for patch management. @@ -12,6 +11,7 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low * Refer to the GPL-2 file instead of the GPL symlink. * Bump Standards-Version to 3.9.1 with no changes. * Convert the copyright file to the DEP 5 format and add my notice. + * Add the Vcs-Git and Vcs-Browser source control fields. -- Peter Pentchev r...@ringlet.net Sun, 24 Oct 2010 18:56:37 +0300 diff --git a/debian/control b/debian/control index d0c74b4..52184af 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,8 @@ Uploaders: Peter Pentchev r...@ringlet.net Build-Depends: debhelper (= 5), autotools-dev, texlive-extra-utils, libpng12-dev Standards-Version: 3.9.1 Homepage: http://bachue.com/matanza/ +Vcs-Git: git://git.debian.org/git/pkg-games/matanza.git +Vcs-Browser: http://git.debian.org/?p=pkg-games/matanza.git Package: matanza Architecture: any -- 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
[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f
The following commit has been merged in the master branch: commit 0f03806f02951568c3f566ebbe8ca9fa107f88c0 Author: Peter Pentchev r...@ringlet.net Date: Sun Dec 5 23:00:37 2010 +0200 Use dpkg-buildflags to obtain CPPFLAGS, CFLAGS and LDFLAGS. diff --git a/debian/changelog b/debian/changelog index f639d6e..fe44a4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low - TODO: dpkg-buildflags TODO: debhelper 8 * New maintainer. Closes: #442045 @@ -12,6 +11,8 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low * Bump Standards-Version to 3.9.1 with no changes. * Convert the copyright file to the DEP 5 format and add my notice. * Add the Vcs-Git and Vcs-Browser source control fields. + * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CPPFLAGS, CFLAGS +and LDFLAGS. -- Peter Pentchev r...@ringlet.net Sun, 24 Oct 2010 18:56:37 +0300 diff --git a/debian/control b/debian/control index 52184af..89fd4c6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ 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 +Build-Depends: debhelper (= 5), dpkg-dev (= 1.15.7~), + autotools-dev, texlive-extra-utils, libpng12-dev Standards-Version: 3.9.1 Homepage: http://bachue.com/matanza/ Vcs-Git: git://git.debian.org/git/pkg-games/matanza.git diff --git a/debian/rules b/debian/rules index e9821cb..ad597f8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,14 +3,14 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +CFLAGS:= $(shell dpkg-buildflags --get CFLAGS) +CPPFLAGS:= $(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS:= $(shell dpkg-buildflags --get LDFLAGS) + DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +CFLAGS += -Wall +export CFLAGS CPPFLAGS LDFLAGS build: build-stamp build-stamp: -- 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
[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f
The following commit has been merged in the master branch: commit 915b12c48c66b62d10121477100a3fde3dcd80d6 Author: Peter Pentchev r...@ringlet.net Date: Sun Dec 5 23:12:36 2010 +0200 Bump the debhelper compat level to 7 with almost no changes. diff --git a/debian/changelog b/debian/changelog index fe44a4d..7cc767e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low * Add the Vcs-Git and Vcs-Browser source control fields. * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CPPFLAGS, CFLAGS and LDFLAGS. + * Bump the debhelper compatibility version to 7: +- use dh_prep instead of dh_clean -k +- dh_clean removes build-stamp now -- Peter Pentchev r...@ringlet.net Sun, 24 Oct 2010 18:56:37 +0300 diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 89fd4c6..b13b61f 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), dpkg-dev (= 1.15.7~), +Build-Depends: debhelper (= 7), dpkg-dev (= 1.15.7~), autotools-dev, texlive-extra-utils, libpng12-dev Standards-Version: 3.9.1 Homepage: http://bachue.com/matanza/ diff --git a/debian/rules b/debian/rules index ad597f8..42d3292 100755 --- a/debian/rules +++ b/debian/rules @@ -25,14 +25,14 @@ clean: dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean - rm -f matanza.c ai.c config.sub config.guess build-stamp + rm -f matanza.c ai.c config.sub config.guess rm -f *.o dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep $(MAKE) install DESTDIR=$(CURDIR)/debian/matanza binary: binary-indep binary-arch -- 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
[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f
The following commit has been merged in the master branch: commit 20ef6994cf3eecccfdbdd78b86820494b9e1e087 Author: Peter Pentchev r...@ringlet.net Date: Sun Dec 5 23:42:26 2010 +0200 Shorten the rules file using the dh(1) helper. diff --git a/debian/changelog b/debian/changelog index 7cc767e..4c475c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,8 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CPPFLAGS, CFLAGS and LDFLAGS. * Bump the debhelper compatibility version to 7: -- use dh_prep instead of dh_clean -k - dh_clean removes build-stamp now +- shorten the rules file using the dh(1) helper -- Peter Pentchev r...@ringlet.net Sun, 24 Oct 2010 18:56:37 +0300 diff --git a/debian/clean b/debian/clean new file mode 100644 index 000..59c90f5 --- /dev/null +++ b/debian/clean @@ -0,0 +1,4 @@ +ai.c +matanza.c +config.guess +config.sub diff --git a/debian/rules b/debian/rules index 42d3292..cb98c9f 100755 --- a/debian/rules +++ b/debian/rules @@ -14,46 +14,25 @@ export CFLAGS CPPFLAGS LDFLAGS build: build-stamp build-stamp: - dh_testdir + dh build --before auto_configure cp -f /usr/share/misc/config.sub . cp -f /usr/share/misc/config.guess . - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=/usr/games - $(MAKE) CFLAGS=$(CFLAGS) + dh_auto_configure -- --bindir=/usr/games + dh build --before auto_build + dh_auto_build -- CFLAGS=$(CFLAGS) + dh build --remaining touch build-stamp clean: - dh_testdir - dh_testroot - [ ! -f Makefile ] || $(MAKE) distclean - rm -f matanza.c ai.c config.sub config.guess - rm -f *.o - dh_clean + dh $@ install: build - dh_testdir - dh_testroot - dh_prep - $(MAKE) install DESTDIR=$(CURDIR)/debian/matanza + dh $@ binary: binary-indep binary-arch binary-indep: install binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + dh $@ .PHONY: build clean install binary binary-arch binary-indep -- 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
[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f
The following commit has been merged in the master branch:
commit b0d41a981894ab1f419f13285309c46c7ecc9c70
Author: Peter Pentchev r...@ringlet.net
Date: Sun Dec 5 23:50:26 2010 +0200
Minimize the rules file using override targets.
diff --git a/debian/changelog b/debian/changelog
index 4c475c5..668f821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,8 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low
* Add the Vcs-Git and Vcs-Browser source control fields.
* Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CPPFLAGS, CFLAGS
and LDFLAGS.
- * Bump the debhelper compatibility version to 7:
-- dh_clean removes build-stamp now
-- shorten the rules file using the dh(1) helper
+ * Bump the debhelper compatibility version to 7 and minimize the rules
+file using the dh(1) helper and debhelper override targets.
-- Peter Pentchev r...@ringlet.net Sun, 24 Oct 2010 18:56:37 +0300
diff --git a/debian/control b/debian/control
index b13b61f..73fb620 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 (= 7), dpkg-dev (= 1.15.7~),
+Build-Depends: debhelper (= 7.0.50~), dpkg-dev (= 1.15.7~),
autotools-dev, texlive-extra-utils, libpng12-dev
Standards-Version: 3.9.1
Homepage: http://bachue.com/matanza/
diff --git a/debian/rules b/debian/rules
index cb98c9f..8e48085 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,35 +7,19 @@ CFLAGS:= $(shell dpkg-buildflags --get CFLAGS)
CPPFLAGS:= $(shell dpkg-buildflags --get CPPFLAGS)
LDFLAGS:= $(shell dpkg-buildflags --get LDFLAGS)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
CFLAGS += -Wall
export CFLAGS CPPFLAGS LDFLAGS
-build: build-stamp
-build-stamp:
- dh build --before auto_configure
+# Note: this could be simplified even further using --with autotools_dev,
+# but it would require another repacking to bring back config.{guess,sub} :)
+#
+override_dh_auto_configure:
cp -f /usr/share/misc/config.sub .
cp -f /usr/share/misc/config.guess .
dh_auto_configure -- --bindir=/usr/games
- dh build --before auto_build
- dh_auto_build -- CFLAGS=$(CFLAGS)
- dh build --remaining
- touch build-stamp
-
-clean:
- dh $@
-install: build
- dh $@
+override_dh_auto_build:
+ dh_auto_build -- CFLAGS=$(CFLAGS)
-binary: binary-indep binary-arch
-binary-indep: install
-binary-arch: install
+%:
dh $@
-
-.PHONY: build clean install binary binary-arch binary-indep
-
-#Local variables:
-#mode: makefile
-#End:
--
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
[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f
The following commit has been merged in the master branch: commit 28f2cab0223f2352816dbe60bf2127cb29d6bbd9 Author: Peter Pentchev r...@ringlet.net Date: Sun Dec 5 23:52:31 2010 +0200 Bump the debhelper compat level to 8 with no changes. diff --git a/debian/changelog b/debian/changelog index 668f821..96a970e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,5 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low - TODO: debhelper 8 - * New maintainer. Closes: #442045 * Use quilt for patch management. * Fix a typo in the Debian-supplied manual page and another one in @@ -13,7 +11,7 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low * Add the Vcs-Git and Vcs-Browser source control fields. * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CPPFLAGS, CFLAGS and LDFLAGS. - * Bump the debhelper compatibility version to 7 and minimize the rules + * Bump the debhelper compatibility version to 8 and minimize the rules file using the dh(1) helper and debhelper override targets. -- Peter Pentchev r...@ringlet.net Sun, 24 Oct 2010 18:56:37 +0300 diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 73fb620..cab24e9 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 (= 7.0.50~), dpkg-dev (= 1.15.7~), +Build-Depends: debhelper (= 8), dpkg-dev (= 1.15.7~), autotools-dev, texlive-extra-utils, libpng12-dev Standards-Version: 3.9.1 Homepage: http://bachue.com/matanza/ -- 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
