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

Sun Apr 19 18:13:59 UTC 2009

Author: sargentd-guest
Date: 2009-04-19 18:13:59 +0000 (Sun, 19 Apr 2009)
New Revision: 9633

Modified:
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/compat
   packages/trunk/pokerth/debian/control
   packages/trunk/pokerth/debian/copyright
   packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
   packages/trunk/pokerth/debian/rules
Log:
lots of offline work:

- debhelper 7 update
- copyright update
- patch refresh



Modified: packages/trunk/pokerth/debian/changelog
===================================================================

--- packages/trunk/pokerth/debian/changelog	2009-04-19 17:54:43 UTC (rev 9632)
+++ packages/trunk/pokerth/debian/changelog	2009-04-19 18:13:59 UTC (rev 9633)
@@ -1,14 +1,23 @@
 pokerth (0.7~beta1-1) UNRELEASED; urgency=low
 
-  * New upstream beta release.
+  * New upstream beta release (fetched from SVN r1886).
   * debian/patches/02_use_dejavu_fonts.patch:
     + Refresh patch against new source.
   * debian/patches/01_clean_libpokerth.patch:
     + Refresh (again) against new source.
+  * debian/patches/04_enable_beta.patch:
+    + Add a (temporary) patch, for using the beta server.
   * debian/rules:
-    + use $(MAKE) instead of make.
+    + use $(QUILT_STAMPFN) instead of patch.
+  * debian/{compat,control,rules}:
+    + use debhelper 7.
+  * debian/copyright:
+    + update copyright years
+    + use better machine-readable style
+    + add copyright about the danuxi1 table
+    + add links to LGPL-2+ and GPL-2
 
- -- Evgeni Golov <sargentd at die-welt.net>  Thu, 16 Apr 2009 21:51:52 +0200
+ -- Evgeni Golov <sargentd at die-welt.net>  Sun, 19 Apr 2009 19:18:25 +0200
 
 pokerth (0.6.4-1) unstable; urgency=low
 

Modified: packages/trunk/pokerth/debian/compat
===================================================================
--- packages/trunk/pokerth/debian/compat	2009-04-19 17:54:43 UTC (rev 9632)
+++ packages/trunk/pokerth/debian/compat	2009-04-19 18:13:59 UTC (rev 9633)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/pokerth/debian/control
===================================================================
--- packages/trunk/pokerth/debian/control	2009-04-19 17:54:43 UTC (rev 9632)
+++ packages/trunk/pokerth/debian/control	2009-04-19 18:13:59 UTC (rev 9633)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Mario Iseli <admin at marioiseli.com>, Evgeni Golov <sargentd at die-welt.net>
-Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), libqt4-dev,
+Build-Depends: debhelper (>= 7), quilt (>= 0.40), libqt4-dev,
  libsdl-mixer1.2-dev, libcurl4-gnutls-dev, libgnutls-dev,
  libboost-filesystem1.37-dev, libboost-thread1.37-dev, 
  libboost-iostreams1.37-dev, libboost-system1.37-dev, libboost-program-options1.37-dev

Modified: packages/trunk/pokerth/debian/copyright
===================================================================
--- packages/trunk/pokerth/debian/copyright	2009-04-19 17:54:43 UTC (rev 9632)
+++ packages/trunk/pokerth/debian/copyright	2009-04-19 18:13:59 UTC (rev 9633)
@@ -1,15 +1,14 @@
-This package was debianized by Mario Iseli <admin at marioiseli.com> on
-Tue, 19 Dec 2006 14:39:18 +0100.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=454
+Upstream-Name: PokerTH
+Upstream-Maintainer: Felix Hammer <f.hammer at web.de>,
+ Florian Thauer <f.thauer at web.de>, Lothar May <lotodore at pokerth.net>
+Upstream-Source: http://www.pokerth.net
 
-It was downloaded from <http://sourceforge.net/projects/pokerth/>
-
-Upstream Authors: Felix Hammer <f.hammer at web.de>
-		  Florian Thauer <f.thauer at web.de>
-		  Lothar May <lotodore at pokerth.net>
-
 Files: *
-Copyright: © 2006-2008 Felix Hammer <f.hammer at web.de>, Florian Thauer <f.thauer at web.de>
- 2007-2008 Lothar May <lotodore at pokerth.net>
+Copyright: © 2006-2009 Felix Hammer <f.hammer at web.de>
+Copyright: © 2006-2009 Florian Thauer <f.thauer at web.de>
+Copyright: © 2007-2008 Lothar May <lotodore at pokerth.net>
 License: GPL-2+
 
 Files: src/core/libircclient/*
@@ -156,6 +155,10 @@
  ef0975f38a367a45cb8042b438957304.png
   http://commons.wikimedia.org/wiki/Image:Napoleon_crop.jpg
 
+Files: data/gfx/gui/table/danuxi1/*
+Copyright: © 2009 Daniel Hammer
+License: GPL-2+
+
 Files: data/sounds/default/{yourturn,lobbychatnotify}.wav
 Copyright: © 2005-2006 by Olivier Goffart <ogoffart at kde.org>
 Licence: GPL-2+
@@ -174,12 +177,22 @@
  these sounds are recorded by doc_dos
 
 Files: debian/*
-Copyright: © 2006-2007 Mario Iseli <admin at marioiseli.com>,
- 2007-2008 Evgeni Golov <sargentd at die-welt.net>
+Copyright: © 2006-2007 Mario Iseli <admin at marioiseli.com>
+Copyright: © 2007-2009 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'.
+License: GPL-2+ | 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'.
+License: GPL-2
+ On Debian systems, the complete text of the GNU General
+ Public License v2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2+
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+License: BSD-3
+ On Debian systems, the complete text of the BSD Licence can be found
+ in `/usr/share/common-licenses/BSD'.

Modified: packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch	2009-04-19 17:54:43 UTC (rev 9632)
+++ packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch	2009-04-19 18:13:59 UTC (rev 9633)
@@ -2,10 +2,10 @@
 Description: Use DejaVu Sans instead of Bitstream Vera Sans
 License: GPL-2+
 
-Index: src/gui/qt/styles/gametablestylereader.cpp
+Index: pokerth/src/gui/qt/styles/gametablestylereader.cpp
 ===================================================================
---- src/gui/qt/styles/gametablestylereader.cpp	(revision 1887)
-+++ src/gui/qt/styles/gametablestylereader.cpp	(working copy)
+--- pokerth/src/gui/qt/styles/gametablestylereader.cpp	(revision 1887)
++++ pokerth/src/gui/qt/styles/gametablestylereader.cpp	(working copy)
 @@ -52,7 +52,7 @@
  		tabBarPaddingSide = "9";
  	#else 

Modified: packages/trunk/pokerth/debian/rules
===================================================================
--- packages/trunk/pokerth/debian/rules	2009-04-19 17:54:43 UTC (rev 9632)
+++ packages/trunk/pokerth/debian/rules	2009-04-19 18:13:59 UTC (rev 9633)
@@ -4,71 +4,32 @@
 
 include /usr/share/quilt/quilt.make
 
-configure: configure-stamp
-configure-stamp: patch
-	dh_testdir
-	qmake-qt4 pokerth.pro
-	touch configure-stamp
-
 build: build-stamp
 
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	# upstream tarball has wrong permissions
-	find data -type f -exec chmod 644 {} \;
-	chmod 644 pokerth.png
+build-stamp: $(QUILT_STAMPFN)
+	dh build --before dh_auto_configure
+	qmake-qt4 pokerth.pro
+	dh build --after dh_auto_configure
 	touch $@
 
 clean: clean-patched unpatch
 
 clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
+	dh clean
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+	dh install --before dh_auto_install
+	# Ideally we should call make install here:
+	# $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp
+	# but upstreams makefile does not work as intended here
+	dh install --after dh_auto_install
 
-binary-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -i -k
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_install -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+binary-indep: install
+	dh binary-indep
 
+binary-arch: install
+	dh binary-arch
 
-binary-arch: build
-	dh_testdir
-	dh_testroot
-	dh_clean -a -k
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installmenu -a
-	dh_installman -a
-	dh_installinit -a
-	dh_install -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: build clean clean-patched binary-indep binary-arch binary install


