Package: xshisen
Version: 1:1.51-3.1
Followup-For: Bug #565064
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
In Debian sid, the attached patch can be applied to achieve the following:
* Use quilt
- Replace simple-patchsys.mk with patchsys-quilt.mk and build-depend
on quilt.
- Add debian/patches/series.
* 10_oldfixes.patch: Fix format string use, FTBFS with gcc-4.6.
(Closes: #565064)
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru xshisen-1.51/debian/control xshisen-1.51/debian/control
--- xshisen-1.51/debian/control 2010-05-08 18:26:37.000000000 -0400
+++ xshisen-1.51/debian/control 2011-10-21 18:55:23.000000000 -0400
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Zak B. Elep <zak...@spunge.org>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 7.1), lesstif2-dev, libx11-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, xutils-dev
+Build-Depends: autotools-dev, cdbs, quilt, debhelper (>= 7.1), lesstif2-dev, libx11-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, xutils-dev
Standards-Version: 3.8.4
Homepage: http://www.techfirm.co.jp/~masaoki/xshisen.html
diff -Nru xshisen-1.51/debian/patches/10_oldfixes.patch xshisen-1.51/debian/patches/10_oldfixes.patch
--- xshisen-1.51/debian/patches/10_oldfixes.patch 2010-05-04 12:05:41.000000000 -0400
+++ xshisen-1.51/debian/patches/10_oldfixes.patch 2011-10-21 18:20:59.000000000 -0400
@@ -1,6 +1,7 @@
-diff -Nur xshisen-1.51.orig/main.C xshisen-1.51/main.C
---- xshisen-1.51.orig/main.C
-+++ xshisen-1.51/main.C
+Index: xshisen-1.51/main.C
+===================================================================
+--- xshisen-1.51.orig/main.C 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/main.C 2011-10-21 18:16:00.000000000 -0400
@@ -210,7 +210,7 @@
char buffer[100], *p;
char *(*codeconv)(const char*);
@@ -47,9 +48,10 @@
}
else {
GetGameSize(initial_game_state, num_piece_x, num_piece_y);
-diff -Nur xshisen-1.51.orig/menubar.C xshisen-1.51/menubar.C
---- xshisen-1.51.orig/menubar.C
-+++ xshisen-1.51/menubar.C
+Index: xshisen-1.51/menubar.C
+===================================================================
+--- xshisen-1.51.orig/menubar.C 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/menubar.C 2011-10-21 18:16:00.000000000 -0400
@@ -158,8 +158,13 @@
(XtCallbackProc)GameCB, (XtPointer)1);
XtAddCallback(XtNameToWidget(menushell0, "button_2"), XtNcallback,
@@ -64,18 +66,28 @@
XtAddCallback(XtNameToWidget(menushell0, "button_4"), XtNcallback,
(XtCallbackProc)GameCB, (XtPointer)4);
XtAddCallback(XtNameToWidget(menushell0, "button_5"), XtNcallback,
-diff -Nur xshisen-1.51.orig/score.C xshisen-1.51/score.C
---- xshisen-1.51.orig/score.C
-+++ xshisen-1.51/score.C
+Index: xshisen-1.51/score.C
+===================================================================
+--- xshisen-1.51.orig/score.C 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/score.C 2011-10-21 18:20:57.000000000 -0400
+@@ -337,7 +337,7 @@
+ }
+ // Always read the latest high score
+ readfile();
+- sprintf(format, res_strings[0]);
++ snprintf(format, sizeof(format)-1, "%s", res_strings[0]);
+ prev_time = -1;
+ for(int i=0; i<SCORENUM; i++) {
+ this_time = rec[i].hour * 3600 + rec[i].min * 60 + rec[i].sec;
@@ -372,12 +372,15 @@
time_t t;
struct tm *tp;
struct passwd *pw;
- char namebuf[128], myname[NAMELEN+1], gecos[128], *po;
+ char namebuf[142], myname[NAMELEN+1], gecos[128], *po;
-
++
+#ifndef NO_GLOBAL_HIGHSCORE
-+
+
s1 = scoreToRegister / 1000;
ms_to_hms(scoreToRegister, h, m, s);
pw = getpwuid(getuid());
@@ -106,9 +118,10 @@
bp += strlen(bp);
sprintf(bp, " %-14.14s: %2.2d:%2.2d:%2.2d (%4.1f) %6d %s\n",
res_strings[8], t1, t2, t3, y, rcount[0], res_strings[11]);
-diff -Nur xshisen-1.51.orig/readxpm.C xshisen-1.51/readxpm.C
---- xshisen-1.51.orig/readxpm.C
-+++ xshisen-1.51/readxpm.C
+Index: xshisen-1.51/readxpm.C
+===================================================================
+--- xshisen-1.51.orig/readxpm.C 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/readxpm.C 2011-10-21 18:16:00.000000000 -0400
@@ -12,7 +12,7 @@
char buffer[1024];
@@ -118,9 +131,10 @@
Mp[i].ReadFile(w, buffer, i, globRes.colorCloseness);
}
}
-diff -Nur xshisen-1.51.orig/Makefile.in xshisen-1.51/Makefile.in
---- xshisen-1.51.orig/Makefile.in
-+++ xshisen-1.51/Makefile.in
+Index: xshisen-1.51/Makefile.in
+===================================================================
+--- xshisen-1.51.orig/Makefile.in 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/Makefile.in 2011-10-21 18:16:00.000000000 -0400
@@ -17,7 +17,7 @@
XSHISENLIB = @datadir@/xshisen
@@ -176,9 +190,10 @@
.SUFFIXES: .C
.C.o:
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad xshisen-1.51/lang/XShisen.ad
---- xshisen-1.51.orig/lang/XShisen.ad
-+++ xshisen-1.51/lang/XShisen.ad
+Index: xshisen-1.51/lang/XShisen.ad
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
@@ -188,9 +203,10 @@
Shisen-sho for X11 by Masaoki Kobayashi <masa...@techfirm.co.jp>\n\
Shisen-sho for Win by Shinji Ono <o...@urban.ne.jp>\n\
Picture by Takayuki Akiyama <ta...@ybb.ne.jp>
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja_JP.eucJP xshisen-1.51/lang/XShisen.ad.ja_JP.eucJP
---- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.eucJP
-+++ xshisen-1.51/lang/XShisen.ad.ja_JP.eucJP
+Index: xshisen-1.51/lang/XShisen.ad.ja_JP.eucJP
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.eucJP 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad.ja_JP.eucJP 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
@@ -200,9 +216,10 @@
?????? for X11 by ???? ???? <masa...@techfirm.co.jp>\n\
?????? for Win by ???? ???? <o...@urban.ne.jp>\n\
?????????? by ???? ???? <ta...@ybb.ne.jp>
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja_JP xshisen-1.51/lang/XShisen.ad.ja_JP
---- xshisen-1.51.orig/lang/XShisen.ad.ja_JP
-+++ xshisen-1.51/lang/XShisen.ad.ja_JP
+Index: xshisen-1.51/lang/XShisen.ad.ja_JP
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad.ja_JP 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad.ja_JP 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
@@ -212,9 +229,10 @@
?????? for X11 by ???? ???? <masa...@techfirm.co.jp>\n\
?????? for Win by ???? ???? <o...@urban.ne.jp>\n\
?????????? by ???? ???? <ta...@ybb.ne.jp>
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja xshisen-1.51/lang/XShisen.ad.ja
---- xshisen-1.51.orig/lang/XShisen.ad.ja
-+++ xshisen-1.51/lang/XShisen.ad.ja
+Index: xshisen-1.51/lang/XShisen.ad.ja
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad.ja 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad.ja 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
@@ -224,9 +242,10 @@
?????? for X11 by ???? ???? <masa...@techfirm.co.jp>\n\
?????? for Win by ???? ???? <o...@urban.ne.jp>\n\
?????????? by ???? ???? <ta...@ybb.ne.jp>
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja_JP.SJIS xshisen-1.51/lang/XShisen.ad.ja_JP.SJIS
---- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.SJIS
-+++ xshisen-1.51/lang/XShisen.ad.ja_JP.SJIS
+Index: xshisen-1.51/lang/XShisen.ad.ja_JP.SJIS
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.SJIS 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad.ja_JP.SJIS 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
@@ -236,9 +255,10 @@
?l???? for X11 by ???? ???? <masa...@techfirm.co.jp>\n\
?l???? for Win by ???? ?W?? <o...@urban.ne.jp>\n\
?v?f?U?C?? by ?H?R ???V <ta...@ybb.ne.jp>
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.pl xshisen-1.51/lang/XShisen.ad.pl
---- xshisen-1.51.orig/lang/XShisen.ad.pl
-+++ xshisen-1.51/lang/XShisen.ad.pl
+Index: xshisen-1.51/lang/XShisen.ad.pl
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad.pl 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad.pl 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
@@ -303,9 +323,10 @@
XShisen*sform*translations: #replace <Btn1Down>: PickupPiece()\n\
<Btn2Down>(2): menu(0,0)\n\
<Btn3Down>: CancelPiece()\n\
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja_JP.JIS7 xshisen-1.51/lang/XShisen.ad.ja_JP.JIS7
---- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.JIS7
-+++ xshisen-1.51/lang/XShisen.ad.ja_JP.JIS7
+Index: xshisen-1.51/lang/XShisen.ad.ja_JP.JIS7
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.JIS7 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad.ja_JP.JIS7 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
@@ -315,9 +336,10 @@
$B;M@n>J(B for X11 by $B>.NS(B $B@56=(B <masa...@techfirm.co.jp>\n\
$B;M@n>J(B for Win by $B>.Ln(B $B?8Fs(B <o...@urban.ne.jp>\n\
$BGW%G%6%$%s(B by $B=);3(B $BN4G7(B <ta...@ybb.ne.jp>
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja_JP.ujis xshisen-1.51/lang/XShisen.ad.ja_JP.ujis
---- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.ujis
-+++ xshisen-1.51/lang/XShisen.ad.ja_JP.ujis
+Index: xshisen-1.51/lang/XShisen.ad.ja_JP.ujis
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.ujis 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad.ja_JP.ujis 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
@@ -327,9 +349,10 @@
?????? for X11 by ???? ???? <masa...@techfirm.co.jp>\n\
?????? for Win by ???? ???? <o...@urban.ne.jp>\n\
?????????? by ???? ???? <ta...@ybb.ne.jp>
-diff -Nur xshisen-1.51.orig/lang/XShisen.ad.ja_JP.PCK xshisen-1.51/lang/XShisen.ad.ja_JP.PCK
---- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.PCK
-+++ xshisen-1.51/lang/XShisen.ad.ja_JP.PCK
+Index: xshisen-1.51/lang/XShisen.ad.ja_JP.PCK
+===================================================================
+--- xshisen-1.51.orig/lang/XShisen.ad.ja_JP.PCK 2011-10-21 18:12:57.000000000 -0400
++++ xshisen-1.51/lang/XShisen.ad.ja_JP.PCK 2011-10-21 18:16:00.000000000 -0400
@@ -1,7 +1,7 @@
! Common resources
XShisen*connectLineColor: blue
diff -Nru xshisen-1.51/debian/patches/series xshisen-1.51/debian/patches/series
--- xshisen-1.51/debian/patches/series 1969-12-31 19:00:00.000000000 -0500
+++ xshisen-1.51/debian/patches/series 2011-10-21 18:09:14.000000000 -0400
@@ -0,0 +1,3 @@
+10_oldfixes.patch
+11_manpage_fixes.patch
+20_autotools_update.patch
diff -Nru xshisen-1.51/debian/rules xshisen-1.51/debian/rules
--- xshisen-1.51/debian/rules 2010-05-04 12:05:41.000000000 -0400
+++ xshisen-1.51/debian/rules 2011-10-21 18:12:39.000000000 -0400
@@ -4,7 +4,7 @@
# Let's use CDBS!
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/autotools.mk
# Because the upstream source doesn't ship config.{guess,sub}, we have to
