r11168 - in packages/trunk/pokerth/debian: . patches source

Evgeni Golov evgeni at alioth.debian.org
Tue Jul 27 00:11:52 UTC 2010


Author: evgeni
Date: 2010-07-27 00:11:51 +0000 (Tue, 27 Jul 2010)
New Revision: 11168

Added:
   packages/trunk/pokerth/debian/source/
   packages/trunk/pokerth/debian/source/format
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/01_clean_libpokerth.patch
   packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
   packages/trunk/pokerth/debian/rules
Log:
0.8~beta1 with bells (3.0/quilt/orig.tar.bz2) and whistles (dh7 rules.tiny)


Property changes on: packages/trunk/pokerth/debian
___________________________________________________________________
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/pokerth_0.7.1.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/pokerth_0.8~beta1.orig.tar.bz2

Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2010-07-26 20:02:28 UTC (rev 11167)
+++ packages/trunk/pokerth/debian/changelog	2010-07-27 00:11:51 UTC (rev 11168)
@@ -1,3 +1,20 @@
+pokerth (0.8~beta1-1) unstable; urgency=low
+
+  * New upstream beta release.
+  * Use format 3.0 (quilt) and upstream's .tar.bz2 as orig.tar.
+  * debian/{control,rules}:
+    + Don't use quilt directly.
+    + Use dh7 style tiny rules, depend on debhelper >= 7.0.50~
+  * debian/control:
+    + Add B-D on libgsasl7-dev.
+    + Standards-Version: 3.9.1
+  * debian/patches/*:
+    + Refresh against new upstream.
+  * debian/copyright:
+    + Quote BSD license, thanks lintian.
+
+ -- Evgeni Golov <evgeni at debian.org>  Tue, 27 Jul 2010 02:03:36 +0200
+
 pokerth (0.7.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/pokerth/debian/control
===================================================================
--- packages/trunk/pokerth/debian/control	2010-07-26 20:02:28 UTC (rev 11167)
+++ packages/trunk/pokerth/debian/control	2010-07-27 00:11:51 UTC (rev 11168)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Mario Iseli <admin at marioiseli.com>, Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7), quilt (>= 0.40), libqt4-dev,
+Build-Depends: debhelper (>= 7.0.50~), libqt4-dev, libgsasl7-dev,
  libsdl-mixer1.2-dev, libcurl4-gnutls-dev, libgnutls-dev,
  libboost-filesystem-dev (>= 1.36.0), libboost-thread-dev (>= 1.36.0),
  libboost-iostreams-dev (>= 1.36.0), libboost-system-dev (>= 1.36.0),
  libboost-program-options-dev (>= 1.36.0)
-Standards-Version: 3.8.2
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pokerth/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pokerth/
 Homepage: http://www.pokerth.net/

Modified: packages/trunk/pokerth/debian/copyright
===================================================================
--- packages/trunk/pokerth/debian/copyright	2010-07-26 20:02:28 UTC (rev 11167)
+++ packages/trunk/pokerth/debian/copyright	2010-07-27 00:11:51 UTC (rev 11168)
@@ -238,5 +238,26 @@
  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'.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+.
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.

Modified: packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch	2010-07-26 20:02:28 UTC (rev 11167)
+++ packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch	2010-07-27 00:11:51 UTC (rev 11168)
@@ -1,9 +1,11 @@
 Author: Evgeni Golov <sargentd at die-welt.net>
 Description: Adds a quirk to correctly clean libpokerth
---- pokerth-0.6.2.orig/pokerth_lib.pro
-+++ pokerth-0.6.2/pokerth_lib.pro
-@@ -8,6 +8,7 @@
- 
+Index: pokerth/pokerth_lib.pro
+===================================================================
+--- pokerth.orig/pokerth_lib.pro	2010-07-26 08:27:11.000000000 +0200
++++ pokerth/pokerth_lib.pro	2010-07-26 16:15:15.458929422 +0200
+@@ -6,6 +6,7 @@
+ CONFIG += staticlib thread exceptions rtti stl warn_on
  UI_DIR = uics
  TARGET = lib/pokerth_lib
 +QMAKE_CLEAN += ./lib/libpokerth_lib.a

Modified: packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch	2010-07-26 20:02:28 UTC (rev 11167)
+++ packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch	2010-07-27 00:11:51 UTC (rev 11168)
@@ -4,14 +4,14 @@
 
 Index: pokerth/src/gui/qt/styles/gametablestylereader.cpp
 ===================================================================
---- 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 
- 		font1String = "font-family: \"Nimbus Sans L\";";
--		font2String = "font-family: \"Bitstream Vera Sans\";";
-+		font2String = "font-family: \"DejaVu Sans\";";
+--- pokerth.orig/src/gui/qt/styles/gametablestylereader.cpp	2010-07-26 08:27:09.000000000 +0200
++++ pokerth/src/gui/qt/styles/gametablestylereader.cpp	2010-07-26 16:20:05.387430388 +0200
+@@ -51,7 +51,7 @@
+     tabBarPaddingSide = "9";
+ #else
+     font1String = "font-family: \"Nimbus Sans L\";";
+-    font2String = "font-family: \"Bitstream Vera Sans\";";
++    font2String = "font-family: \"DejaVu Sans\";";
  
- 		tabBarPaddingTop = "0";
- 		tabBarPaddingSide = "9";
+     tabBarPaddingTop = "0";
+     tabBarPaddingSide = "9";

Modified: packages/trunk/pokerth/debian/rules
===================================================================
--- packages/trunk/pokerth/debian/rules	2010-07-26 20:02:28 UTC (rev 11167)
+++ packages/trunk/pokerth/debian/rules	2010-07-27 00:11:51 UTC (rev 11168)
@@ -2,36 +2,15 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
+%:
+	dh $@
 
-build: build-stamp
-
-build-stamp: $(QUILT_STAMPFN)
-	dh build --before dh_auto_configure
+override_dh_auto_configure:
 	qmake-qt4 pokerth.pro
-	dh build --after dh_auto_configure
 	# upstream tarball has wrong permissions
 	find data -type f -exec chmod 644 {} \;
-	touch $@
 
-clean: clean-patched unpatch
-
-clean-patched:
-	dh clean
-
-install: build
-	dh install --before dh_auto_install
+override_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: install
-	dh binary-indep
-
-binary-arch: install
-	dh binary-arch
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean clean-patched binary-indep binary-arch binary install

Added: packages/trunk/pokerth/debian/source/format
===================================================================
--- packages/trunk/pokerth/debian/source/format	                        (rev 0)
+++ packages/trunk/pokerth/debian/source/format	2010-07-27 00:11:51 UTC (rev 11168)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the Pkg-games-commits mailing list