r12525 - in packages/trunk/slashem/debian: . patches
Vincent Cheng
vincentc-guest at alioth.debian.org
Fri Jul 15 01:39:15 UTC 2011
Author: vincentc-guest
Date: 2011-07-15 01:39:14 +0000 (Fri, 15 Jul 2011)
New Revision: 12525
Added:
packages/trunk/slashem/debian/patches/spelling-error.patch
Modified:
packages/trunk/slashem/debian/changelog
packages/trunk/slashem/debian/patches/series
packages/trunk/slashem/debian/patches/slashem-debian.patch
packages/trunk/slashem/debian/slashem-gtk.desktop
packages/trunk/slashem/debian/slashem-sdl.desktop
packages/trunk/slashem/debian/slashem-x11.desktop
packages/trunk/slashem/debian/slashem.dirs
Log:
slashem: Add patch to fix various spelling errors found by lintian; other packaging tweaks
Modified: packages/trunk/slashem/debian/changelog
===================================================================
--- packages/trunk/slashem/debian/changelog 2011-07-15 00:56:08 UTC (rev 12524)
+++ packages/trunk/slashem/debian/changelog 2011-07-15 01:39:14 UTC (rev 12525)
@@ -7,11 +7,14 @@
* Update debian/copyright to conform to DEP-5.
* Add Vcs-* entries in debian/control.
* Added Homepage: field in debian/control.
+ * Update source format to "3.0 (quilt)".
+ * Migrate existing diff to quilt (debian/patches/slashem-debian.patch).
* Update Standards version from 3.8.3 to 3.9.2, no changes required.
* Update debhelper compatiblity level from 7 to 8.
* Fix existing lintian errors/warnings.
- To fix template-uses-unsplit-choices, a versioned build dependency on
po-debconf (>= 1.0) has been added.
+ - A new patch named "spelling-error.patch", added to debian/patches/.
* Include Danish translation of slashem's debconf template, thanks to
Joe Dalton. (Closes: #603212)
* Fix a small typo in slashem-x11's desktop entry file. (Closes: #626768)
Modified: packages/trunk/slashem/debian/patches/series
===================================================================
--- packages/trunk/slashem/debian/patches/series 2011-07-15 00:56:08 UTC (rev 12524)
+++ packages/trunk/slashem/debian/patches/series 2011-07-15 01:39:14 UTC (rev 12525)
@@ -1 +1,2 @@
+spelling-error.patch
slashem-debian.patch
Modified: packages/trunk/slashem/debian/patches/slashem-debian.patch
===================================================================
--- packages/trunk/slashem/debian/patches/slashem-debian.patch 2011-07-15 00:56:08 UTC (rev 12524)
+++ packages/trunk/slashem/debian/patches/slashem-debian.patch 2011-07-15 01:39:14 UTC (rev 12525)
@@ -1,7 +1,7 @@
This patch contains a variety of Debian-specific patches.
---- a/include/config.h 2006-12-30 05:08:31.000000000 -0800
-+++ b/include/config.h 2011-07-12 15:05:10.000000000 -0700
+--- a/include/config.h
++++ b/include/config.h
@@ -7,6 +7,8 @@
#undef SHORT_FILENAMES
@@ -84,8 +84,8 @@
/*
* If it is desirable to limit the number of people that can play Hack
---- a/include/debian.h 1969-12-31 16:00:00.000000000 -0800
-+++ b/include/debian.h 2011-07-12 15:05:10.000000000 -0700
+--- /dev/null
++++ b/include/debian.h
@@ -0,0 +1,38 @@
+/* Configuration of Slash'em for Debian:
+ *
@@ -125,8 +125,8 @@
+#endif
+
+#define USE_XPM
---- a/include/file.h 2006-12-30 05:08:31.000000000 -0800
-+++ b/include/file.h 2011-07-12 15:05:10.000000000 -0700
+--- a/include/file.h
++++ b/include/file.h
@@ -41,3 +41,7 @@
/* Environment Options Name */
@@ -135,8 +135,8 @@
+/* Include Debian configuration to overrule NH_CONFIG_FILE */
+#include "debian.h"
+
---- a/include/global.h 2006-12-30 05:08:31.000000000 -0800
-+++ b/include/global.h 2011-07-12 15:05:10.000000000 -0700
+--- a/include/global.h
++++ b/include/global.h
@@ -35,7 +35,7 @@
#define NH_CMDHELPAREA FILE_AREA_SHARE
#define NH_HISTORY "history" /* a file giving nethack's history */
@@ -146,8 +146,8 @@
#define NH_LICENSE_AREA FILE_AREA_DOC
#define NH_OPTIONFILE "opthelp" /* a file explaining runtime options */
#define NH_OPTIONAREA FILE_AREA_SHARE
---- a/include/unixconf.h 2006-12-30 05:08:31.000000000 -0800
-+++ b/include/unixconf.h 2011-07-12 15:05:10.000000000 -0700
+--- a/include/unixconf.h
++++ b/include/unixconf.h
@@ -33,12 +33,12 @@
@@ -172,8 +172,8 @@
#ifdef FILE_AREAS
---- a/src/options.c 2006-12-30 05:08:31.000000000 -0800
-+++ b/src/options.c 2011-07-12 15:05:10.000000000 -0700
+--- a/src/options.c
++++ b/src/options.c
@@ -169,7 +169,7 @@
#else
{"news", (boolean *)0, FALSE, SET_IN_FILE},
@@ -183,8 +183,8 @@
#ifdef MAC
{"page_wait", &flags.page_wait, TRUE, SET_IN_GAME},
#else
---- a/src/topten.c 2006-12-30 05:08:31.000000000 -0800
-+++ b/src/topten.c 2011-07-12 15:05:10.000000000 -0700
+--- a/src/topten.c
++++ b/src/topten.c
@@ -33,7 +33,7 @@
#define NAMSZ 10
#define DTHSZ 100
@@ -194,8 +194,8 @@
#define POINTSMIN 1 /* must be > 0 */
#define ENTRYMAX 100 /* must be >= 10 */
---- a/sys/unix/Makefile.src 2006-12-30 05:08:31.000000000 -0800
-+++ b/sys/unix/Makefile.src 2011-07-12 15:05:10.000000000 -0700
+--- a/sys/unix/Makefile.src
++++ b/sys/unix/Makefile.src
@@ -124,11 +124,11 @@
# flags for Linux
@@ -365,8 +365,8 @@
@touch Sysunix
Sys3B2: $(HOBJ) Makefile
---- a/sys/unix/Makefile.top 2006-12-30 05:08:31.000000000 -0800
-+++ b/sys/unix/Makefile.top 2011-07-12 15:05:10.000000000 -0700
+--- a/sys/unix/Makefile.top
++++ b/sys/unix/Makefile.top
@@ -17,12 +17,12 @@
PREFIX = /usr
GAME = slashem
@@ -480,8 +480,8 @@
-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
---- a/sys/unix/Makefile.utl 2006-12-30 05:08:31.000000000 -0800
-+++ b/sys/unix/Makefile.utl 2011-07-12 15:05:10.000000000 -0700
+--- a/sys/unix/Makefile.utl
++++ b/sys/unix/Makefile.utl
@@ -72,8 +72,8 @@
# flags for Linux
@@ -520,8 +520,8 @@
# these are the names of the output files from YACC/LEX. Under MS-DOS
# and similar systems, they may differ
---- a/sys/unix/nethack.sh 2006-12-30 05:08:31.000000000 -0800
-+++ b/sys/unix/nethack.sh 2011-07-12 15:05:10.000000000 -0700
+--- a/sys/unix/nethack.sh
++++ b/sys/unix/nethack.sh
@@ -1,10 +1,8 @@
#!/bin/sh
# SCCS Id: @(#)nethack.sh 3.4 1990/02/26
Added: packages/trunk/slashem/debian/patches/spelling-error.patch
===================================================================
--- packages/trunk/slashem/debian/patches/spelling-error.patch (rev 0)
+++ packages/trunk/slashem/debian/patches/spelling-error.patch 2011-07-15 01:39:14 UTC (rev 12525)
@@ -0,0 +1,57 @@
+Fix various spelling errors identified by lintian.
+
+--- a/src/cmd.c
++++ b/src/cmd.c
+@@ -2571,7 +2571,7 @@
+ Sprintf(buf, "Trap: %s", lev->mem_trap ?
+ defsyms[trap_to_defsym(lev->mem_trap)].explanation : "none");
+ putstr(win, 0, buf);
+- Sprintf(buf, "Backgroud: %s", defsyms[lev->mem_bg].explanation);
++ Sprintf(buf, "Background: %s", defsyms[lev->mem_bg].explanation);
+ putstr(win, 0, buf);
+ putstr(win, 0, "");
+ glyph = glyph_at(cc.x, cc.y);
+--- a/src/gypsy.c
++++ b/src/gypsy.c
+@@ -431,7 +431,7 @@
+ pline_The("moon is waning tonight.");
+ break;
+ default:
+- impossible("wierd moonphase %d", flags.moonphase);
++ impossible("weird moonphase %d", flags.moonphase);
+ break;
+ }
+ break;
+--- a/win/gnome/gnmenu.c
++++ b/win/gnome/gnmenu.c
+@@ -312,7 +312,7 @@
+ image = ghack_image_from_glyph( item->glyph, FALSE);
+ if (image==NULL || image->pixmap==NULL) {
+ g_warning("Bummer -- having to force rendering for glyph %d!", item->glyph);
+- /* wierd -- pixmap is NULL so retry rendering it */
++ /* weird -- pixmap is NULL so retry rendering it */
+ image = ghack_image_from_glyph( item->glyph, TRUE);
+ }
+ if (image==NULL || image->pixmap==NULL) {
+--- a/sys/unix/cpp1.shr
++++ b/sys/unix/cpp1.shr
+@@ -1147,7 +1147,7 @@
+ X
+ X/*
+ X * Some special constants. These may need to be changed if cpp
+-X * is ported to a wierd machine.
++X * is ported to a weird machine.
+ X *
+ X * NOTE: if cpp is run on a non-ascii machine, ALERT and VT may
+ X * need to be changed. They are used to implement the proposed
+--- a/doc/slashem.6
++++ b/doc/slashem.6
+@@ -186,7 +186,7 @@
+ Leaving out any of these characteristics will result in you being prompted
+ during the game startup for the information.
+ .PP
+-Instead of chosing the above seperately you can add them as suffixes to
++Instead of chosing the above separately you can add them as suffixes to
+ the playername:
+ .B \-u
+ .I playername\-race\-gender\-alignment
Modified: packages/trunk/slashem/debian/slashem-gtk.desktop
===================================================================
--- packages/trunk/slashem/debian/slashem-gtk.desktop 2011-07-15 00:56:08 UTC (rev 12524)
+++ packages/trunk/slashem/debian/slashem-gtk.desktop 2011-07-15 01:39:14 UTC (rev 12525)
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
Name=GTK Slash'EM
GenericName=GTK Slash'EM
Comment=Super Lotsa Added Stuff Hack - Extended Magic (GTK)
Modified: packages/trunk/slashem/debian/slashem-sdl.desktop
===================================================================
--- packages/trunk/slashem/debian/slashem-sdl.desktop 2011-07-15 00:56:08 UTC (rev 12524)
+++ packages/trunk/slashem/debian/slashem-sdl.desktop 2011-07-15 01:39:14 UTC (rev 12525)
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
Name=SDL Slash'EM
GenericName=SDL Slash'EM
Comment=Super Lotsa Added Stuff Hack - Extended Magic (SDL)
Modified: packages/trunk/slashem/debian/slashem-x11.desktop
===================================================================
--- packages/trunk/slashem/debian/slashem-x11.desktop 2011-07-15 00:56:08 UTC (rev 12524)
+++ packages/trunk/slashem/debian/slashem-x11.desktop 2011-07-15 01:39:14 UTC (rev 12525)
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
Name=X Slash'EM
GenericName=X Slash'EM
Comment=Super Lotsa Added Stuff Hack - Extended Magic (X11)
Modified: packages/trunk/slashem/debian/slashem.dirs
===================================================================
--- packages/trunk/slashem/debian/slashem.dirs 2011-07-15 00:56:08 UTC (rev 12524)
+++ packages/trunk/slashem/debian/slashem.dirs 2011-07-15 01:39:14 UTC (rev 12525)
@@ -1 +0,0 @@
-usr/share/man/man6
More information about the Pkg-games-commits
mailing list