Author: miriam Date: 2011-03-10 22:49:15 +0000 (Thu, 10 Mar 2011) New Revision: 11894
Added: packages/trunk/7kaa/debian/patches/abs_dir.patch packages/trunk/7kaa/debian/source/options Removed: packages/trunk/7kaa/debian/bin/ packages/trunk/7kaa/debian/patches/clean_outside_debian.diff Modified: packages/trunk/7kaa/debian/changelog packages/trunk/7kaa/debian/control packages/trunk/7kaa/debian/copyright packages/trunk/7kaa/debian/patches/series packages/trunk/7kaa/debian/rules Log: New upstream Release Modified: packages/trunk/7kaa/debian/changelog =================================================================== --- packages/trunk/7kaa/debian/changelog 2011-03-10 14:01:11 UTC (rev 11893) +++ packages/trunk/7kaa/debian/changelog 2011-03-10 22:49:15 UTC (rev 11894) @@ -1,6 +1,10 @@ -7kaa (2.14.2-1) UNRELEASED; urgency=low +7kaa (2.14.3-1) UNRELEASED; urgency=low + [ Bertrand Marc ] * Initial release (Closes: #591302). * Patch clean.pl to make sure it doesn't mess with the debian dir. + [ Miriam Ruiz ] + * New upstream release + -- Bertrand Marc <[email protected]> Fri, 18 Feb 2011 09:36:44 +0100 Modified: packages/trunk/7kaa/debian/control =================================================================== --- packages/trunk/7kaa/debian/control 2011-03-10 14:01:11 UTC (rev 11893) +++ packages/trunk/7kaa/debian/control 2011-03-10 22:49:15 UTC (rev 11894) @@ -2,23 +2,38 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Bertrand Marc <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), perl, libsdl1.2-dev, libsdl-net1.2-dev, libopenal-dev, imagemagick +Uploaders: Bertrand Marc <[email protected]>, Miriam Ruiz <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), dh-buildinfo, quilt, autotools-dev, + libsdl1.2-dev, libsdl-net1.2-dev, libopenal-dev, imagemagick Standards-Version: 3.9.1 +Homepage: http://www.7kfans.com/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/7kaa/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/7kaa/ -Homepage: http://www.enlight.com/7k/ Package: 7kaa Architecture: i386 amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, 7kaa-data (>=2.13) -Description: Real time strategy game - Seven Kingdoms is a formerly proprietary RTS game, which has - been released under the GPL. +Depends: 7kaa-data (>=2.13), ${shlibs:Depends}, ${misc:Depends} +Suggests: 7kaa-dbg (= ${binary:Version}) +Description: Seven Kingdoms Ancient Adversaries: real-time strategy game + Seven Kingdoms, designed by Trevor Chan, brings a unique blend of + Real-Time Strategy with the addition of trade, diplomacy, and espionage. . The game enables players to compete against up to six other kingdoms allowing players to conquer opponents by defeating them in war (with troops or machines), capturing their buildings with spies, or offering opponents money for their kingdom. . - This package contains the main program. + In 2009, Enlight Software released the game under the GPL license. 7kfans + project is updating the game and provides a community for fans. A free Seven + Kingdoms will help continue the legacy. + +Package: 7kaa-dbg +Section: debug +Priority: extra +Architecture: i386 amd64 +Depends: 7kaa (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Seven Kingdoms Ancient Adversaries - debug + Seven Kingdoms, designed by Trevor Chan, brings a unique blend of + Real-Time Strategy with the addition of trade, diplomacy, and espionage. + . + This package contains the debugging symbols. Modified: packages/trunk/7kaa/debian/copyright =================================================================== --- packages/trunk/7kaa/debian/copyright 2011-03-10 14:01:11 UTC (rev 11893) +++ packages/trunk/7kaa/debian/copyright 2011-03-10 22:49:15 UTC (rev 11894) @@ -1,34 +1,29 @@ -This work was packaged for Debian by: +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 - Bertrand Marc <[email protected]> on Sun, 08 Aug 2010 20:03:05 +0200 +Files: * +Copyright: Copyright 1997,1998 Enlight Software Ltd. + Copyright 2010 Jesse Allen + Copyright 2010 Unavowed <[email protected]> +Licence: GPL-2+ -It was downloaded from: +Files: debian/* +Copyright: Copyright (C) 2010, Bertrand Marc <[email protected]> + Copyright (C) 2011, Miriam Ruiz <[email protected]> +Licence: GPL-2+ - http://sourceforge.net/projects/skfans/files/ - -Upstream Author(s): - - Jesse Allen <[email protected]> - -Copyright: - - Copyright 2010 Jesse Allen - Copyright 1997,1998 Enlight Software Ltd. - -License: - - The source code and game data of Seven Kingdoms: Ancient Adversaries - is under the GPL version 2. - - NOTE: Seven Kingdoms is a trademark of Enlight Software Ltd. and the - 7kfans project is using the trademark with permission. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - -The Debian packaging is: - - Copyright (C) 2010 Bertrand Marc <[email protected]> - -and is licensed under the GPL version 3, -see "/usr/share/common-licenses/GPL-3". +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 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'. Added: packages/trunk/7kaa/debian/patches/abs_dir.patch =================================================================== --- packages/trunk/7kaa/debian/patches/abs_dir.patch (rev 0) +++ packages/trunk/7kaa/debian/patches/abs_dir.patch 2011-03-10 22:49:15 UTC (rev 11894) @@ -0,0 +1,31 @@ +--- 7kaa-2.14.3.orig/include/GAMEDEF.h ++++ 7kaa-2.14.3/include/GAMEDEF.h +@@ -53,17 +53,17 @@ + #endif + + // top level data dirs +-#define DEFAULT_DIR_RES "resource"PATH_DELIM +-#define DEFAULT_DIR_SPRITE "sprite"PATH_DELIM +-#define DEFAULT_DIR_SOUND "sound"PATH_DELIM +-#define DEFAULT_DIR_IMAGE "image"PATH_DELIM +-#define DEFAULT_DIR_ENCYC "encyc"PATH_DELIM +-#define DEFAULT_DIR_ENCYC2 "encyc2"PATH_DELIM +-#define DEFAULT_DIR_MOVIE "movie"PATH_DELIM +-#define DEFAULT_DIR_MUSIC "music"PATH_DELIM +-#define DEFAULT_DIR_TUTORIAL "tutorial"PATH_DELIM +-#define DEFAULT_DIR_SCENARIO "scenario"PATH_DELIM +-#define DEFAULT_DIR_SCENARI2 "scenari2"PATH_DELIM ++#define DEFAULT_DIR_RES PACKAGE_DATA_PATH PATH_DELIM"resource"PATH_DELIM ++#define DEFAULT_DIR_SPRITE PACKAGE_DATA_PATH PATH_DELIM"sprite"PATH_DELIM ++#define DEFAULT_DIR_SOUND PACKAGE_DATA_PATH PATH_DELIM"sound"PATH_DELIM ++#define DEFAULT_DIR_IMAGE PACKAGE_DATA_PATH PATH_DELIM"image"PATH_DELIM ++#define DEFAULT_DIR_ENCYC PACKAGE_DATA_PATH PATH_DELIM"encyc"PATH_DELIM ++#define DEFAULT_DIR_ENCYC2 PACKAGE_DATA_PATH PATH_DELIM"encyc2"PATH_DELIM ++#define DEFAULT_DIR_MOVIE PACKAGE_DATA_PATH PATH_DELIM"movie"PATH_DELIM ++#define DEFAULT_DIR_MUSIC PACKAGE_DATA_PATH PATH_DELIM"music"PATH_DELIM ++#define DEFAULT_DIR_TUTORIAL PACKAGE_DATA_PATH PATH_DELIM"tutorial"PATH_DELIM ++#define DEFAULT_DIR_SCENARIO PACKAGE_DATA_PATH PATH_DELIM"scenario"PATH_DELIM ++#define DEFAULT_DIR_SCENARI2 PACKAGE_DATA_PATH PATH_DELIM"scenari2"PATH_DELIM + + // encylopedia chapter dirs + #define DEFAULT_DIR_ENCYC_UNIT "unit"PATH_DELIM Deleted: packages/trunk/7kaa/debian/patches/clean_outside_debian.diff =================================================================== --- packages/trunk/7kaa/debian/patches/clean_outside_debian.diff 2011-03-10 14:01:11 UTC (rev 11893) +++ packages/trunk/7kaa/debian/patches/clean_outside_debian.diff 2011-03-10 22:49:15 UTC (rev 11894) @@ -1,11 +0,0 @@ ---- a/clean.pl -+++ b/clean.pl -@@ -19,7 +19,7 @@ - } - print "Entering '$i'\n"; - -- clean_build_files($i) or return 0; -+ $i =~ "debian" or clean_build_files($i) or return 0; - - print "Leaving '$i'\n"; - unless (chdir $orig_dir) { Modified: packages/trunk/7kaa/debian/patches/series =================================================================== --- packages/trunk/7kaa/debian/patches/series 2011-03-10 14:01:11 UTC (rev 11893) +++ packages/trunk/7kaa/debian/patches/series 2011-03-10 22:49:15 UTC (rev 11894) @@ -1 +1 @@ -clean_outside_debian.diff +abs_dir.patch Modified: packages/trunk/7kaa/debian/rules =================================================================== --- packages/trunk/7kaa/debian/rules 2011-03-10 14:01:11 UTC (rev 11893) +++ packages/trunk/7kaa/debian/rules 2011-03-10 22:49:15 UTC (rev 11894) @@ -3,49 +3,81 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -configure: configure-stamp -configure-stamp: +# 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)) +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else +CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +config: config-stamp +config-stamp: dh_testdir - ./configure.pl + [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + ./configure $(CROSS) \ + --prefix=/usr \ + --bindir=\$${prefix}/games \ + --datarootdir=\$${prefix}/share \ + --datarootdir=\$${prefix}/share/games \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --disable-silent-rules \ + CFLAGS="$(CFLAGS)" \ + LDFLAGS="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined" touch $@ build: build-stamp -build-stamp: configure-stamp +build-stamp: config dh_testdir - ./build.pl + $(MAKE) convert src/client/7k.ico src/client/7kaa.png touch $@ -clean: +clean: config dh_testdir dh_testroot + rm -fv build-stamp config-stamp + rm -fv src/client/7kaa.png + [ ! -f Makefile ] || $(MAKE) distclean + rm -fv config.sub config.guess config.cache config.log + [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch dh_clean - rm -f build-stamp configure-stamp src/7kaa src/client/7kaa.png opts.pl - ./clean.pl install: build dh_testdir dh_testroot dh_prep dh_installdirs + $(MAKE) DESTDIR=$(CURDIR)/debian/7kaa install + rm -rfv debian/7kaa/usr/share/games/doc # Build architecture-independent files here. -binary-indep: build install +binary-indep: install # Build architecture-dependent files here. -binary-arch: build install +binary-arch: install dh_testdir dh_testroot - dh_prep dh_installchangelogs dh_installdocs + dh_installexamples + dh_install +# dh_installmenu dh_installman - dh_install dh_link - dh_strip + dh_strip --dbg-package=7kaa-dbg dh_compress dh_fixperms - dh_makeshlibs + [ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo dh_installdeb dh_shlibdeps dh_gencontrol @@ -53,4 +85,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: config build clean binary-indep binary-arch binary install Added: packages/trunk/7kaa/debian/source/options =================================================================== --- packages/trunk/7kaa/debian/source/options (rev 0) +++ packages/trunk/7kaa/debian/source/options 2011-03-10 22:49:15 UTC (rev 11894) @@ -0,0 +1,5 @@ +# Bzip2 compression for debian.tar +compression = "bzip2" +compression-level = 7 +# Do not generate diff for changes in config.(sub|guess) +extend-diff-ignore = "(^|/)config.(sub|guess)$" _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
