r14609 - in packages/trunk/tuxracer-extras/debian: . patches source

Jackson Doak noskcaj-guest at alioth.debian.org
Sun Sep 22 01:16:56 UTC 2013


Author: noskcaj-guest
Date: 2013-09-22 01:16:56 +0000 (Sun, 22 Sep 2013)
New Revision: 14609

Added:
   packages/trunk/tuxracer-extras/debian/source/
   packages/trunk/tuxracer-extras/debian/source/format
Removed:
   packages/trunk/tuxracer-extras/debian/README.source
   packages/trunk/tuxracer-extras/debian/patches/00list
   packages/trunk/tuxracer-extras/debian/patches/10_GPL_hyperlinks.dpatch
   packages/trunk/tuxracer-extras/debian/patches/20_Korora_the_Penguin.dpatch
   packages/trunk/tuxracer-extras/debian/patches/30_Tom_Kocourek.dpatch
Modified:
   packages/trunk/tuxracer-extras/debian/changelog
   packages/trunk/tuxracer-extras/debian/compat
   packages/trunk/tuxracer-extras/debian/control
   packages/trunk/tuxracer-extras/debian/rules
Log:
Switch to debhelper 9, quilt, and dh

Deleted: packages/trunk/tuxracer-extras/debian/README.source
===================================================================
--- packages/trunk/tuxracer-extras/debian/README.source	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/README.source	2013-09-22 01:16:56 UTC (rev 14609)
@@ -1,4 +0,0 @@
-This package uses dpatch to add some patches.
-
-Please install dpatch and read /usr/share/doc/dpatch/README.source.gz for
-further information on how to add additional patches.

Modified: packages/trunk/tuxracer-extras/debian/changelog
===================================================================
--- packages/trunk/tuxracer-extras/debian/changelog	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/changelog	2013-09-22 01:16:56 UTC (rev 14609)
@@ -6,8 +6,21 @@
   [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Alexander Reichle-Schmehl <tolimar at debian.org>  Tue, 20 Jul 2010 11:31:50 +0200
+  [ Jackson Doak ]
+  * debian/rules: 
+    - Convert to dh
+    - Drop dpatch references
+  * debian/patches: Convert to quilt
+  * debian/control:
+    - Bump debhelper to 9
+    - Drop build-depends on dpatch
+    - Bump standards-version to 3.9.4
+  * debian/compat: Set as 9
+  * Delete debian/README.source, it's dpatch info
+  * Create debian/source/format
 
+ -- Jackson Doak <noskcaj at ubuntu.com>  Sun, 22 Sep 2013 10:56:39 +1000
+
 tuxracer-extras (0.6-1) unstable; urgency=low
 
   [ Cyril Brulebois ]

Modified: packages/trunk/tuxracer-extras/debian/compat
===================================================================
--- packages/trunk/tuxracer-extras/debian/compat	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/compat	2013-09-22 01:16:56 UTC (rev 14609)
@@ -1 +1 @@
-5
+9
\ No newline at end of file

Modified: packages/trunk/tuxracer-extras/debian/control
===================================================================
--- packages/trunk/tuxracer-extras/debian/control	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/control	2013-09-22 01:16:56 UTC (rev 14609)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Alexander Reichle-Schmehl <tolimar at debian.org>
-Build-Depends: debhelper (>= 6.0.7~), dpatch
-Standards-Version: 3.9.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/tuxracer-extras/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/tuxracer-extras/
 Homepage: http://tuxracer.fubaby.com/courses.php

Deleted: packages/trunk/tuxracer-extras/debian/patches/00list
===================================================================
--- packages/trunk/tuxracer-extras/debian/patches/00list	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/patches/00list	2013-09-22 01:16:56 UTC (rev 14609)
@@ -1,3 +0,0 @@
-10_GPL_hyperlinks
-20_Korora_the_Penguin
-30_Tom_Kocourek

Deleted: packages/trunk/tuxracer-extras/debian/patches/10_GPL_hyperlinks.dpatch
===================================================================
--- packages/trunk/tuxracer-extras/debian/patches/10_GPL_hyperlinks.dpatch	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/patches/10_GPL_hyperlinks.dpatch	2013-09-22 01:16:56 UTC (rev 14609)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_GPL.dpatch by Alexander Schmehl <alexander at schmehl.info>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replaces some Hyperlinks to local copies of the GPL to the one in /usr/share/common-licenses 
-
- at DPATCH@
-diff -urNad tuxracer-extras-0.5/doc/milos_castle/Milo's Castle.html /tmp/dpep.RCeg1f/tuxracer-extras-0.5/doc/milos_castle/Milo's Castle.html
---- tuxracer-extras-0.5/doc/milos_castle/Milo's Castle.html	2003-07-25 16:47:12.000000000 +0200
-+++ /tmp/dpep.RCeg1f/tuxracer-extras-0.5/doc/milos_castle/Milo's Castle.html	2005-03-28 00:28:00.445484664 +0200
-@@ -23,5 +23,5 @@
- 	<h3>Installation:</h3>
- 	<p>Extract the archive in the "/courses/contrib" directory. The “milos_castle” folder should now be there along with the other folders containing contributed courses. (For example, on win32 systems you should have the following path: C:\ Program Files\Tux Racer\courses\contrib\milos_castle). Now restart Tux Racer, and you're good to go.</p>
- 	<h3>License:</h3>
--	<p>This Tux Racer course may be freely distributed under the terms of the <a href="COPYING.txt">GNU General Public License</a>.
--</div>
-\ Kein Zeilenumbruch am Dateiende.
-+	<p>This Tux Racer course may be freely distributed under the terms of the <a href="file:///usr/share/common-licenses/GPL">GNU General Public License</a>.
-+</div>
-diff -urNad tuxracer-extras-0.5/doc/this_means_something/this_means_something.html /tmp/dpep.RCeg1f/tuxracer-extras-0.5/doc/this_means_something/this_means_something.html
---- tuxracer-extras-0.5/doc/this_means_something/this_means_something.html	2003-07-25 14:46:48.000000000 +0200
-+++ /tmp/dpep.RCeg1f/tuxracer-extras-0.5/doc/this_means_something/this_means_something.html	2005-03-28 00:28:27.422383552 +0200
-@@ -23,5 +23,5 @@
- 	<h3>Installation:</h3>
- 	<p>Extract the archive in the "/courses/contrib" directory. There should now be a folder called “this_means_something” along with the other folders containing contributed courses. (For example, on win32 systems you should have the following path: C:\ Program Files\Tux Racer\courses\contrib\this_means_something). Now restart Tux Racer, and you're good to go.</p>
- 	<h3>License:</h3>
--	<p>This Tux Racer course may be freely distributed under the terms of the <a href="COPYING.txt">GNU General Public License</a>.
--</div>
-\ Kein Zeilenumbruch am Dateiende.
-+	<p>This Tux Racer course may be freely distributed under the terms of the <a href="file:///usr/share/common-licenses/GPL">GNU General Public License</a>.
-+</div>

Deleted: packages/trunk/tuxracer-extras/debian/patches/20_Korora_the_Penguin.dpatch
===================================================================
--- packages/trunk/tuxracer-extras/debian/patches/20_Korora_the_Penguin.dpatch	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/patches/20_Korora_the_Penguin.dpatch	2013-09-22 01:16:56 UTC (rev 14609)
@@ -1,121 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_Korora_the_Penguin.dpatch by Alexander Schmehl <alexander at schmehl.info>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Korora has a underscore "_" in his e-mail adress which can't be displayed by tuxracer causing tuxracer flooding the console with warning messages.  This patch replaces them by "<underscore>" (better solutions are welcome).
-
- at DPATCH@
-diff -urNad tuxracer-extras-0.5/courses/follow_white_rabbit/course.tcl /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/follow_white_rabbit/course.tcl
---- tuxracer-extras-0.5/courses/follow_white_rabbit/course.tcl	2005-03-27 23:31:23.363919560 +0200
-+++ /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/follow_white_rabbit/course.tcl	2005-03-28 00:06:13.515168272 +0200
-@@ -3,7 +3,7 @@
- #
- 
- tux_course_name "Follow the White Rabbit"
--tux_course_author "Korora the Penguin <korora_penguin at yahoo.com> The Matrix has you.  To get out, watch out for Agents(the first turnoff on your right) and do NOT take any blue pills(herring, found in the first two turnoffs on the left)."
-+tux_course_author "Korora the Penguin <korora<underscore>penguin at yahoo.com> The Matrix has you.  To get out, watch out for Agents(the first turnoff on your right) and do NOT take any blue pills(herring, found in the first two turnoffs on the left)."
- tux_course_dim 128 625
- tux_start_pt 80 0
- tux_angle 30
-@@ -14,4 +14,4 @@
- tux_elev elev.rgb
- tux_terrain terrain.rgb
- 
--tux_course_init
-\ Kein Zeilenumbruch am Dateiende.
-+tux_course_init
-diff -urNad tuxracer-extras-0.5/courses/i_like_spike2/course.tcl /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/i_like_spike2/course.tcl
---- tuxracer-extras-0.5/courses/i_like_spike2/course.tcl	2005-03-27 23:31:23.338923360 +0200
-+++ /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/i_like_spike2/course.tcl	2005-03-28 00:06:23.025722448 +0200
-@@ -3,7 +3,7 @@
- #
- 
- tux_course_name "I Like Spike 2"
--tux_course_author "Korora the Penguin <korora_penguin at yahoo.com>"
-+tux_course_author "Korora the Penguin <korora<underscore>penguin at yahoo.com>"
- tux_course_dim 128 640
- tux_start_pt 64 0
- tux_angle 30
-@@ -14,4 +14,4 @@
- tux_elev elev.rgb
- tux_terrain terrain.rgb
- 
--tux_course_init
-\ Kein Zeilenumbruch am Dateiende.
-+tux_course_init
-diff -urNad tuxracer-extras-0.5/courses/inception/course.tcl /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/inception/course.tcl
---- tuxracer-extras-0.5/courses/inception/course.tcl	2005-03-27 23:31:23.312927312 +0200
-+++ /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/inception/course.tcl	2005-03-28 00:06:32.050350496 +0200
-@@ -2,7 +2,7 @@
- # course configuration
- #
- tux_course_name "Inception"
--tux_course_author "Korora the Penguin <korora_penguin at yahoo.com>"
-+tux_course_author "Korora the Penguin <korora<underscore>penguin at yahoo.com>"
- tux_course_dim 250 1000
- tux_start_pt 116 8
- tux_angle 60
-@@ -11,4 +11,4 @@
- tux_elev elev.rgb
- tux_terrain terrain.rgb
- 
--tux_course_init
-\ Kein Zeilenumbruch am Dateiende.
-+tux_course_init
-diff -urNad tuxracer-extras-0.5/courses/penguins_day/course.tcl /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/penguins_day/course.tcl
---- tuxracer-extras-0.5/courses/penguins_day/course.tcl	2005-03-27 23:31:23.286931264 +0200
-+++ /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/penguins_day/course.tcl	2005-03-28 00:06:41.110973072 +0200
-@@ -3,7 +3,7 @@
- #
- 
- tux_course_name "Penguin's Day"
--tux_course_author "Korora the Penguin <korora_penguin at yahoo.com>"
-+tux_course_author "Korora the Penguin <korora<underscore>penguin at yahoo.com>"
- tux_course_dim 500 500
- tux_start_pt 250 1
- tux_angle 30
-@@ -13,4 +13,4 @@
- tux_elev elev.rgb
- tux_terrain terrain.rgb
- 
--tux_course_init
-\ Kein Zeilenumbruch am Dateiende.
-+tux_course_init
-diff -urNad tuxracer-extras-0.5/courses/pygoscelis_adeliae/course.tcl /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/pygoscelis_adeliae/course.tcl
---- tuxracer-extras-0.5/courses/pygoscelis_adeliae/course.tcl	2005-03-27 23:31:23.261935064 +0200
-+++ /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/pygoscelis_adeliae/course.tcl	2005-03-28 00:06:49.951629088 +0200
-@@ -2,7 +2,7 @@
- #
- 
- tux_course_name "Pygoscelis adeliae"
--tux_course_author "Korora the Penguin <korora_penguin at yahoo.com>"
-+tux_course_author "Korora the Penguin <korora<underscore>penguin at yahoo.com>"
- tux_course_dim 64 1024
- tux_start_pt 29 0
- tux_angle 36
-@@ -13,4 +13,4 @@
- tux_elev elev.rgb
- tux_terrain terrain.rgb
- 
--tux_course_init
-\ Kein Zeilenumbruch am Dateiende.
-+tux_course_init
-diff -urNad tuxracer-extras-0.5/courses/slide_or_fly/course.tcl /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/slide_or_fly/course.tcl
---- tuxracer-extras-0.5/courses/slide_or_fly/course.tcl	2005-03-27 23:31:23.235939016 +0200
-+++ /tmp/dpep.v01Ur0/tuxracer-extras-0.5/courses/slide_or_fly/course.tcl	2005-03-28 00:06:03.258727488 +0200
-@@ -3,7 +3,7 @@
- #
- 
- tux_course_name "Slide or Fly"
--tux_course_author "Korora the Penguin <korora_penguin at yahoo.com>"
-+tux_course_author "Korora the Penguin <korora<underscore>penguin at yahoo.com>"
- tux_course_dim 128 512
- tux_start_pt 60 0
- tux_angle 20
-@@ -14,4 +14,4 @@
- tux_elev elev.rgb
- tux_terrain terrain.rgb
- 
--tux_course_init
-\ Kein Zeilenumbruch am Dateiende.
-+tux_course_init

Deleted: packages/trunk/tuxracer-extras/debian/patches/30_Tom_Kocourek.dpatch
===================================================================
--- packages/trunk/tuxracer-extras/debian/patches/30_Tom_Kocourek.dpatch	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/patches/30_Tom_Kocourek.dpatch	2013-09-22 01:16:56 UTC (rev 14609)
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_Tom_Kocourek.dpatch by Alexander Schmehl <alexander at schmehl.info>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removing some unnecessary (and strange looking) "<" and ">" characters from Tom Kocoureks courses.
-
- at DPATCH@
-diff -urNad tuxracer-extras-0.5/courses/snow_run_1/course.tcl /tmp/dpep.EwM8F4/tuxracer-extras-0.5/courses/snow_run_1/course.tcl
---- tuxracer-extras-0.5/courses/snow_run_1/course.tcl	2001-08-05 14:41:19.000000000 +0200
-+++ /tmp/dpep.EwM8F4/tuxracer-extras-0.5/courses/snow_run_1/course.tcl	2005-03-28 00:33:37.230285592 +0200
-@@ -2,7 +2,7 @@
- # Course configuration
- #
- tux_course_name "Snow Run 1"
--tux_course_author ">Tom Kocourek <tko at atempest.net> Snow Boarding at it best! Put the brakes on for the fish or Go all out and try to stay on course."
-+tux_course_author "Tom Kocourek <tko at atempest.net> Snow Boarding at it best! Put the brakes on for the fish or Go all out and try to stay on course."
- tux_course_dim 250 2000 240 1990  ;# width, length of course in m
- tux_start_pt 125 6           ;# start position, measured from left rear corner
- tux_angle  45                  ;# angle of course
-diff -urNad tuxracer-extras-0.5/courses/snow_run_2/course.tcl /tmp/dpep.EwM8F4/tuxracer-extras-0.5/courses/snow_run_2/course.tcl
---- tuxracer-extras-0.5/courses/snow_run_2/course.tcl	2001-08-11 10:40:36.000000000 +0200
-+++ /tmp/dpep.EwM8F4/tuxracer-extras-0.5/courses/snow_run_2/course.tcl	2005-03-28 00:33:46.155928688 +0200
-@@ -2,7 +2,7 @@
- # Course configuration
- #
- tux_course_name "Snow Run 2"
--tux_course_author ">Tom Kocourek <tko at atempest.net> Try to sled your way down this course."
-+tux_course_author "Tom Kocourek <tko at atempest.net> Try to sled your way down this course."
- tux_course_dim 200 1500 190 1490  ;# width, length of course in m
- tux_start_pt 104 6           ;# start position, measured from left rear corner
- tux_angle  30                  ;# angle of course
-diff -urNad tuxracer-extras-0.5/courses/wild_ride/course.tcl /tmp/dpep.EwM8F4/tuxracer-extras-0.5/courses/wild_ride/course.tcl
---- tuxracer-extras-0.5/courses/wild_ride/course.tcl	2001-08-05 03:51:24.000000000 +0200
-+++ /tmp/dpep.EwM8F4/tuxracer-extras-0.5/courses/wild_ride/course.tcl	2005-03-28 00:33:18.639111880 +0200
-@@ -2,7 +2,7 @@
- # Course configuration
- #
- tux_course_name "Tux's Wild Ride "
--tux_course_author "<Tom Kocourek <tko at atempest.net>"
-+tux_course_author "Tom Kocourek <tko at atempest.net>"
- tux_course_dim 100 1000 90 990 ;# width, length of course in m
- tux_start_pt 50 6           ;# start position, measured from left rear corner
- tux_angle  30                  ;# angle of course

Modified: packages/trunk/tuxracer-extras/debian/rules
===================================================================
--- packages/trunk/tuxracer-extras/debian/rules	2013-09-21 23:05:03 UTC (rev 14608)
+++ packages/trunk/tuxracer-extras/debian/rules	2013-09-22 01:16:56 UTC (rev 14609)
@@ -1,53 +1,10 @@
 #!/usr/bin/make -f
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	touch build-stamp
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	dh_clean
+%:
+	dh $@ 
 
-install: patch build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install -i --exclude *.xcf courses/* /usr/share/games/extremetuxracer/courses/contrib/
-#dh_install -i cups/* /usr/share/games/ppracer/
-
-# Add stuff for dpatch
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	#dpatch call-all -a=pkg-info >patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs --exclude=COPYING.txt doc/*
-	dh_lintian
-	dh_installchangelogs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_install:
+	dh_install --exclude *.xcf courses/* /usr/share/games/extremetuxracer/courses/contrib/
\ No newline at end of file

Added: packages/trunk/tuxracer-extras/debian/source/format
===================================================================
--- packages/trunk/tuxracer-extras/debian/source/format	                        (rev 0)
+++ packages/trunk/tuxracer-extras/debian/source/format	2013-09-22 01:16:56 UTC (rev 14609)
@@ -0,0 +1 @@
+3.0 (quilt)
\ No newline at end of file




More information about the Pkg-games-commits mailing list