diff -u torus-trooper-0.22.dfsg1/debian/control torus-trooper-0.22.dfsg1/debian/control --- torus-trooper-0.22.dfsg1/debian/control +++ torus-trooper-0.22.dfsg1/debian/control @@ -7,9 +7,11 @@ Build-Depends: debhelper (>= 5), quilt, gdc, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libbulletml-dev -Standards-Version: 3.7.2 -XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/torus-trooper/ -XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/torus-trooper/?op=log +Standards-Version: 3.7.3 +Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt_e.html +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/torus-trooper/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/torus-trooper/?op=log +XS-DM-Upload-Allowed: yes Package: torus-trooper Architecture: any diff -u torus-trooper-0.22.dfsg1/debian/rules torus-trooper-0.22.dfsg1/debian/rules --- torus-trooper-0.22.dfsg1/debian/rules +++ torus-trooper-0.22.dfsg1/debian/rules @@ -52,6 +52,7 @@ dh_install dh_installmenu dh_installman debian/*.6 + dh_desktop dh_link dh_strip dh_compress diff -u torus-trooper-0.22.dfsg1/debian/changelog torus-trooper-0.22.dfsg1/debian/changelog --- torus-trooper-0.22.dfsg1/debian/changelog +++ torus-trooper-0.22.dfsg1/debian/changelog @@ -1,3 +1,29 @@ +torus-trooper (0.22.dfsg1-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #180450). Remaining Ubuntu changes: + - Fix .desktop (refers to a wrong .xpm file) + + -- Andrea Colangelo Sat, 05 Jan 2008 00:15:01 +0100 + +torus-trooper (0.22.dfsg1-2) unstable; urgency=low + + [ Barry deFreese ] + * Add watch file + * Add Homepage field in control + * Remove XS- from VCS fields in control + + [ Peter De Wachter ] + * Save high score when quitting via escape (Closes: #444372) + * Make level selection more intuitive (Closes: #444948) + * Fixed link command, patch from Arthur Loiret. (Closes: #458279, #458642) + * Fixed segfault when SDL init fails. + + [ Miriam Ruiz ] + * Added XS-DM-Upload-Allowed tag to control to allow uploads from Debian + Maintainers. + + -- Miriam Ruiz Thu, 03 Jan 2008 12:12:59 +0000 + torus-trooper (0.22.dfsg1-1ubuntu1) hardy; urgency=low * Fix .desktop (refers to a wrong .xpm file) (LP: #179352) diff -u torus-trooper-0.22.dfsg1/debian/torus-trooper.6 torus-trooper-0.22.dfsg1/debian/torus-trooper.6 --- torus-trooper-0.22.dfsg1/debian/torus-trooper.6 +++ torus-trooper-0.22.dfsg1/debian/torus-trooper.6 @@ -31,7 +31,7 @@ Set the luminous intensity.(n = 0 \- 100, default = 0) .TP \fB\-res x y\fR -Set ths screen resolution to (x, y). +Set the screen resolution to (x, y). .TP \fB\-nosound\fR Stop the sound. diff -u torus-trooper-0.22.dfsg1/debian/patches/fixes.patch torus-trooper-0.22.dfsg1/debian/patches/fixes.patch --- torus-trooper-0.22.dfsg1/debian/patches/fixes.patch +++ torus-trooper-0.22.dfsg1/debian/patches/fixes.patch @@ -109,7 +109,7 @@ +all: $(EXE) + +$(EXE): $(OBJS) -+ gcc -o $@ $(OBJS) -lbulletml -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer -lstdc++ ++ gdc -o $@ $(OBJS) -lbulletml -lSDL -lGL -lGLU -lSDL_mixer + +$(OBJS): %.o: %.d + $(DC) -c $(DOUT)$@ $(DFLAGS) $< diff -u torus-trooper-0.22.dfsg1/debian/patches/series torus-trooper-0.22.dfsg1/debian/patches/series --- torus-trooper-0.22.dfsg1/debian/patches/series +++ torus-trooper-0.22.dfsg1/debian/patches/series @@ -7,0 +8,3 @@ +save-score-444372.patch +level-select-444948.patch +avoid-segfault-when-sdl-fails.patch only in patch2: unchanged: --- torus-trooper-0.22.dfsg1.orig/debian/watch +++ torus-trooper-0.22.dfsg1/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts="uversionmangle=s/_/\./,dversionmangle=s/[+.]dfsg(.?\d+)?$//" \ +http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt_e.html tt([\d_]+)\.zip only in patch2: unchanged: --- torus-trooper-0.22.dfsg1.orig/debian/patches/avoid-segfault-when-sdl-fails.patch +++ torus-trooper-0.22.dfsg1/debian/patches/avoid-segfault-when-sdl-fails.patch @@ -0,0 +1,16 @@ +# Copyright (C) 2007 Peter De Wachter +# Distributed under the same license as the game. See debian/copyright. + +Index: torus-trooper-0.22.dfsg1/src/abagames/tt/gamemanager.d +=================================================================== +--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/gamemanager.d 2007-12-31 21:02:05.000000000 +0100 ++++ torus-trooper-0.22.dfsg1/src/abagames/tt/gamemanager.d 2007-12-31 21:02:39.000000000 +0100 +@@ -149,7 +149,7 @@ + } + + public void saveErrorReplay() { +- if (state == inGameState) ++ if (state !is null && state == inGameState) + inGameState.saveReplay("error.rpl"); + } + only in patch2: unchanged: --- torus-trooper-0.22.dfsg1.orig/debian/patches/save-score-444372.patch +++ torus-trooper-0.22.dfsg1/debian/patches/save-score-444372.patch @@ -0,0 +1,26 @@ +Index: torus-trooper-0.22.dfsg1/src/abagames/tt/gamemanager.d +=================================================================== +--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/gamemanager.d 2007-10-02 23:05:33.000000000 +0200 ++++ torus-trooper-0.22.dfsg1/src/abagames/tt/gamemanager.d 2007-10-02 23:07:56.000000000 +0200 +@@ -172,6 +172,7 @@ + if (!escPressed) { + escPressed = true; + if (state == inGameState) { ++ inGameState.endGame(); + startTitle(); + } else { + mainLoop.breakLoop(); +@@ -524,6 +525,13 @@ + public ReplayData replayData() { + return _replayData; + } ++ ++ public void endGame() { ++ if (!ship.isGameOver) { ++ ship.isGameOver = true; ++ prefManager.prefData.recordResult(cast(int) stageManager.level, score); ++ } ++ } + } + + public class TitleState: GameState { only in patch2: unchanged: --- torus-trooper-0.22.dfsg1.orig/debian/patches/level-select-444948.patch +++ torus-trooper-0.22.dfsg1/debian/patches/level-select-444948.patch @@ -0,0 +1,22 @@ +Index: torus-trooper-0.22.dfsg1/src/abagames/tt/title.d +=================================================================== +--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/title.d 2007-10-03 00:11:28.000000000 +0200 ++++ torus-trooper-0.22.dfsg1/src/abagames/tt/title.d 2007-10-03 00:12:06.000000000 +0200 +@@ -69,6 +69,7 @@ + if (dir & (Pad.Dir.RIGHT | Pad.Dir.LEFT)) { + if (!dirPressed) { + dirPressed = true; ++ int oldGrade = grade; + if (dir & Pad.Dir.RIGHT) { + grade++; + if (grade >= Ship.GRADE_NUM) +@@ -79,7 +80,8 @@ + if (grade < 0) + grade = Ship.GRADE_NUM - 1; + } +- if (level > prefManager.prefData.getMaxLevel(grade)) ++ if (level == prefManager.prefData.getMaxLevel(oldGrade) ++ || level > prefManager.prefData.getMaxLevel(grade)) + level = prefManager.prefData.getMaxLevel(grade); + } + }