r11440 - in packages/trunk/between/debian: . patches source

Paul Wise pabs at alioth.debian.org
Sat Oct 30 11:45:00 UTC 2010


Author: pabs
Date: 2010-10-30 11:44:59 +0000 (Sat, 30 Oct 2010)
New Revision: 11440

Added:
   packages/trunk/between/debian/Between.6
   packages/trunk/between/debian/links
   packages/trunk/between/debian/manpages
   packages/trunk/between/debian/source/
   packages/trunk/between/debian/source/format
Removed:
   packages/trunk/between/debian/README.Debian
   packages/trunk/between/debian/README.source
   packages/trunk/between/debian/between.6
   packages/trunk/between/debian/between.xpm
   packages/trunk/between/debian/docs
Modified:
   packages/trunk/between/debian/between.desktop
   packages/trunk/between/debian/control
   packages/trunk/between/debian/install
   packages/trunk/between/debian/menu
   packages/trunk/between/debian/patches/abs_path.patch
   packages/trunk/between/debian/rules
Log:
update packaging

Copied: packages/trunk/between/debian/Between.6 (from rev 11407, packages/trunk/between/debian/between.6)
===================================================================
--- packages/trunk/between/debian/Between.6	                        (rev 0)
+++ packages/trunk/between/debian/Between.6	2010-10-30 11:44:59 UTC (rev 11440)
@@ -0,0 +1,30 @@
+.\" Placed in the public domain by Paul Wise <pabs at debian.org>
+.\" Forwarded to 
+.TH "between" "6" "March 2008" "" "Games"
+.SH "NAME"
+between \- a game about consciousness and isolation
+.SH "SYNOPSIS"
+.B between
+.SH "DESCRIPTION"
+Between is a video game written by Jason Rohrer about consciousness and isolation
+.PP
+Between is an art game. 
+.PP
+.PP
+.SH "USAGE"
+Gravitation has no command-line options.
+.PP
+The left and right arrow keys move left and right.
+.PP
+The spacebar is used to place or grab blocks.
+.PP
+The b/n keys are used to change the colour of the placed blocks.
+.PP
+The s/w keys are used to sleep/wake the player.
+.PP
+The Esc key is used to quit the game.
+.PP
+The game resolution and use of fullscreen or a window
+can be set by editing the files in /etc/between.
+.SH "SEE ALSO"
+The website: http://www.esquire.com/features/best-and-brightest-2008/rohrer-game

Deleted: packages/trunk/between/debian/README.Debian
===================================================================
--- packages/trunk/between/debian/README.Debian	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/README.Debian	2010-10-30 11:44:59 UTC (rev 11440)
@@ -1,7 +0,0 @@
-between for Debian
-----------------------
-
-Some unused non-free code has been removed from the original tarball, without
-affecting the functionality of the game in any way.
-
- -- Paul Wise <pabs at debian.org>  Wed, 19 Mar 2008 15:20:53 +0900

Deleted: packages/trunk/between/debian/README.source
===================================================================
--- packages/trunk/between/debian/README.source	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/README.source	2010-10-30 11:44:59 UTC (rev 11440)
@@ -1,2 +0,0 @@
-This package uses quilt for patch management, for more information see
-the file /usr/share/doc/quilt/README.source in the quilt package.

Deleted: packages/trunk/between/debian/between.6
===================================================================
--- packages/trunk/between/debian/between.6	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/between.6	2010-10-30 11:44:59 UTC (rev 11440)
@@ -1,30 +0,0 @@
-.\" Placed in the public domain by Paul Wise <pabs at debian.org>
-.\" Forwarded to 
-.TH "between" "6" "March 2008" "" "Games"
-.SH "NAME"
-between \- a game about consciousness and isolation
-.SH "SYNOPSIS"
-.B between
-.SH "DESCRIPTION"
-Between is a video game written by Jason Rohrer about consciousness and isolation
-.PP
-Between is an art game. 
-.PP
-.PP
-.SH "USAGE"
-Gravitation has no command-line options.
-.PP
-The left and right arrow keys move left and right.
-.PP
-The spacebar is used to place or grab blocks.
-.PP
-The b/n keys are used to change the colour of the placed blocks.
-.PP
-The s/w keys are used to sleep/wake the player.
-.PP
-The Esc key is used to quit the game.
-.PP
-The game resolution and use of fullscreen or a window
-can be set by editing the files in /etc/between.
-.SH "SEE ALSO"
-The website: http://www.esquire.com/features/best-and-brightest-2008/rohrer-game

Modified: packages/trunk/between/debian/between.desktop
===================================================================
--- packages/trunk/between/debian/between.desktop	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/between.desktop	2010-10-30 11:44:59 UTC (rev 11440)
@@ -2,6 +2,8 @@
 [Desktop Entry]
 Type=Application
 Name=Between
+GenericName=Consciousness game
+Comment=game about consciousness and isolation
 Icon=between
 Exec=between
 Terminal=false

Deleted: packages/trunk/between/debian/between.xpm
===================================================================
--- packages/trunk/between/debian/between.xpm	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/between.xpm	2010-10-30 11:44:59 UTC (rev 11440)
@@ -1,183 +0,0 @@
-/* XPM */
-/* Converted from game7/build/win32/icon.ico */
-static char * between_xpm[] = {
-"32 32 147 2",
-"  	c None",
-". 	c #008F00",
-"+ 	c #00A200",
-"@ 	c #00A700",
-"# 	c #009E00",
-"$ 	c #00A400",
-"% 	c #A20000",
-"& 	c #A50000",
-"* 	c #830000",
-"= 	c #7A0000",
-"- 	c #006400",
-"; 	c #00DA00",
-"> 	c #00DE00",
-", 	c #009600",
-"' 	c #009B00",
-") 	c #00CE00",
-"! 	c #00C900",
-"~ 	c #D00000",
-"{ 	c #E20000",
-"] 	c #930000",
-"^ 	c #A70000",
-"/ 	c #9E0000",
-"( 	c #DF0000",
-"_ 	c #B30000",
-": 	c #470000",
-"< 	c #006100",
-"[ 	c #00D200",
-"} 	c #00DC00",
-"| 	c #00CF00",
-"1 	c #00CC00",
-"2 	c #00B600",
-"3 	c #00C400",
-"4 	c #E40000",
-"5 	c #D80000",
-"6 	c #DD0000",
-"7 	c #E60000",
-"8 	c #E50000",
-"9 	c #E90000",
-"0 	c #5E0000",
-"a 	c #005A00",
-"b 	c #00D400",
-"c 	c #00BB00",
-"d 	c #00AC00",
-"e 	c #00D700",
-"f 	c #00CD00",
-"g 	c #00C500",
-"h 	c #00D900",
-"i 	c #F30000",
-"j 	c #EA0000",
-"k 	c #CF0000",
-"l 	c #C10000",
-"m 	c #C20000",
-"n 	c #E10000",
-"o 	c #570000",
-"p 	c #006200",
-"q 	c #00EB00",
-"r 	c #00E300",
-"s 	c #00C200",
-"t 	c #00CB00",
-"u 	c #00E200",
-"v 	c #00E600",
-"w 	c #00E700",
-"x 	c #F10000",
-"y 	c #CC0000",
-"z 	c #AF0000",
-"A 	c #DA0000",
-"B 	c #D60000",
-"C 	c #C90000",
-"D 	c #5B0000",
-"E 	c #00EF00",
-"F 	c #00ED00",
-"G 	c #DB0000",
-"H 	c #B50000",
-"I 	c #D90000",
-"J 	c #D70000",
-"K 	c #550000",
-"L 	c #006700",
-"M 	c #00E400",
-"N 	c #00D100",
-"O 	c #00DD00",
-"P 	c #ED0000",
-"Q 	c #EE0000",
-"R 	c #630000",
-"S 	c #006500",
-"T 	c #00D600",
-"U 	c #00F700",
-"V 	c #00B800",
-"W 	c #00D000",
-"X 	c #DC0000",
-"Y 	c #F50000",
-"Z 	c #5D0000",
-"` 	c #005900",
-" .	c #00E900",
-"..	c #00F400",
-"+.	c #EC0000",
-"@.	c #FB0000",
-"#.	c #C50000",
-"$.	c #C60000",
-"%.	c #BA0000",
-"&.	c #006000",
-"*.	c #00C700",
-"=.	c #00C800",
-"-.	c #00F100",
-";.	c #CD0000",
-">.	c #DE0000",
-",.	c #D40000",
-"'.	c #BC0000",
-").	c #00C100",
-"!.	c #00E100",
-"~.	c #00F800",
-"{.	c #00F500",
-"].	c #D30000",
-"^.	c #B60000",
-"/.	c #C70000",
-"(.	c #670000",
-"_.	c #006300",
-":.	c #00EC00",
-"<.	c #E00000",
-"[.	c #F90000",
-"}.	c #660000",
-"|.	c #00EA00",
-"1.	c #00EE00",
-"2.	c #00D800",
-"3.	c #E70000",
-"4.	c #EF0000",
-"5.	c #B80000",
-"6.	c #680000",
-"7.	c #005500",
-"8.	c #00D300",
-"9.	c #00E800",
-"0.	c #00F200",
-"a.	c #510000",
-"b.	c #003200",
-"c.	c #003B00",
-"d.	c #F00000",
-"e.	c #F70000",
-"f.	c #400000",
-"g.	c #3F0000",
-"h.	c #4B0000",
-"i.	c #003D00",
-"j.	c #003E00",
-"k.	c #004400",
-"l.	c #003A00",
-"m.	c #003900",
-"n.	c #3D0000",
-"o.	c #450000",
-"p.	c #420000",
-"    . . + +         @ @ # # $ $ % % & &             * * = =     ",
-"    . . + +         @ @ # # $ $ % % & &             * * = =     ",
-"- - ; ; > > , , ' ' ) ) ) ) ! ! ~ ~ { { ] ] ^ ^ / / ( ( _ _ : : ",
-"- - ; ; > > , , ' ' ) ) ) ) ! ! ~ ~ { { ] ] ^ ^ / / ( ( _ _ : : ",
-"< < [ [ } } | | ; ; 1 1 2 2 3 3 4 4 5 5 6 6 7 7 ~ ~ 8 8 9 9 0 0 ",
-"< < [ [ } } | | ; ; 1 1 2 2 3 3 4 4 5 5 6 6 7 7 ~ ~ 8 8 9 9 0 0 ",
-"a a b b c c d d e e f f g g h h i i j j ( ( k k l l m m n n o o ",
-"a a b b c c d d e e f f g g h h i i j j ( ( k k l l m m n n o o ",
-"p p q q r r s s t t u u v v w w x x y y z z A A B B C C D D     ",
-"p p q q r r s s t t u u v v w w x x y y z z A A B B C C D D     ",
-"    a a E E > > e e t t b b F F x x G G H H I I J J _ _ K K     ",
-"    a a E E > > e e t t b b F F x x G G H H I I J J _ _ K K     ",
-"    L L E E M M q q N N h h O O k k y y y y P P Q Q 9 9 R R     ",
-"    L L E E M M q q N N h h O O k k y y y y P P Q Q 9 9 R R     ",
-"    S S T T u u U U v v V V W W X X Q Q Y Y i i B B 7 7 X X Z Z ",
-"    S S T T u u U U v v V V W W X X Q Q Y Y i i B B 7 7 X X Z Z ",
-"` ` > > h h  . .........e e } } G G +.+. at .@.Q Q #.#.$.$.%.%.o o ",
-"` ` > > h h  . .........e e } } G G +.+. at .@.Q Q #.#.$.$.%.%.o o ",
-"    &.&.*.*.=.=.[ [ -.-. . . . .;.;.#.#.>.>.,.,.'.'.6 6 ;.;.D D ",
-"    &.&.*.*.=.=.[ [ -.-. . . . .;.;.#.#.>.>.,.,.'.'.6 6 ;.;.D D ",
-"    ` ` ).).T T !.!.~.~.{.{.!.!.( ( ].].^.^.l l /./.x x Y Y (.(.",
-"    ` ` ).).T T !.!.~.~.{.{.!.!.( ( ].].^.^.l l /./.x x Y Y (.(.",
-"    _._.[ [ :.:.~.~.~.~.:.:.! ! %.%.l l <.<.{ { B B Q Q [.[.}.}.",
-"    _._.[ [ :.:.~.~.~.~.:.:.! ! %.%.l l <.<.{ { B B Q Q [.[.}.}.",
-"- - |.|.1.1.w w F F !.!.b b 2.2.A A 3.3.4.4.~ ~ 5.5.k k j j 6.6.",
-"- - |.|.1.1.w w F F !.!.b b 2.2.A A 3.3.4.4.~ ~ 5.5.k k j j 6.6.",
-"7.7.F F {.{.8.8.f f > > 9.9.0.0.i i { { 3.3.3.3.y y X X a.a.    ",
-"7.7.F F {.{.8.8.f f > > 9.9.0.0.i i { { 3.3.3.3.y y X X a.a.    ",
-"    :.:. . .b.b.c.c.|.|.N N O O Q Q ].].d.d.e.e.f.f.g.g.h.h.    ",
-"    :.:. . .b.b.c.c.|.|.N N O O Q Q ].].d.d.e.e.f.f.g.g.h.h.    ",
-"    i.i.j.j.        k.k.l.l.m.m.f.f.n.n.o.o.p.p.                ",
-"    i.i.j.j.        k.k.l.l.m.m.f.f.n.n.o.o.p.p.                "};

Modified: packages/trunk/between/debian/control
===================================================================
--- packages/trunk/between/debian/control	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/control	2010-10-30 11:44:59 UTC (rev 11440)
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org> 
 Uploaders: Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 7), quilt, libsdl1.2-dev
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 7.0.50~), imagemagick, libsdl1.2-dev
+Standards-Version: 3.9.1
 Homepage: http://www.esquire.com/features/best-and-brightest-2008/rohrer-game
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/between/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/between/?op=log

Modified: packages/trunk/between/debian/install
===================================================================
--- packages/trunk/between/debian/install	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/install	2010-10-30 11:44:59 UTC (rev 11440)
@@ -1,6 +1,5 @@
-game7/gameSource/between usr/games
+game7/gameSource/Between usr/games
 game7/gameSource/graphics usr/share/games/between
 game7/gameSource/music usr/share/games/between
 game7/gameSource/settings/* etc/between
-debian/*.xpm usr/share/pixmaps
 debian/*.desktop usr/share/applications

Added: packages/trunk/between/debian/links
===================================================================
--- packages/trunk/between/debian/links	                        (rev 0)
+++ packages/trunk/between/debian/links	2010-10-30 11:44:59 UTC (rev 11440)
@@ -0,0 +1 @@
+usr/games/Between usr/games/between

Added: packages/trunk/between/debian/manpages
===================================================================
--- packages/trunk/between/debian/manpages	                        (rev 0)
+++ packages/trunk/between/debian/manpages	2010-10-30 11:44:59 UTC (rev 11440)
@@ -0,0 +1,2 @@
+debian/Between.6
+debian/between.6
\ No newline at end of file

Modified: packages/trunk/between/debian/menu
===================================================================
--- packages/trunk/between/debian/menu	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/menu	2010-10-30 11:44:59 UTC (rev 11440)
@@ -1,3 +1,6 @@
-?package(between):needs="X11" section="Games/Adventure"\
-  title="Between" command="/usr/games/between" \
+?package(between):needs="X11" \
+  section="Games/Adventure"\
+  title="Between" \
+  longtitle="game about consciousness and isolation" \
+  command="/usr/games/between" \
   icon="/usr/share/pixmaps/between.xpm"

Modified: packages/trunk/between/debian/patches/abs_path.patch
===================================================================
--- packages/trunk/between/debian/patches/abs_path.patch	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/patches/abs_path.patch	2010-10-30 11:44:59 UTC (rev 11440)
@@ -1,8 +1,6 @@
-abs_path.patch
-Paul Wise <pabs at debian.org>
-Placed in the Public Domain
-Use absolute paths to the installed data files.
-Forwarded to http://sf.net/support/tracker.php?aid=2672133
+Description: Use absolute paths to the installed data files.
+Author: Paul Wise <pabs at debian.org>
+Bug: http://sf.net/support/tracker.php?aid=2672133
 --- a/game7/gameSource/common.cpp
 +++ b/game7/gameSource/common.cpp
 @@ -12,7 +12,7 @@

Modified: packages/trunk/between/debian/rules
===================================================================
--- packages/trunk/between/debian/rules	2010-10-30 11:11:03 UTC (rev 11439)
+++ packages/trunk/between/debian/rules	2010-10-30 11:44:59 UTC (rev 11440)
@@ -1,94 +1,42 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh --parallel $@
 
-include /usr/share/quilt/quilt.make
-
-CFLAGS = -Wall -g
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
+override_dh_auto_configure:
 	chmod u+x game7/configure
 	cd game7 && platformSelection=1 ./configure
-	touch $@
 
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
+override_dh_auto_build:
+	#mkdir 256x256 64x64 32x32
+	#convert -scale 256x256 game7/gameSource/iPhone/LargeIcon.png 256x256/between.png
+	#convert -background None -gravity center -extent 64x64 game7/gameSource/iPhone/Icon.png 64x64/between.png
+	#convert -type Grayscale -negate game7/build/macOSX/iconMask.png mask.png
+	#composite -compose CopyOpacity mask.png game7/build/macOSX/iconColor.png between.png
+	#convert -scale 32x32 between.png 32x32/between.png 
+	#convert 32x32/between.png 32x32/between.xpm
 	$(MAKE) -C game7/gameSource PLATFORM_COMPILE_FLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/between\\\" -DDATADIR=\\\"/usr/share/games/between/\\\""
-	mv game7/gameSource/Between game7/gameSource/between
-	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -f `find game7 -name "*.o"`
-	rm -f `find minorGems -name "*.o"`
-	rm -f game7/gameSource/Between
-	rm -f game7/gameSource/between
-	rm -f game7/gameSource/Makefile.minorGems_dependencies
-	rm -f game7/gameSource/Makefile.dependencies.temp
-	rm -f game7/gameSource/Makefile.dependencies
+override_dh_auto_clean:
+	[ ! -f game7/gameSource/Makefile ] || $(MAKE) -C game7/gameSource clean
 	rm -f game7/gameSource/Makefile
-	dh_clean 
+	rm -f game7/gameSource/Makefile.minorGems_dependencies
+	#rm -rf 256x256 64x64 32x32 between.png mask.png
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
+override_dh_installchangelogs:
 	dh_installchangelogs game7/documentation/changeLog.txt
-	dh_installdocs
-	dh_install
-	dh_installmenu
-	dh_installman debian/between.6
-	dh_icons
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-get-orig-source:
-	dh_testdir
-	dh_testroot
-	wget http://downloads.sourceforge.net/hcsoftware/Between_v5_UnixSource.tar.gz
-	tar xvfz Between_v5_UnixSource.tar.gz
-	# The first is removed because we are repacking the tarball
-	# The rest are removed because they are non-free and not needed
-	cd Between_v5_UnixSource && rm -rf \
-		game7/build/win32/SDL.dll \
-                minorGems/util/development/fortify \
-		minorGems/graphics/openGL/texture.cpp \
-		minorGems/graphics/openGL/tga.*
-	mv Between_v5_UnixSource between-5+dfsg1.orig
-	tar cvfz ../between_5+dfsg1.orig.tar.gz between-5+dfsg1.orig
-	rm -rf Between_v5_UnixSource.tar.gz between-5+dfsg1.orig
+V=6
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source
+get-orig-source:
+	wget http://downloads.sourceforge.net/hcsoftware/Between_v$(V)_UnixSource.tar.gz
+	tar xf Between_v$(V)_UnixSource.tar.gz
+	# Pre-built Windows libraries, unused
+	rm -rf Between_v$(V)_UnixSource/game7/build/win32/SDL.dll
+	# non-free, unused
+	rm -rf Between_v$(V)_UnixSource/minorGems/util/development/fortify
+	rm -rf Between_v$(V)_UnixSource/minorGems/graphics/openGL/tga.*
+	rm -rf Between_v$(V)_UnixSource/minorGems/graphics/openGL/texture.*
+	mv Between_v$(V)_UnixSource between-$(V)+dfsg1.orig
+	tar zcf ../between_$(V)+dfsg1.orig.tar.gz between-$(V)+dfsg1.orig
+	rm -rf Between_v$(V)_UnixSource.tar.gz between-$(V)+dfsg1.orig

Added: packages/trunk/between/debian/source/format
===================================================================
--- packages/trunk/between/debian/source/format	                        (rev 0)
+++ packages/trunk/between/debian/source/format	2010-10-30 11:44:59 UTC (rev 11440)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the Pkg-games-commits mailing list