Author: evgeni Date: 2011-05-09 10:50:26 +0000 (Mon, 09 May 2011) New Revision: 12298
Added: packages/branches/adonthell-data/cleanup/debian/patches/dont-install-avatar.ttf.patch packages/branches/adonthell-data/cleanup/debian/source/ packages/branches/adonthell-data/cleanup/debian/source/format Removed: packages/branches/adonthell-data/cleanup/debian/adonthell.desktop Modified: packages/branches/adonthell-data/cleanup/debian/adonthell-data.links packages/branches/adonthell-data/cleanup/debian/changelog packages/branches/adonthell-data/cleanup/debian/control packages/branches/adonthell-data/cleanup/debian/patches/series packages/branches/adonthell-data/cleanup/debian/rules Log: merge experimental and sid versions into 0.3.5+dfsg-1 Modified: packages/branches/adonthell-data/cleanup/debian/adonthell-data.links =================================================================== --- packages/branches/adonthell-data/cleanup/debian/adonthell-data.links 2011-05-09 10:20:03 UTC (rev 12297) +++ packages/branches/adonthell-data/cleanup/debian/adonthell-data.links 2011-05-09 10:50:26 UTC (rev 12298) @@ -1 +1,2 @@ /usr/share/pixmaps/wastesedge_32x32.xpm /usr/share/pixmaps/wastesedge.xpm +/usr/share/fonts/truetype/freefont/FreeSansBold.ttf /usr/share/games/adonthell/games/wastesedge/gfx/window/font/avatar.ttf Deleted: packages/branches/adonthell-data/cleanup/debian/adonthell.desktop =================================================================== --- packages/branches/adonthell-data/cleanup/debian/adonthell.desktop 2011-05-09 10:20:03 UTC (rev 12297) +++ packages/branches/adonthell-data/cleanup/debian/adonthell.desktop 2011-05-09 10:50:26 UTC (rev 12298) @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Adonthell - Waste's Edge -Comment=This is a 2D graphical role playing game. -Exec=adonthell-wastesedge -Icon=wastesedge_16x16 -Terminal=false -Type=Application -Categories=Game;2DGraphics;RolePlaying; Modified: packages/branches/adonthell-data/cleanup/debian/changelog =================================================================== --- packages/branches/adonthell-data/cleanup/debian/changelog 2011-05-09 10:20:03 UTC (rev 12297) +++ packages/branches/adonthell-data/cleanup/debian/changelog 2011-05-09 10:50:26 UTC (rev 12298) @@ -1,11 +1,20 @@ -adonthell-data (0.3.5-2) UNRELEASED; urgency=low +adonthell-data (0.3.5+dfsg-1) UNRELEASED; urgency=low - * NOT RELEASED YET + * Team upload. + + [ Iain Lane ] * debian/control: Remove myself from Uploaders - * DONT USE THIS, archive has 0.3.4.cvs.20080529-2, needs merging. - -- Iain Lane <[email protected]> Wed, 30 Jun 2010 10:54:45 +0100 + [ Evgeni Golov ] + * Merge 0.3.4.cvs.20080529+dfsg-3 and 0.3.5-1 + * Release as 0.3.5+dfsg-1 + * Make the package format 3.0 (quilt) again, the experimental + version was 1.0. + * Drop quilt Build-Depend. + Closes: #591959 + -- Evgeni Golov <[email protected]> Mon, 09 May 2011 12:48:32 +0200 + adonthell-data (0.3.5-1) experimental; urgency=low [ Gonéri Le Bouder ] @@ -28,6 +37,29 @@ -- Iain Lane <[email protected]> Wed, 31 Dec 2008 15:12:43 +0000 +adonthell-data (0.3.4.cvs.20080529+dfsg-3) unstable; urgency=medium + + * Add build deps on automake and autoconf, reported by + Jordan Metzmeier (Closes: #593052) + + -- Moritz Muehlenhoff <[email protected]> Tue, 17 Aug 2010 22:25:04 +0200 + +adonthell-data (0.3.4.cvs.20080529+dfsg-2) unstable; urgency=low + + * Strip pyc files, patch by Jordan Metzmeier (Closes: #591879) + + -- Moritz Muehlenhoff <[email protected]> Fri, 06 Aug 2010 10:12:11 -0400 + +adonthell-data (0.3.4.cvs.20080529+dfsg-1) unstable; urgency=low + + * Switch to source format 3.0 + * Strip avatar.ttf from the tarball. It's freeness status is + unclear. Instead depend on ttf-freefont and symlink the + FreeSansBold.ttf to the previous place (Closes: #590971) + * Rebuild against Python 2.6 (Closes: #591049) + + -- Moritz Muehlenhoff <[email protected]> Tue, 03 Aug 2010 16:37:16 -0400 + adonthell-data (0.3.4.cvs.20080529-1) unstable; urgency=low [ Barry deFreese ] Modified: packages/branches/adonthell-data/cleanup/debian/control =================================================================== --- packages/branches/adonthell-data/cleanup/debian/control 2011-05-09 10:20:03 UTC (rev 12297) +++ packages/branches/adonthell-data/cleanup/debian/control 2011-05-09 10:50:26 UTC (rev 12298) @@ -4,7 +4,7 @@ Maintainer: Debian Games Team <[email protected]> Uploaders: Barry deFreese <[email protected]> Build-Depends-Indep: autotools-dev, python-dev, adonthell (>= 0.3), adonthell (<< 0.4), python-support (>= 0.4.0) -Build-Depends: debhelper (>= 5), quilt (>= 0.40) +Build-Depends: debhelper (>= 5) Standards-Version: 3.8.0 Homepage: http://adonthell.linuxgames.com/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adonthell-data/ @@ -12,7 +12,7 @@ Package: adonthell-data Architecture: all -Depends: ${python:Depends}, adonthell (>= 0.3.3.cvs.20031022), adonthell (<< 0.4) +Depends: ${python:Depends}, adonthell (>= 0.3.3.cvs.20031022), adonthell (<< 0.4), ttf-freefont Description: Data files needed by Adonthell This is the official game for Adonthell 0.3 . Added: packages/branches/adonthell-data/cleanup/debian/patches/dont-install-avatar.ttf.patch =================================================================== --- packages/branches/adonthell-data/cleanup/debian/patches/dont-install-avatar.ttf.patch (rev 0) +++ packages/branches/adonthell-data/cleanup/debian/patches/dont-install-avatar.ttf.patch 2011-05-09 10:50:26 UTC (rev 12298) @@ -0,0 +1,25 @@ +Index: wastesedge-0.3.5/gfx/window/font/Makefile.am +=================================================================== +--- wastesedge-0.3.5.orig/gfx/window/font/Makefile.am 2011-05-09 12:38:55.419572021 +0200 ++++ wastesedge-0.3.5/gfx/window/font/Makefile.am 2011-05-09 12:39:07.561960307 +0200 +@@ -2,6 +2,6 @@ + + pkgdatadir = $(gamedatadir)/gfx/window/font + +-pkgdata_DATA = avatar.ttf ++pkgdata_DATA = + + EXTRA_DIST = $(pkgdata_DATA) +Index: wastesedge-0.3.5/gfx/window/font/Makefile.in +=================================================================== +--- wastesedge-0.3.5.orig/gfx/window/font/Makefile.in 2011-05-09 12:39:09.297729910 +0200 ++++ wastesedge-0.3.5/gfx/window/font/Makefile.in 2011-05-09 12:39:16.796734534 +0200 +@@ -108,7 +108,7 @@ + install_sh = @install_sh@ + SUBDIRS = blue green original red silverleaf violet white yellow + +-pkgdata_DATA = avatar.ttf ++pkgdata_DATA = + + EXTRA_DIST = $(pkgdata_DATA) + subdir = gfx/window/font Modified: packages/branches/adonthell-data/cleanup/debian/patches/series =================================================================== --- packages/branches/adonthell-data/cleanup/debian/patches/series 2011-05-09 10:20:03 UTC (rev 12297) +++ packages/branches/adonthell-data/cleanup/debian/patches/series 2011-05-09 10:50:26 UTC (rev 12298) @@ -1,2 +1,3 @@ 01_do_not_ship_pyc_files 02_player_text.py.diff +dont-install-avatar.ttf.patch Modified: packages/branches/adonthell-data/cleanup/debian/rules =================================================================== --- packages/branches/adonthell-data/cleanup/debian/rules 2011-05-09 10:20:03 UTC (rev 12297) +++ packages/branches/adonthell-data/cleanup/debian/rules 2011-05-09 10:50:26 UTC (rev 12298) @@ -1,8 +1,6 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make - DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) INSTALL = /usr/bin/install -c @@ -16,7 +14,7 @@ INSTALL_PROGRAM += -s endif -config.status: configure $(QUILT_STAMPFN) +config.status: configure dh_testdir -test -r /usr/share/misc/config.sub && \ @@ -41,7 +39,7 @@ DESTDIR="$(CURDIR)/debian/adonthell-data" touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp Added: packages/branches/adonthell-data/cleanup/debian/source/format =================================================================== --- packages/branches/adonthell-data/cleanup/debian/source/format (rev 0) +++ packages/branches/adonthell-data/cleanup/debian/source/format 2011-05-09 10:50:26 UTC (rev 12298) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
