Author: apo-guest Date: 2013-06-19 15:52:34 +0000 (Wed, 19 Jun 2013) New Revision: 14277
Modified: packages/trunk/7kaa/debian/7kaa.desktop packages/trunk/7kaa/debian/7kaa.menu packages/trunk/7kaa/debian/changelog packages/trunk/7kaa/debian/compat packages/trunk/7kaa/debian/control packages/trunk/7kaa/debian/copyright packages/trunk/7kaa/debian/rules Log: Bump compat level to 9. - Require debhelper >=9 - Simplify debian/rules by using dh sequencer - Update copyright to format 1.0. - Build with parallel and dh-autoreconf - Use automatic hardening build flags. - Drop dh-buildinfo and dpkg-dev build-dep. Modified: packages/trunk/7kaa/debian/7kaa.desktop =================================================================== --- packages/trunk/7kaa/debian/7kaa.desktop 2013-06-19 12:52:53 UTC (rev 14276) +++ packages/trunk/7kaa/debian/7kaa.desktop 2013-06-19 15:52:34 UTC (rev 14277) @@ -1,9 +1,10 @@ [Desktop Entry] Version=1.0 Name=Seven Kingdoms -GenericName=Game +GenericName=Strategy Game Comment=Seven Kingdoms: Ancient Adversaries Type=Application Exec=7kaa Icon=7kaa Categories=Game;StrategyGame; +Keywords=game;strategy;ancient;kingdoms;real-time;trade;diplomacy;espionage; Modified: packages/trunk/7kaa/debian/7kaa.menu =================================================================== --- packages/trunk/7kaa/debian/7kaa.menu 2013-06-19 12:52:53 UTC (rev 14276) +++ packages/trunk/7kaa/debian/7kaa.menu 2013-06-19 15:52:34 UTC (rev 14277) @@ -1 +1,5 @@ -?package(7kaa):needs="x11" section="Games/Strategy" title="Seven Kingdoms Ancient Adversaries" command="/usr/games/7kaa" icon="7kaa.xpm" +?package(7kaa):needs="x11" \ + section="Games/Strategy" \ + title="Seven Kingdoms Ancient Adversaries" \ + command="/usr/games/7kaa" \ + icon="/usr/share/pixmaps/7kaa.xpm" Modified: packages/trunk/7kaa/debian/changelog =================================================================== --- packages/trunk/7kaa/debian/changelog 2013-06-19 12:52:53 UTC (rev 14276) +++ packages/trunk/7kaa/debian/changelog 2013-06-19 15:52:34 UTC (rev 14277) @@ -4,12 +4,23 @@ * Add myself to uploaders. * Remove quilt build-dep as package is format 3.0 (quilt). * Add build-arch and build-indep targets in rules. - * Add dpkg-dev build-dep for hardening includes. - + Manually add relro to LDLFAGS in rules for now. + * Manually add relro to LDLFAGS in rules for now. * Create data packages since data is in single tarball now. * Fix watch file. * Bump Standards Version to 3.9.4. + [ Markus Koschany ] + * Bump compat level to 9 and require debhelper >= 9. + * 7kaa.desktop: Add keywords. + * 7kaa.menu: Use an absolute icon path. + * debian/control: + - Remove dh-buildinfo from build-dep, not needed. + - Add dh-autoreconf to Build-Depends. + * debian/rules: + - Simplify debian/rules by using dh sequencer. + - Build with --parallel and --autoreconf. + * Update debian/copyright top copyright format 1.0. + -- Barry deFreese <[email protected]> Sun, 16 Jun 2013 10:33:37 -0400 7kaa (2.14.3-1) unstable; urgency=low Modified: packages/trunk/7kaa/debian/compat =================================================================== --- packages/trunk/7kaa/debian/compat 2013-06-19 12:52:53 UTC (rev 14276) +++ packages/trunk/7kaa/debian/compat 2013-06-19 15:52:34 UTC (rev 14277) @@ -1 +1 @@ -7 +9 Modified: packages/trunk/7kaa/debian/control =================================================================== --- packages/trunk/7kaa/debian/control 2013-06-19 12:52:53 UTC (rev 14276) +++ packages/trunk/7kaa/debian/control 2013-06-19 15:52:34 UTC (rev 14277) @@ -8,9 +8,8 @@ Barry deFreese <[email protected]> Build-Depends: autotools-dev, - debhelper (>= 7.0.50~), - dh-buildinfo, - dpkg-dev (>= 1.16.1~), + debhelper (>= 9), + dh-autoreconf, libopenal-dev, libsdl-net1.2-dev, libsdl1.2-dev Modified: packages/trunk/7kaa/debian/copyright =================================================================== --- packages/trunk/7kaa/debian/copyright 2013-06-19 12:52:53 UTC (rev 14276) +++ packages/trunk/7kaa/debian/copyright 2013-06-19 15:52:34 UTC (rev 14277) @@ -1,29 +1,26 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat -Upstream-Source: http://sourceforge.net/projects/skfans/ -Upstream-Maintainer: Jesse Allen <[email protected]> -Debianized-By: Bertrand Marc <[email protected]> - Miriam Ruiz <[email protected]> -Debianized-Date: Sun, 08 Aug 2010 20:03:05 +0200 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: 7kaa +Source: http://sourceforge.net/projects/skfans/ +Upstream-Contact: Jesse Allen <[email protected]> Files: * -Copyright: Copyright 1997,1998 Enlight Software Ltd. - Copyright 2010 Jesse Allen - Copyright 2010 Unavowed <[email protected]> -Licence: GPL-2+ +Copyright: 1997,1998, Enlight Software Ltd. + 2010, Jesse Allen + 2010, Unavowed <[email protected]> +License: GPL-2+ Files: debian/* -Copyright: Copyright (C) 2010, Bertrand Marc <[email protected]> - Copyright (C) 2011, Miriam Ruiz <[email protected]> -Licence: GPL-2+ +Copyright: 2010, Bertrand Marc <[email protected]> + 2011, Miriam Ruiz <[email protected]> + 2013, Barry deFreese <[email protected]> + 2013, Markus Koschany <[email protected]> +License: GPL-2+ -Licence: GPL-2+ +License: 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 latest version of the GNU - General Public License can be found in `/usr/share/common-licenses/GPL'. - . - The complete text of version 2 of the GNU General Public License can be - found in `/usr/share/common-licenses/GPL-2'. + On Debian systems, the complete text of of the GNU General Public License 2 + can be found in `/usr/share/common-licenses/GPL-2'. Modified: packages/trunk/7kaa/debian/rules =================================================================== --- packages/trunk/7kaa/debian/rules 2013-06-19 12:52:53 UTC (rev 14276) +++ packages/trunk/7kaa/debian/rules 2013-06-19 15:52:34 UTC (rev 14277) @@ -1,10 +1,5 @@ #!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) @@ -13,13 +8,10 @@ CROSS= --build $(DEB_BUILD_GNU_TYPE) endif -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk +%: + dh $@ --parallel --with autoreconf -config: config-stamp -config-stamp: - dh_testdir - dh_autotools-dev_updateconfig +override_dh_auto_configure: ./configure $(CROSS) \ --prefix=/usr \ --bindir=\$${prefix}/games \ @@ -30,71 +22,10 @@ --disable-silent-rules \ CFLAGS="$(CFLAGS)" \ LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,--as-needed -Wl,--no-undefined" - touch $@ -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: config - dh_testdir - $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -fv build-stamp config-stamp - [ ! -f Makefile ] || $(MAKE) distclean - dh_autotools-dev_restoreconfig - rm -fv config.log - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs +override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install rm -rfv debian/7kaa/usr/share/games/doc -# Build architecture-independent files here. -binary-indep: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_install - dh_link - dh_strip - dh_compress - dh_fixperms - [ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install - dh_installmenu - dh_installman - dh_link +override_dh_strip: dh_strip --dbg-package=7kaa-dbg - dh_compress - dh_fixperms - [ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: config build clean binary-indep binary-arch binary install _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
