This is an automated email from the git hooks/post-receive script. rhonda pushed a commit to branch master in repository tworld.
commit c8d50e77d512637385fce9b87167fbd2ee65b2be Author: Rhonda D'Vine <rho...@debian.org> Date: Tue Dec 29 02:00:39 2015 +0100 Update 01_fix-manpage and refresh 02_integer-types patches --- debian/changelog | 1 + debian/patches/01_fix-manpage | 117 ++++++++++++++++++++-------------------- debian/patches/02_integer-types | 72 +++++++++++++++---------- 3 files changed, 106 insertions(+), 84 deletions(-) diff --git a/debian/changelog b/debian/changelog index c022fa7..680ba94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ tworld (1.3.0-7) unstable; urgency=low * New Upstream release (closes: #807623) + * Update 01_fix-manpage and refresh 02_integer-types patches. -- diff --git a/debian/patches/01_fix-manpage b/debian/patches/01_fix-manpage index 9ebc236..948b8a9 100644 --- a/debian/patches/01_fix-manpage +++ b/debian/patches/01_fix-manpage @@ -1,19 +1,19 @@ -Author: Gerfried Fuchs <rho...@debian.org> vim:ft=diff: +Author: Rhonda D'Vine <rho...@debian.org> vim:ft=diff: Description: patch to fix manual pages The patch contains fixes for typos and for syntax issues that might lead to misrendering of the manpage. -Index: b/docs/tworld.6 +Index: VCS/docs/tworld.6 =================================================================== ---- a/docs/tworld.6 -+++ b/docs/tworld.6 +--- VCS.orig/docs/tworld.6 2015-12-29 01:58:23.195136149 +0100 ++++ VCS/docs/tworld.6 2015-12-29 01:58:23.195136149 +0100 @@ -1,5 +1,4 @@ .TH tworld 6 "Mar 2006" "Tile World" -.LO 1 .SH NAME tworld \- Tile World .P -@@ -72,7 +71,7 @@ entering this tile will cause Chip to lo +@@ -72,7 +71,7 @@ collected. .P Dirt blocks are large, movable squares of dirt. Chip can push them @@ -22,7 +22,7 @@ Index: b/docs/tworld.6 Furthermore, if a block is pushed into water, the tile will turn into dirt (which will become normal flooring when Chip steps on it). Finally, note that blocks can sometimes be resting on top of other -@@ -150,8 +149,8 @@ give you the opportunity to skip a level +@@ -150,8 +149,8 @@ .SH PASSWORDS Every level has a four-letter password. The password for a level is shown in the information display at the upper-right of the window. The @@ -33,7 +33,7 @@ Index: b/docs/tworld.6 Tile World will automatically store the passwords for you. However, if you somehow manage to learn the password of a level that you have yet to achieve, you can use the password to gain early access to that -@@ -248,7 +247,7 @@ toggles between even-step and odd-step o +@@ -251,7 +250,7 @@ .TP .B Ctrl-X deprecates the best solution for that level. If the level is then @@ -42,18 +42,21 @@ Index: b/docs/tworld.6 the new one, whether or not it had a better time. .TP .B Shift-Ctrl-X -@@ -327,98 +326,98 @@ information on standard output actually +@@ -330,7 +329,7 @@ stdout.txt instead.) .P .TP --.B -a -+.B \-a - Double the size of the audio buffer. This option can be repeated, so --for example -aaa would increase the audio buffer size eightfold. -+for example \-aaa would increase the audio buffer size eightfold. - .TP --.B -b -+.B \-b +-.BI "-a,\ --audio-buffer=" N ++.BI "\-a,\ \-\-audio\-buffer=" N + Set the size of the audio buffer. + .I N + can be a value from 1 (the +@@ -338,94 +337,94 @@ + option can reduce static or distortion in the sound playback, at the + cost of increased latency. + .TP +-.B -b,\ --batch-verify ++.B \-b,\ \-\-batch\-verify Do a batch-mode verification of the existing solutions and exit. Levels with invalid solutions are displayed on standard output. If -used with -q, then nothing is displayed, and the program's exit code @@ -64,105 +67,105 @@ Index: b/docs/tworld.6 that this options requires a level set file and/or a solution file be named on the command line. .TP --.BI "-D\ " DIR -+.BI "\-D\ " DIR +-.BI "-D,\ --data-dir=" DIR ++.BI "\-D,\ \-\-data\-dir=" DIR Read level data files from .I DIR instead of the default directory. .TP --.B -d -+.B \-d +-.B -d,\ --list-dirs ++.B \-d,\ \-\-list\-dirs Display the default directories used by the program on standard output, and exit. .TP --.B -F -+.B \-F +-.B -F,\ --full-screen ++.B \-F,\ \-\-full\-screen Run in full-screen mode. .TP --.B -H -+.B \-H +-.B --histogram ++.B \-\-histogram Upon exit, display a histogram of idle time on standard output. (This option is used for evaluating optimization efforts.) .TP --.B -h -+.B \-h +-.B --h,\ --help ++.B \-h,\ \-\-help Display a summary of the command-line syntax on standard output and exit. .TP --.BI "-L\ " DIR -+.BI "\-L\ " DIR - Look for level sets in +-.BI "-L,\ --levelset-dir=" DIR ++.BI "\-L,\ \-\-levelset\-dir=" DIR + Load level sets from .I DIR instead of the default directory. .TP --.B -l -+.B \-l +-.B -l,\ --list-levelsets ++.B \-l,\ \-\-list\-levelsets Write a list of available level sets to standard output and exit. .TP --.BI "-n\ " N -+.BI "\-n\ " N +-.BI "-n,\ --volume=" N ++.BI "\-n,\ \-\-volume=" N Set the initial volume level to .IR "N" , 0 being silence and 10 being full volume. The default level is 10. .TP --.B -P -+.B \-P +-.B -P,\ --pedantic ++.B \-P,\ \-\-pedantic Turn on pedantic mode, forcing the Lynx ruleset to emulate the original game as closely as possible. (See the Tile World website for more information on emulation of the Lynx ruleset.) .TP --.B -p -+.B \-p +-.B -p,\ --no-passwords ++.B \-p,\ \-\-no\-passwords Turn off all password-checking. This option allows the normal sequence of levels to be bypassed. .TP --.B -q -+.B \-q - Run quietly. All sounds, including the ringing of the terminal bell, +-.B -q,\ --quiet ++.B \-q,\ \-\-quiet + Run quietly. All sounds, including the ringing of the system bell, are suppressed. .TP --.B -r -+.B \-r +-.B -r,\ --read-only ++.B \-r,\ \-\-read\-only Run in read-only mode. This guarantees that no changes will be made to the solution files. .TP --.BI "-R\ " DIR -+.BI "\-R\ " DIR +-.BI "-R,\ --resource-dir=" DIR ++.BI "\-R,\ \-\-resource\-dir=" DIR Read resource data from .I DIR instead of the default directory. .TP --.BI "-S\ " DIR -+.BI "\-S\ " DIR +-.BI "-S,\ --save-dir=" DIR ++.BI "\-S,\ \-\-save\-dir=" DIR Read and write solution files under .I DIR instead of the default directory. .TP --.B -s -+.B \-s +-.B -s,\ --list-scores ++.B \-s,\ \-\-list\-scores Display the current scores for the selected level set on standard output and exit. A level set must be named on the command line. If -used with -b, the solutions are verified beforehand, and invalid +used with \-b, the solutions are verified beforehand, and invalid solutions are indicated. .TP --.B -t -+.B \-t +-.B -t,\ --list-times ++.B \-t,\ \-\-list\-times Display the best times for the selected level set on standard output and exit. A level set must be named on the command line. If used with ---b, the solutions are verified beforehand, and invalid solutions are -+\-b, the solutions are verified beforehand, and invalid solutions are - indicated. +---batch-verify, the solutions are verified beforehand, and invalid ++\-\-batch\-verify, the solutions are verified beforehand, and invalid + solutions are indicated. .TP --.B -V -+.B \-V +-.B -V,\ --version ++.B \-V,\ \-\-version Display the program's version and license information on standard output and exit. .TP --.B -v -+.B \-v +-.B -v,\ --version-number ++.B \-v,\ \-\-version\-number Display the program's version number on standard output and exit. .P Besides the above options, tworld can accept up to three diff --git a/debian/patches/02_integer-types b/debian/patches/02_integer-types index 17513c8..623e541 100644 --- a/debian/patches/02_integer-types +++ b/debian/patches/02_integer-types @@ -4,8 +4,10 @@ Author: Drake Wilson <dr...@begriffli.ch> Bug-Debian: http://bugs.debian.org/427360 Bug-Ubuntu: https://launchpad.net/bugs/307897 ---- a/defs.h -+++ b/defs.h +Index: VCS/defs.h +=================================================================== +--- VCS.orig/defs.h 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/defs.h 2015-12-29 01:58:36.771203469 +0100 @@ -8,6 +8,7 @@ #define _defs_h_ @@ -36,7 +38,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 unsigned char rndslidedir; /* random slide's initial direction */ signed char stepping; /* the timer offset */ } solutioninfo; -@@ -196,7 +197,7 @@ +@@ -189,7 +190,7 @@ int solutionsize; /* size of the saved solution data */ unsigned char *leveldata; /* the data defining the level */ unsigned char *solutiondata; /* the player's best solution so far */ @@ -45,8 +47,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 char const *unsolvable; /* why level is unsolvable, or NULL */ char name[256]; /* name of the level */ char passwd[256]; /* the level's password */ ---- a/fileio.c -+++ b/fileio.c +Index: VCS/fileio.c +=================================================================== +--- VCS.orig/fileio.c 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/fileio.c 2015-12-29 01:58:36.775203489 +0100 @@ -242,7 +242,7 @@ /* Read one byte as an unsigned integer value. @@ -101,8 +105,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 { errno = 0; if (fputc(val32 & 0xFF, file->fp) != EOF ---- a/fileio.h -+++ b/fileio.h +Index: VCS/fileio.h +=================================================================== +--- VCS.orig/fileio.h 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/fileio.h 2015-12-29 01:58:36.775203489 +0100 @@ -8,6 +8,7 @@ #define _fileio_h_ @@ -135,8 +141,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 char const *msg); /* Read size bytes from the given file and return the bytes in a ---- a/oshw.h -+++ b/oshw.h +Index: VCS/oshw.h +=================================================================== +--- VCS.orig/oshw.h 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/oshw.h 2015-12-29 01:58:36.775203489 +0100 @@ -131,7 +131,7 @@ /* The font provides special monospaced digit characters at 144-153. @@ -146,8 +154,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 /* * Video output functions. ---- a/random.c -+++ b/random.c +Index: VCS/random.c +=================================================================== +--- VCS.orig/random.c 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/random.c 2015-12-29 01:58:36.775203489 +0100 @@ -24,12 +24,12 @@ /* The most recently generated random number is stashed here, so that * it can provide the initial seed of the next PRNG. @@ -172,8 +182,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 { gen->value = gen->initial = seed & 0x7FFFFFFFUL; gen->shared = FALSE; ---- a/random.h -+++ b/random.h +Index: VCS/random.h +=================================================================== +--- VCS.orig/random.h 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/random.h 2015-12-29 01:58:36.775203489 +0100 @@ -19,7 +19,7 @@ /* Restart an existing PRNG upon a predetermined sequence. @@ -183,9 +195,11 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 /* Retrieve the original seed value of the current sequence. */ ---- a/series.c -+++ b/series.c -@@ -46,9 +46,9 @@ +Index: VCS/series.c +=================================================================== +--- VCS.orig/series.c 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/series.c 2015-12-29 01:58:36.775203489 +0100 +@@ -58,9 +58,9 @@ /* Calculate a hash value for the given block of data. */ @@ -197,7 +211,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B, 0x1A864DB2, 0x1E475005, 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61, 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD, 0x4C11DB70, 0x48D0C6C7, -@@ -94,7 +94,7 @@ +@@ -106,7 +106,7 @@ 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4 }; @@ -206,7 +220,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 unsigned int i, j; for (j = 0, accum = 0xFFFFFFFFUL ; j < size ; ++j) { -@@ -113,7 +113,7 @@ +@@ -125,7 +125,7 @@ */ static int readseriesheader(gameseries *series) { @@ -215,7 +229,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 int ruleset; if (!filereadint16(&series->mapfile, &val16, "not a valid data file")) -@@ -149,7 +149,7 @@ +@@ -161,7 +161,7 @@ { unsigned char *data; unsigned char const *dataend; @@ -224,7 +238,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 int n; if (!filereadint16(file, &size, NULL)) -@@ -450,7 +450,7 @@ +@@ -469,7 +469,7 @@ fileinfo file; seriesdata *sdata = (seriesdata*)data; gameseries *series; @@ -233,8 +247,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 char *datfilename; int config, f; ---- a/solution.c -+++ b/solution.c +Index: VCS/solution.c +=================================================================== +--- VCS.orig/solution.c 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/solution.c 2015-12-29 01:58:36.775203489 +0100 @@ -8,6 +8,7 @@ #include <stdlib.h> #include <string.h> @@ -243,7 +259,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 #include "defs.h" #include "err.h" #include "fileio.h" -@@ -215,9 +216,9 @@ +@@ -230,9 +231,9 @@ static int readsolutionheader(fileinfo *file, int ruleset, int *flags, int *extrasize, unsigned char *extra) { @@ -256,7 +272,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 if (!filereadint32(file, &sig, "not a valid solution file")) return FALSE; -@@ -475,7 +476,7 @@ +@@ -489,7 +490,7 @@ */ static int readsolution(fileinfo *file, gamesetup *game) { @@ -265,7 +281,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 game->number = 0; game->sgflags = 0; -@@ -706,8 +707,8 @@ +@@ -744,8 +745,8 @@ int loadsolutionsetname(char const *filename, char *buffer) { fileinfo file; @@ -276,8 +292,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/307897 int size; clearfileinfo(&file); ---- a/unslist.c -+++ b/unslist.c +Index: VCS/unslist.c +=================================================================== +--- VCS.orig/unslist.c 2015-12-29 01:58:36.779203509 +0100 ++++ VCS/unslist.c 2015-12-29 01:58:36.775203489 +0100 @@ -22,7 +22,7 @@ int setid; /* the ID of the level set's name */ int levelnum; /* the level's number */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tworld.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits