Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 09, 2012
@zakame Fix FTBFS on gcc-4.7
Thanks to kibi@ for his patch!

Signed-off-by: Zak B. Elep <zakame@zakame.net>
fb44833
@zakame Rebuild patches
via gbp-pq import/export

Signed-off-by: Zak B. Elep <zakame@zakame.net>
612093f
@zakame Fix manpage typos
Closes: #657352

Signed-off-by: Zak B. Elep <zakame@zakame.net>
597a601
View
4 debian/changelog
@@ -10,8 +10,10 @@ xshisen (1:1.51-4) unstable; urgency=low
* Use dh instead of cdbs
* Fix version number in X resources (now says 1.51 instead of 1.50)
* Add Vcs-* fields
+ * Add patch by kibi@ to fix FTBFS on gcc-4.7 (Closes: #667425)
+ * Fix manpage typos, thanks to "A. Costa" (Closes: #657352)
- -- Zak B. Elep <zakame@zakame.net> Mon, 09 Apr 2012 16:21:09 +0800
+ -- Zak B. Elep <zakame@zakame.net> Mon, 09 Apr 2012 16:51:36 +0800
xshisen (1:1.51-3.2) unstable; urgency=low
View
58 debian/patches/0008-Fix-FTBFS-with-gcc-4.7-by-using-this-foo-where-neede.patch
@@ -0,0 +1,58 @@
+From: Cyril Brulebois <kibi@debian.org>
+Date: Wed, 4 Apr 2012 16:08:57 +0200
+Subject: =?UTF-8?q?Fix=20FTBFS=20with=20gcc=204.7=20by=20using=20=E2=80=9Cth?=
+ =?UTF-8?q?is->foo=E2=80=9D=20where=20needed=20(Closes:=20#667425).?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug-Debian: http://bugs.debian.org/667425
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;bug=667425
+---
+ body.C | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/body.C b/body.C
+index 0e9cc1d..7e700f1 100644
+--- a/body.C
++++ b/body.C
+@@ -40,13 +40,13 @@ Body::Body(int g, int x, int y, Widget parent, Widget top)
+ {
+ int i, num_each;
+
+- pie = new (Mahjong** [xsize]);
+- initialp = new (Mahjong** [xsize]);
+- pstatus = new (unsigned char* [xsize]);
++ pie = new (Mahjong** [this->xsize]);
++ initialp = new (Mahjong** [this->xsize]);
++ pstatus = new (unsigned char* [this->xsize]);
+ for(i=0; i<xsize; i++) {
+- pie[i] = new (Mahjong* [ysize]);
+- initialp[i] = new (Mahjong* [ysize]);
+- pstatus[i] = new unsigned char [ysize];
++ pie[i] = new (Mahjong* [this->ysize]);
++ initialp[i] = new (Mahjong* [this->ysize]);
++ pstatus[i] = new unsigned char [this->ysize];
+ }
+ num_each = x*y/PKIND;
+ for(i=0; i<PKIND; i++) {
+@@ -146,13 +146,13 @@ Body::ChangeGame(int g, int x, int y)
+ delete[] initialp;
+ delete[] pstatus;
+
+- pie = new (Mahjong** [xsize]);
+- initialp = new (Mahjong** [xsize]);
+- pstatus = new (unsigned char* [xsize]);
++ pie = new (Mahjong** [this->xsize]);
++ initialp = new (Mahjong** [this->xsize]);
++ pstatus = new (unsigned char* [this->xsize]);
+ for(i=0; i<xsize; i++) {
+- pie[i] = new (Mahjong* [ysize]);
+- initialp[i] = new (Mahjong* [ysize]);
+- pstatus[i] = new unsigned char [ysize];
++ pie[i] = new (Mahjong* [this->ysize]);
++ initialp[i] = new (Mahjong* [this->ysize]);
++ pstatus[i] = new unsigned char [this->ysize];
+ }
+ num_each = x*y/PKIND;
+ for(i=0; i<PKIND; i++) {
View
45 debian/patches/0009-fix-xshisen-manpage-typos.patch
@@ -0,0 +1,45 @@
+From: "A. Costa" <agcosta@gis.net>
+Date: Wed, 25 Jan 2012 15:36:25 -0500
+Subject: fix xshisen manpage typos
+
+Bug-Debian: http://bugs.debian.org/657352
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=657352
+---
+ man/xshisen.6 | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/man/xshisen.6 b/man/xshisen.6
+index 13d87e5..f7c18e2 100644
+--- a/man/xshisen.6
++++ b/man/xshisen.6
+@@ -12,7 +12,7 @@ requires a pointing device like mouse. It cannot be controlled
+ with only keyboard.
+
+ .SH RULES
+-The game will over when you remove all the pieces on the board.
++The game will be over when you remove all the pieces on the board.
+ The pieces can be removed only when both of the following
+ conditions are true.
+
+@@ -110,9 +110,9 @@ This resource specifies the score file name. This file name must
+ not contain the directory name. Default value is "xshisen-scores".
+ .TP 8
+ .B XShisen*connectLineTime
+-The delay time in mili-second between you clicke the pair and the
+-pair is actually removed from screen. This value should be enough
+-big for beginners, but experts may want this value smaller in
++The delay time in mili-seconds between when you clicked the pair and the
++pair is actually removed from screen. This value should be big enough
++for beginners, but experts may want this value smaller in
+ order to play quickly. Default value is 1000 mili-seconds.
+ .TP 8
+ .B XShisen*connectLineColor
+@@ -172,7 +172,7 @@ button bindings with
+ \fBXShisen*drawing.translations\fR resource.
+ .TP 8
+ .B Button 1
+-Specifies the piece to remove. You can cencel the selection when
++Specifies the piece to remove. You can cancel the selection when
+ you click the selected piece again.
+ .TP 8
+ .B Button 3
View
2 debian/patches/series
@@ -5,3 +5,5 @@
0005-patch-numerous-security-holes-in-xshisen.patch
0006-Fix-format-string-use.patch
0007-Fix-version-number-in-resources.patch
+0008-Fix-FTBFS-with-gcc-4.7-by-using-this-foo-where-neede.patch
+0009-fix-xshisen-manpage-typos.patch

No commit comments for this range

Something went wrong with that request. Please try again.