r5017 - in packages/trunk/pokerth/debian: . patches

Evgeni Golov sargentd-guest at alioth.debian.org
Tue Dec 18 23:35:22 UTC 2007 

Author: sargentd-guest
Date: 2007-12-18 23:35:22 +0000 (Tue, 18 Dec 2007)
New Revision: 5017

Added:
   packages/trunk/pokerth/debian/patches/01_clean_libpokerth.dpatch
Removed:
   packages/trunk/pokerth/debian/README.Debian-source
   packages/trunk/pokerth/debian/patches/01_data_in_usrsharegamespokerth.dpatch
   packages/trunk/pokerth/debian/pokerth-data.links
Modified:
   packages/trunk/pokerth/debian/
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/control
   packages/trunk/pokerth/debian/copyright
   packages/trunk/pokerth/debian/patches/00list
   packages/trunk/pokerth/debian/pokerth-data.install
Log:
upstream released 0.6-1 as a bugfix release, update


Property changes on: packages/trunk/pokerth/debian
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/pokerth_0.6+dfsg.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/pokerth_0.6-1.orig.tar.gz

Deleted: packages/trunk/pokerth/debian/README.Debian-source
===================================================================
--- packages/trunk/pokerth/debian/README.Debian-source	2007-12-18 18:24:23 UTC (rev 5016)
+++ packages/trunk/pokerth/debian/README.Debian-source	2007-12-18 23:35:22 UTC (rev 5017)
@@ -1,7 +0,0 @@
-To get a DFSG-free source, just remove
-data/gfx/avatars/default/{misc,people}/*.png
-as the licence of those is not always clear
-(may change in the future)
-
-As were are changing the upstream tarball anyways,
-chmod all files in data/ 644, and not 755.

Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2007-12-18 18:24:23 UTC (rev 5016)
+++ packages/trunk/pokerth/debian/changelog	2007-12-18 23:35:22 UTC (rev 5017)
@@ -1,17 +1,18 @@
-pokerth (0.6+dfsg-1) UNRELEASED; urgency=low
+pokerth (0.6-1-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #433390, #428449, #438741)
+  * Split data/* into a separate arch:all package
+  * Added a desktop file (Closes: #451566)
   * Added a build-dependency on libboost-filesystem-dev
-  * Split data/* into a separate arch:all package
-  * removed duplicate VeraBd.ttf, depend on ttf-bitstream-vera
+  * Added dependencies on gsfonts-x11, ttf-bitstream-vera,
+    no need to ship data/fonts/ in binary package anymore
   * Added Homepage field to debian/control
-  * Removed debian/patches/01-newgame_cancel.dpatch
-  * Bump to Standards-Version 3.7.3
+  * Added Vcs-* fields to debian/control
   * Added myself to uploaders
-  * Added a desktop file (Closes: #451566)
-  * Added Vcs-* fields to debian/control
+  * Removed patches/01-newgame_cancel.dpatch
+  * Bump to Standards-Version 3.7.3, no changes needed
 
- -- Evgeni Golov <sargentd at die-welt.net>  Sun, 16 Dec 2007 23:48:00 +0100
+ -- Evgeni Golov <sargentd at die-welt.net>  Tue, 18 Dec 2007 15:34:00 +0100
 
 pokerth (0.5+dfsg-1) unstable; urgency=medium
 

Modified: packages/trunk/pokerth/debian/control
===================================================================
--- packages/trunk/pokerth/debian/control	2007-12-18 18:24:23 UTC (rev 5016)
+++ packages/trunk/pokerth/debian/control	2007-12-18 23:35:22 UTC (rev 5017)
@@ -11,7 +11,7 @@
 
 Package: pokerth
 Architecture: any
-Depends: ${shlibs:Depends}, pokerth-data (= ${source:Version})
+Depends: ${shlibs:Depends}, pokerth-data (= ${source:Version}), gsfonts-x11, ttf-bitstream-vera
 Description: Texas hold'em game
  pokerth is a free implementation of the Texas hold'em poker game which is
  mostly played in casinos and has a growing popularity worldwide. Texas hold'em
@@ -20,7 +20,6 @@
 
 Package: pokerth-data
 Architecture: all
-Depends: ttf-bitstream-vera
 Description: Texas hold'em game - common data files
  pokerth is a free implementation of the Texas hold'em poker game which is
  mostly played in casinos and has a growing popularity worldwide. Texas hold'em

Modified: packages/trunk/pokerth/debian/copyright
===================================================================
--- packages/trunk/pokerth/debian/copyright	2007-12-18 18:24:23 UTC (rev 5016)
+++ packages/trunk/pokerth/debian/copyright	2007-12-18 23:35:22 UTC (rev 5017)
@@ -111,6 +111,25 @@
 Licence: PD
  see http://commons.wikimedia.org/wiki/Poker_(cards_deck)
 
+Files: data/gfx/avatars/default/misc/*
+Copyright: © 2007 by pokerth.net user: ZeiZei
+Licence: BSD-3
+
+Files: data/gfx/avatars/default/people/*
+Copyright: © 2007 by friends and family of the PokerTH developers
+Licence: BSD-3
+
+Files: data/gfx/avatars/default/people/{0c04318e6fa54534935e3e6cfe12c4a1,
+ 14e3f39cc775608bcecf5597248b3558,490ed3a748f6f4d6c261436198f2368f,
+ 95df673e5ee4d02f0f95d5c7ff091cfb,9f49fc3d6062ddc08dc6bbd9ef9b399d,
+ bc28d08c451a775f9e332c14a397096b,bed234c6672d512bdb4c2768f0b3f90c,
+ cbd2e0c6ee579fb8e0f3942639cf988d,d66940c138c207c68a338769d683e691,
+ d21268e1d2ec969367ee5b54bd34738b,d6f8a45e9243b7e7e4e2c8e41df1c9f5,
+ e3e1ae15f7d808fce16c26c049e2cbe9,ef0975f38a367a45cb8042b438957304}.png
+Licence: PD
+ taken from wikimedia commons, copyright expired,
+ see data/data-copyright.txt for links to the images
+
 Files: data/sounds/default/{yourturn,lobbychatnotify}.wav
 Copyright: © 2005-2006 by Olivier Goffart <ogoffart at kde.org>
 Licence: GPL-2+
@@ -128,11 +147,12 @@
 Licence: BSD-3
  these sounds are recorded by doc_dos
 
+Files: debian/*
+Copyright: © 2006-2007 Mario Iseli <admin at marioiseli.com>, 2007 Evgeni Golov <sargentd at die-welt.net>
+Licence: GPL-any
+
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
 On Debian systems, the complete text of the BSD Licence can be found
 in `/usr/share/common-licenses/BSD'.
-
-The Debian packaging is © 2006, Mario Iseli <admin at marioiseli.com> and
-is licensed under the GPL, see above.

Modified: packages/trunk/pokerth/debian/patches/00list
===================================================================
--- packages/trunk/pokerth/debian/patches/00list	2007-12-18 18:24:23 UTC (rev 5016)
+++ packages/trunk/pokerth/debian/patches/00list	2007-12-18 23:35:22 UTC (rev 5017)
@@ -0,0 +1 @@
+01_clean_libpokerth

Added: packages/trunk/pokerth/debian/patches/01_clean_libpokerth.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/01_clean_libpokerth.dpatch	                        (rev 0)
+++ packages/trunk/pokerth/debian/patches/01_clean_libpokerth.dpatch	2007-12-18 23:35:22 UTC (rev 5017)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_clean_libpokerth.dpatch by Evgeni Golov <sargentd at die-welt.net>
+##
+## DP: Adds a quirk to correctly clean libpokerth
+
+ at DPATCH@
+
+Index: pokerth_lib.pro
+===================================================================
+--- pokerth.orig/pokerth_lib.pro	(Revision 1380)
++++ pokerth/pokerth_lib.pro	(Arbeitskopie)
+@@ -8,6 +8,7 @@
+ 
+ UI_DIR = uics
+ TARGET = lib/pokerth_lib
++QMAKE_CLEAN += ./lib/libpokerth_lib.a
+ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+ DEFINES += ENABLE_IPV6

Deleted: packages/trunk/pokerth/debian/patches/01_data_in_usrsharegamespokerth.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/01_data_in_usrsharegamespokerth.dpatch	2007-12-18 18:24:23 UTC (rev 5016)
+++ packages/trunk/pokerth/debian/patches/01_data_in_usrsharegamespokerth.dpatch	2007-12-18 23:35:22 UTC (rev 5017)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_data_in_usrsharegamespokerth.dpatch by Evgeni Golov <sargentd at die-welt.net>
-##
-## DP: Search for game data in /usr/share/games/pokerth
-
- at DPATCH@
-
---- pokerth.orig/src/gui/qt/qttools/qthelper/qthelper.cpp	2007-11-30 10:38:12.000000000 +0100
-+++ pokerth/src/gui/qt/qttools/qthelper/qthelper.cpp	2007-11-20 14:37:31.000000000 +0100
-@@ -52,6 +52,9 @@
- 	} else if (QRegExp("usr/games/bin/?$").indexIn(path) != -1) {
- 		// we are in /usr/games/bin (like gentoo linux does)
- 		path += "/../../share/games/pokerth/data/";
-+	} else if (QRegExp("usr/games/?$").indexIn(path) != -1) {
-+		// we are in /usr/games (like Debian linux does)
-+		path += "/../share/games/pokerth/";
- 	} else if (QRegExp("bin/?$").indexIn(path) != -1) {
- 		// we are in a bin directory. e.g. /usr/bin
- 		path += "/../share/pokerth/data/";

Modified: packages/trunk/pokerth/debian/pokerth-data.install
===================================================================
--- packages/trunk/pokerth/debian/pokerth-data.install	2007-12-18 18:24:23 UTC (rev 5016)
+++ packages/trunk/pokerth/debian/pokerth-data.install	2007-12-18 23:35:22 UTC (rev 5017)
@@ -1,5 +1,3 @@
-data/fonts/c059013l.pfb usr/share/games/pokerth/fonts/
-data/fonts/n019003l.pfb usr/share/games/pokerth/fonts/
 data/gfx/* usr/share/games/pokerth/gfx/
 data/misc/* usr/share/games/pokerth/misc/
 data/sounds/* usr/share/games/pokerth/sounds/

Deleted: packages/trunk/pokerth/debian/pokerth-data.links
===================================================================
--- packages/trunk/pokerth/debian/pokerth-data.links	2007-12-18 18:24:23 UTC (rev 5016)
+++ packages/trunk/pokerth/debian/pokerth-data.links	2007-12-18 23:35:22 UTC (rev 5017)
@@ -1 +0,0 @@
-/usr/share/fonts/truetype/ttf-bitstream-vera/VeraBd.ttf /usr/share/games/pokerth/fonts/VeraBd.ttf

More information about the Pkg-games-commits mailing list