debian/0000755000000000000000000000000012233267057007175 5ustar debian/menu0000644000000000000000000000014412233254024010051 0ustar ?package(xshisen):needs="X11" section="Games/Board"\ title="xshisen" command="/usr/games/xshisen" debian/control0000644000000000000000000000142312233255715010576 0ustar Source: xshisen Section: games Priority: optional Maintainer: Zak B. Elep Build-Depends: autotools-dev, debhelper (>= 9), libmotif-dev, libx11-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, xutils-dev Standards-Version: 3.9.3 Homepage: http://www.techfirm.co.jp/~masaoki/xshisen.html Vcs-Browser: https://github.com/zakame/debian-pkg-xshisen Vcs-Git: git://github.com/zakame/debian-pkg-xshisen.git Package: xshisen Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: Shisen-sho puzzle game for X11 XShisen is a puzzle game for X11. Similar to the famous "Shang-hai", your objective is to remove all the pieces on the board. . This game allows you to use either "original" xshisen images, or - at your choice - images from kshisen. debian/dirs0000644000000000000000000000010112233254024010037 0ustar etc/X11/app-defaults usr/games usr/share/games/xshisen var/games debian/README.Debian0000644000000000000000000000035112233254024011223 0ustar Note that in the Debian package of xshisen, support for system-wide score files is disabled. This was done because xshisen is not written very securely, and a system-wide score file required the program to be installed setgid games. debian/compat0000644000000000000000000000000212233254024010361 0ustar 9 debian/watch0000644000000000000000000000016712233254024010220 0ustar # Upstream website has since been removed. Contacted author about # continued maintenance; have yet to receive reply. debian/rules0000755000000000000000000000170612233255656010263 0ustar #!/usr/bin/make -f # rules --- Debian packaging rules for xshisen %: dh ${@} --with autotools_dev override_dh_auto_configure: dh_auto_configure -- --sharedstatedir="/var/games" \ --bindir="/usr/games" \ --datadir="/usr/share/games" \ --with-x11-resource=/etc/X11 \ --x-includes=/usr/X11R6/include \ --x-libraries=/usr/X11R6/lib \ --with-motif # Ensure we install xshisen with the proper permissions, remove empty # directories override_dh_auto_install: dh_auto_install -- install.man \ bindir=debian/xshisen/usr/games \ MANDIR=debian/xshisen/usr/share/man \ XSHISENDAT=debian/xshisen/var/games \ XSHISENLIB=debian/xshisen/usr/share/games/xshisen rm -rf debian/xshisen/var rm -rf debian/xshisen/etc/X11/C \ debian/xshisen/usr/share/man/C \ debian/xshisen/usr/share/man/pl # Remove extra manpages and resource files rm -rf debian/xshisen/usr/share/man/ja_* \ debian/xshisen/etc/X11/ja* \ debian/xshisen/etc/X11/pl debian/changelog0000644000000000000000000001473512233266655011064 0ustar xshisen (1:1.51-4.1) unstable; urgency=low [ Paul Gevers ] * Non-maintainer upload [ Graham Inggs ] * Build against motif (Closes: #714697) * Build using motif (Closes: #714696) -- Paul Gevers Sun, 27 Oct 2013 19:31:02 +0100 xshisen (1:1.51-4) unstable; urgency=low * Acknowledge NMUs, thanks everyone :) * New maintainer email * Standards-Version: 3.9.3 * Remove simple-patchsys.mk; use built-in quilt * Reformat debian/patches; break down oldfixes to several patches * Add watch file for uscan * Update debian/copyright for DEP-5 * 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 Mon, 09 Apr 2012 16:51:36 +0800 xshisen (1:1.51-3.2) unstable; urgency=low * Non-maintainer upload. * Fix "ftbfs with gcc-4.5 and gcc-4.6": new patch 40_format_security.patch: Fix format string use. Based on Daniel T Chen's patch in the BTS. (Closes: #565064) -- gregor herrmann Thu, 24 Nov 2011 21:40:40 +0100 xshisen (1:1.51-3.1) unstable; urgency=low * Non-maintainer upload. - Update to packaging format "3.0 (quilt)" due to patch. * debian/compat - Update to 7. * debian/control - (Build-Depends): update obsolete xutils to xutils-dev (important; Closes: #579035). Update to debhelper 7.1. - (Depends): add ${misc:Depends}. - (Homepage): Move from description field. - (Standards-Version): Update from 3.7.2 to 3.8.4. * debian/copyright: - Update layout. * debian/patches - (Number 11): Refresh patch to include .nf/.fi fix * debian/rules - (buid-stamp): use newest config.* files. - (install): Update dh_clean to dh_prep. - (clean): Fix lintian debian-rules-ignores-make-clean-error. - Update to dh(1). * debian/source/format - New file -- Jari Aalto Sun, 09 May 2010 01:03:30 +0300 xshisen (1:1.51-3) unstable; urgency=medium * debian/control: + Use lesstif2-dev . (Closes: #391164) -- Zak B. Elep Thu, 5 Oct 2006 16:37:36 +0800 xshisen (1:1.51-2) unstable; urgency=low * The "REALLY fix the weird packaging" release. * debian/control: + Bump Standards-Version (no changes required.) * debian/patches: + Update 20_autotools_update.patch , remove config.{guess,sub} hack. * debian/rules: + Properly get config.{guess,sub} , since CDBS' autotools.mk could not obtain these since we're not using them before patching. + Manually set X includes and libraries upon configure. (Closes: #367888) * Remove debian/postinst as it turns out empty upon package build. We won't miss it, anyhow ;) -- Zak B. Elep Thu, 25 May 2006 23:43:10 +0800 xshisen (1.51-1-2) unstable; urgency=low * New maintainer (as agreed with former maintainer; see http://lists.debian.org/debian-devel/2006/02/msg00007.html) * Fix strange source packaging problem (Closes: #291279) * debian/control: - Changed build system to CDBS + debhelper. - Bump Standards-Version. - Bump debhelper Build-Depends to (>= 5) ; updated compat too. - Slightly touch description; added homepage too. * debian/patches: - Added 10_oldfixes.patch . Must sort the various hunks out soon. Acknowledging NMUs . - Added 11_manpage_fixes.patch to properly format C and ja manpages. - Added 20_autotools_update.patch . * debian/rules: - Remove extra Japanese manpages as suggested by Nicolas Fran巽ois. Remove app-defaults for these extra locales too. * debian/menu: - Properly quote menu entry. -- Zak B. Elep Tue, 21 Feb 2006 22:35:26 +0800 xshisen (1.51-1-1.3) unstable; urgency=low * Non-maintainer upload to do xlibs-dev transition. * Update debian/control to not build-depend on xlibs-dev anymore. (Closes: #346854) * Fix Makefile.in to reflect GNU make behaviour change regarding line continuations and whitespace. -- Marc 'HE' Brockschmidt Thu, 19 Jan 2006 01:03:07 +0100 xshisen (1.51-1-1.2) unstable; urgency=HIGH * NMU (at maintainer's request). * Add NO_GLOBAL_HIGHSCORE define which crudely disables the support for a global score file. * Remove sgid bit. Closes: #291613, #292065 * Comment out code in postinst that set up /var/games/xshisen.scores, but for now, do not delete that file on upgrade. * Add README.Debian. -- Joey Hess Thu, 27 Jan 2005 02:42:26 -0500 xshisen (1.51-1-1.1) unstable; urgency=HIGH * NMU * Fix buffer overflow in handling of GECOS field (CAN-2005-0117) using patch from Ulf Harnhammar. Closes: #289784 -- Joey Hess Wed, 19 Jan 2005 15:16:55 -0500 xshisen (1.51-1-1) unstable; urgency=high * Non-maintainer upload with consent from Grzegorz. * Fix a locally exploitable buffer overflow allowing GID(games). (Closes: #213957) -- Steve Kemp Tue, 28 Oct 2003 13:49:29 +0000 xshisen (1.51-1) unstable; urgency=low * New upstream release. * Manual pages are now installed. Closes: #177822 -- Grzegorz Prokopski (Debian Developer) Wed, 22 Jan 2003 10:01:40 +0100 xshisen (1.50-3.1) unstable; urgency=low * Non-Maintainer-Upload during Bug Squashing Party * Added missing build dependency on xutils. Closes: #155646 * Moving X resource files from /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults in compliance with Policy, Section 12.8.6. * Hardcoded version in X resource files and commented out processing of those files by xshisen during install, as no X display is available on the buildds while autobuilding. -- Michael Banck Sun, 1 Sep 2002 13:53:23 +0200 xshisen (1.50-3) unstable; urgency=low * Moving binaries to /usr/games, static data to /usr/share/games, manual to man6 - thanks to Michal Politowski. Closes: #155329 -- Grzegorz Prokopski (Debian Developer) Sat, 3 Aug 2002 17:49:27 +0200 xshisen (1.50-2) unstable; urgency=low * Added missing build dependency on libxaw7-dev. Closes: #155286 -- Grzegorz Prokopski (Debian Developer) Sat, 3 Aug 2002 09:37:40 +0200 xshisen (1.50-1) unstable; urgency=low * Initial Release. Closes: #149222 -- Grzegorz Prokopski (Debian Developer) Tue, 30 Jul 2002 20:22:55 +0200 debian/source/0000755000000000000000000000000012233254024010463 5ustar debian/source/format0000644000000000000000000000001412233254024011671 0ustar 3.0 (quilt) debian/copyright0000644000000000000000000001010612233254024011114 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: xshisen Upstream-Contact: Masaoki Kobayashi Source: http://www.techfirm.co.jp/~masaoki/xshisen.html Files: * Copyright: Copyright 2002, 2003, Masaoki Kobayashi License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. . 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: pixmaps/s1/* Copyright: Copyright 2002, Takayuki Akiyama License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . 1. Redistributions in any types of image formats of these pixmaps must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . 2. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: pixmaps/s2/* Copyright: Copyright 2002, Mario Weilguni License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. debian/patches/0000755000000000000000000000000012233254024010612 5ustar debian/patches/0002-Manual-page-fixes.patch0000644000000000000000000001077012233254024015462 0ustar From: Jari Aalto Date: Sun, 9 May 2010 01:02:33 +0300 Subject: Manual page fixes Signed-off-by: Jari Aalto --- man/xshisen.6 | 8 ++++---- man/xshisen.6.ja | 8 ++++---- man/xshisen.6.ja_JP | 8 ++++---- man/xshisen.6.ja_JP.PCK | 6 +++--- man/xshisen.6.ja_JP.SJIS | 6 +++--- man/xshisen.6.ja_JP.eucJP | 8 ++++---- man/xshisen.6.ja_JP.ujis | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/man/xshisen.6 b/man/xshisen.6 index f5de27f..13d87e5 100644 --- a/man/xshisen.6 +++ b/man/xshisen.6 @@ -135,11 +135,11 @@ environment variable. .TP 8 .B XShisen*drawing.translations Button binding setting for your mouse. Default is -.NF +.nf - : #replace PickupPiece() \n : CancelPiece() + : #replace PickupPiece() \\n : CancelPiece() -.FI +.fi .SH MENU BAR AND KEYBOARD .TP 8 @@ -181,7 +181,7 @@ which cancels the search result. .SH AUTHORS Shisen-sho for X11: Masaoki Kobayashi -.RE + Picture: Takayuki Akiyama .SH COPYRIGHT diff --git a/man/xshisen.6.ja b/man/xshisen.6.ja index 125a0bb..22f0043 100644 --- a/man/xshisen.6.ja +++ b/man/xshisen.6.ja @@ -141,11 +141,11 @@ xshisen \- .TP 8 .B XShisen*drawing.translations マウスのボタンバインディングを変更します。デフォルトは -.NF +.nf - : #replace PickupPiece() \n : CancelPiece() + : #replace PickupPiece() \\n : CancelPiece() -.FI +.fi です。 .SH メニューバーとキー操作 @@ -192,7 +192,7 @@ xshisen \- .SH AUTHORS 四川省 for X11: 小林 正興 -.RE + 牌デザイン: 秋山 隆之 .SH COPYRIGHT diff --git a/man/xshisen.6.ja_JP b/man/xshisen.6.ja_JP index 125a0bb..22f0043 100644 --- a/man/xshisen.6.ja_JP +++ b/man/xshisen.6.ja_JP @@ -141,11 +141,11 @@ xshisen \- .TP 8 .B XShisen*drawing.translations マウスのボタンバインディングを変更します。デフォルトは -.NF +.nf - : #replace PickupPiece() \n : CancelPiece() + : #replace PickupPiece() \\n : CancelPiece() -.FI +.fi です。 .SH メニューバーとキー操作 @@ -192,7 +192,7 @@ xshisen \- .SH AUTHORS 四川省 for X11: 小林 正興 -.RE + 牌デザイン: 秋山 隆之 .SH COPYRIGHT diff --git a/man/xshisen.6.ja_JP.PCK b/man/xshisen.6.ja_JP.PCK index 432f20e..562321d 100644 --- a/man/xshisen.6.ja_JP.PCK +++ b/man/xshisen.6.ja_JP.PCK @@ -141,11 +141,11 @@ xshisen \- .TP 8 .B XShisen*drawing.translations }EX{^oCfBOXBftHg -.NF +.nf : #replace PickupPiece() \n : CancelPiece() -.FI +.fi B .SH j[o[L[ @@ -192,7 +192,7 @@ xshisen \- .SH AUTHORS l for X11: -.RE + vfUC: HR V .SH COPYRIGHT diff --git a/man/xshisen.6.ja_JP.SJIS b/man/xshisen.6.ja_JP.SJIS index 432f20e..562321d 100644 --- a/man/xshisen.6.ja_JP.SJIS +++ b/man/xshisen.6.ja_JP.SJIS @@ -141,11 +141,11 @@ xshisen \- .TP 8 .B XShisen*drawing.translations }EX{^oCfBOXBftHg -.NF +.nf : #replace PickupPiece() \n : CancelPiece() -.FI +.fi B .SH j[o[L[ @@ -192,7 +192,7 @@ xshisen \- .SH AUTHORS l for X11: -.RE + vfUC: HR V .SH COPYRIGHT diff --git a/man/xshisen.6.ja_JP.eucJP b/man/xshisen.6.ja_JP.eucJP index 125a0bb..22f0043 100644 --- a/man/xshisen.6.ja_JP.eucJP +++ b/man/xshisen.6.ja_JP.eucJP @@ -141,11 +141,11 @@ xshisen \- .TP 8 .B XShisen*drawing.translations マウスのボタンバインディングを変更します。デフォルトは -.NF +.nf - : #replace PickupPiece() \n : CancelPiece() + : #replace PickupPiece() \\n : CancelPiece() -.FI +.fi です。 .SH メニューバーとキー操作 @@ -192,7 +192,7 @@ xshisen \- .SH AUTHORS 四川省 for X11: 小林 正興 -.RE + 牌デザイン: 秋山 隆之 .SH COPYRIGHT diff --git a/man/xshisen.6.ja_JP.ujis b/man/xshisen.6.ja_JP.ujis index 125a0bb..22f0043 100644 --- a/man/xshisen.6.ja_JP.ujis +++ b/man/xshisen.6.ja_JP.ujis @@ -141,11 +141,11 @@ xshisen \- .TP 8 .B XShisen*drawing.translations マウスのボタンバインディングを変更します。デフォルトは -.NF +.nf - : #replace PickupPiece() \n : CancelPiece() + : #replace PickupPiece() \\n : CancelPiece() -.FI +.fi です。 .SH メニューバーとキー操作 @@ -192,7 +192,7 @@ xshisen \- .SH AUTHORS 四川省 for X11: 小林 正興 -.RE + 牌デザイン: 秋山 隆之 .SH COPYRIGHT debian/patches/0001-Makefile-and-polish-resource-fixes.patch0000644000000000000000000001120712233254024020724 0ustar From: "Grzegorz Prokopski (Debian Developer)" Date: Tue, 30 Jul 2002 20:22:55 +0200 Subject: Makefile and polish resource fixes --- Makefile.in | 21 ++++++++++++--------- lang/XShisen.ad.pl | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Makefile.in b/Makefile.in index 330e7ae..676d05d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,14 +57,15 @@ install-prog: $(PROGS) @chmod 755 $(bindir) $(INSTALLP) $(PROGS) $(bindir)/$(PROGS) @echo "XShisen data directory is " $(XSHISENLIB) - @$(MKDIR) $(XSHISENDAT) - @chmod 755 $(XSHISENDAT) + @echo "XShisen higscore/shared data directory is " $(XSHISENDAT) + #@$(MKDIR) $(XSHISENDAT) + #@chmod 755 $(XSHISENDAT) @if [ -f $(XSHISENDAT)/$(SCF) ]; then \ echo "Old high-score file exists."; \ - else\ + else \ $(INSTALL) -m 0666 $(SCF) $(XSHISENDAT)/$(SCF); \ fi - @$(MKDIR) $(XSHISENLIB) + ## @$(MKDIR) $(XSHISENLIB) @set -x; \ for dir in pixmaps/s?; do \ dn=`basename $$dir`; \ @@ -76,6 +77,7 @@ install-prog: $(PROGS) done install-resource: $(AD) + echo destdir $(DESTDIR) $(MKDIR) $(DESTDIR)$(XAD_DIR)/app-defaults $(INSTALLD) $(AD) $(DESTDIR)$(XAD_DIR)/app-defaults/$(class_name) -[ -n $(LANG) ] && $(MKDIR) $(DESTDIR)$(XAD_DIR)/$(LANG)/app-defaults @@ -105,11 +107,12 @@ distclean: clean $(AD): $(exec_name) lang/XShisen.ad -$(MKDIR) work - $(CODECONV) < lang/XShisen.ad > $(AD) - -@set -x; \ - for lang in $(LANGS); do \ - $(CODECONV) < lang/XShisen.ad.$$lang > $(AD).$$lang; \ - done + cp lang/* work + #$(CODECONV) < lang/XShisen.ad > $(AD) + #-@set -x; \ + #for lang in $(LANGS); do \ + #$(CODECONV) < lang/XShisen.ad.$$lang > $(AD).$$lang; \ + #done .SUFFIXES: .C .C.o: diff --git a/lang/XShisen.ad.pl b/lang/XShisen.ad.pl index b57116d..9336d03 100644 --- a/lang/XShisen.ad.pl +++ b/lang/XShisen.ad.pl @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: Shisen-sho dla X11 wersja XSHISEN_VERSION\n\n\ +XShisen*aboutString: Shisen-sho dla X11 wersja 1.50\n\n\ Shisen-sho dla X11 autorstwa Masaoki Kobayashi \n\ Shisen-sho dla Win autorstwa Shinji Ono \n\ Grafika(kafle) autorstwa Takayuki Akiyama @@ -14,7 +14,7 @@ XShisen*score*strPeriod: W ostatnich %d dniach XShisen*score*strPlayed: Rozegranych XShisen*score*strCompleted: Ukoczonych XShisen*score*strTedumari: Zablokowanych -XShisen*score*strSearched: Search used +XShisen*score*strSearched: Podpowiedzianych XShisen*score*strGames: gier XShisen*score*strAverage: rednio XShisen*score*strTotal: Wszystkich @@ -46,7 +46,7 @@ XShisen*mb.button_1.labelString: Operacje XShisen*mb.button_1.mnemonic: O XShisen*mb.button_2.labelString: Konfiguracja XShisen*mb.button_2.mnemonic: C -XShisen*mb.button_3.labelString: Picture +XShisen*mb.button_3.labelString: Kafle XShisen*mb.button_3.mnemonic: P XShisen*pd0.button_0.labelString: Start XShisen*pd0.button_0.mnemonic: D @@ -87,10 +87,10 @@ XShisen*pd1.button_1.acceleratorText: F5 XShisen*pd2.button_0.labelString: Normalne (18x 8) XShisen*pd2.button_1.labelString: Due (24x12) XShisen*pd2.button_2.labelString: Ogromne (36x16) -XShisen*pd2.button_3.labelString: Click Trial +XShisen*pd2.button_3.labelString: Szybkie klikanie XShisen*pd2.button_4.labelString: Grawitacja -XShisen*pd3.button_0.labelString: Picture#1 -XShisen*pd3.button_1.labelString: Picture#2 +XShisen*pd3.button_0.labelString: Zestaw 1 +XShisen*pd3.button_1.labelString: Zestaw 2 XShisen*drawing.translations: #replace : PickupPiece()\n\ (2): menu(0,0)\n\ : CancelPiece() @@ -118,7 +118,7 @@ XShisen*mdialog.cancel_button.label: Zaniechaj XShisen*mb.pd0.label: Gra XShisen*mb.pd1.label: Operacje XShisen*mb.pd2.label: Konfiguracja -XShisen*mb.pd3.label: Picture +XShisen*mb.pd3.label: Kafle XShisen*pd0*button_0.label: Start Ctrl-D XShisen*pd0*button_1.label: Restart Ctrl-R XShisen*pd0*button_2.label: Pauza Ctrl-P @@ -131,10 +131,10 @@ XShisen*pd1*button_1.label: Cofnij F5 XShisen*pd2*button_0.label: Normalne (18x 8) XShisen*pd2*button_1.label: Due (24x12) XShisen*pd2*button_2.label: Ogromne (36x16) -XShisen*pd2*button_3.label: Click Trial +XShisen*pd2*button_3.label: Szybkie klikanie XShisen*pd2*button_4.label: Grawitacja -XShisen*pd3*button_0.label: Picture#1 -XShisen*pd3*button_1.label: Picture#2 +XShisen*pd3*button_0.label: Zestaw 1 +XShisen*pd3*button_1.label: Zestaw 2 XShisen*sform*translations: #replace : PickupPiece()\n\ (2): menu(0,0)\n\ : CancelPiece()\n\ debian/patches/0009-fix-xshisen-manpage-typos.patch0000644000000000000000000000332712233254024017255 0ustar From: "A. Costa" 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 debian/patches/0008-Fix-FTBFS-with-gcc-4.7-by-using-this-foo-where-neede.patch0000644000000000000000000000420612233254024023272 0ustar From: Cyril Brulebois 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; iysize]); + initialp[i] = new (Mahjong* [this->ysize]); + pstatus[i] = new unsigned char [this->ysize]; } num_each = x*y/PKIND; for(i=0; ixsize]); + initialp = new (Mahjong** [this->xsize]); + pstatus = new (unsigned char* [this->xsize]); for(i=0; iysize]); + initialp[i] = new (Mahjong* [this->ysize]); + pstatus[i] = new unsigned char [this->ysize]; } num_each = x*y/PKIND; for(i=0; i Date: Thu, 24 Nov 2011 21:40:40 +0100 Subject: Fix format string use Origin: vendor Bug-Debian: http://bugs.debian.org/565064 Forwarded: no Last-Update: 2011-11-24 --- score.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/score.C b/score.C index 928324a..9e3d4b0 100644 --- a/score.C +++ b/score.C @@ -337,7 +337,7 @@ Score::DisplayScore(int kind_of_game) } // Always read the latest high score readfile(); - sprintf(format, res_strings[0]); + sprintf(format, "%s", res_strings[0]); prev_time = -1; for(int i=0; i Date: Mon, 9 Apr 2012 15:39:08 +0800 Subject: Fix version number in resources Origin: vendor --- lang/XShisen.ad | 2 +- lang/XShisen.ad.ja | 2 +- lang/XShisen.ad.ja_JP | 2 +- lang/XShisen.ad.ja_JP.JIS7 | 2 +- lang/XShisen.ad.ja_JP.PCK | 2 +- lang/XShisen.ad.ja_JP.SJIS | 2 +- lang/XShisen.ad.ja_JP.eucJP | 2 +- lang/XShisen.ad.ja_JP.ujis | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lang/XShisen.ad b/lang/XShisen.ad index 4e6fea7..c68023a 100644 --- a/lang/XShisen.ad +++ b/lang/XShisen.ad @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: Shisen-sho for X11 ver XSHISEN_VERSION\n\n\ +XShisen*aboutString: Shisen-sho for X11 ver 1.51\n\n\ Shisen-sho for X11 by Masaoki Kobayashi \n\ Shisen-sho for Win by Shinji Ono \n\ Picture by Takayuki Akiyama diff --git a/lang/XShisen.ad.ja b/lang/XShisen.ad.ja index 4519074..9b66542 100644 --- a/lang/XShisen.ad.ja +++ b/lang/XShisen.ad.ja @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: 四川省 for X11 Ver XSHISEN_VERSION\n\n\ +XShisen*aboutString: 四川省 for X11 Ver 1.51\n\n\ 四川省 for X11 by 小林 正興 \n\ 四川省 for Win by 小野 晋二 \n\ 牌デザイン by 秋山 隆之 diff --git a/lang/XShisen.ad.ja_JP b/lang/XShisen.ad.ja_JP index 4519074..9b66542 100644 --- a/lang/XShisen.ad.ja_JP +++ b/lang/XShisen.ad.ja_JP @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: 四川省 for X11 Ver XSHISEN_VERSION\n\n\ +XShisen*aboutString: 四川省 for X11 Ver 1.51\n\n\ 四川省 for X11 by 小林 正興 \n\ 四川省 for Win by 小野 晋二 \n\ 牌デザイン by 秋山 隆之 diff --git a/lang/XShisen.ad.ja_JP.JIS7 b/lang/XShisen.ad.ja_JP.JIS7 index 19ac530..83bdeb5 100644 --- a/lang/XShisen.ad.ja_JP.JIS7 +++ b/lang/XShisen.ad.ja_JP.JIS7 @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: $B;M@n>J(B for X11 Ver XSHISEN_VERSION\n\n\ +XShisen*aboutString: $B;M@n>J(B for X11 Ver 1.51\n\n\ $B;M@n>J(B for X11 by $B>.NS(B $B@56=(B \n\ $B;M@n>J(B for Win by $B>.Ln(B $B?8Fs(B \n\ $BGW%G%6%$%s(B by $B=);3(B $BN4G7(B diff --git a/lang/XShisen.ad.ja_JP.PCK b/lang/XShisen.ad.ja_JP.PCK index 418e4d7..a47ca8d 100644 --- a/lang/XShisen.ad.ja_JP.PCK +++ b/lang/XShisen.ad.ja_JP.PCK @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: l for X11 Ver XSHISEN_VERSION\n\n\ +XShisen*aboutString: l for X11 Ver 1.51\n\n\ l for X11 by \n\ l for Win by W \n\ vfUC by HR V diff --git a/lang/XShisen.ad.ja_JP.SJIS b/lang/XShisen.ad.ja_JP.SJIS index 418e4d7..a47ca8d 100644 --- a/lang/XShisen.ad.ja_JP.SJIS +++ b/lang/XShisen.ad.ja_JP.SJIS @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: l for X11 Ver XSHISEN_VERSION\n\n\ +XShisen*aboutString: l for X11 Ver 1.51\n\n\ l for X11 by \n\ l for Win by W \n\ vfUC by HR V diff --git a/lang/XShisen.ad.ja_JP.eucJP b/lang/XShisen.ad.ja_JP.eucJP index 4519074..9b66542 100644 --- a/lang/XShisen.ad.ja_JP.eucJP +++ b/lang/XShisen.ad.ja_JP.eucJP @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: 四川省 for X11 Ver XSHISEN_VERSION\n\n\ +XShisen*aboutString: 四川省 for X11 Ver 1.51\n\n\ 四川省 for X11 by 小林 正興 \n\ 四川省 for Win by 小野 晋二 \n\ 牌デザイン by 秋山 隆之 diff --git a/lang/XShisen.ad.ja_JP.ujis b/lang/XShisen.ad.ja_JP.ujis index 4519074..9b66542 100644 --- a/lang/XShisen.ad.ja_JP.ujis +++ b/lang/XShisen.ad.ja_JP.ujis @@ -1,7 +1,7 @@ ! Common resources XShisen*connectLineColor: blue XShisen*connectLineTime: 1000 -XShisen*aboutString: 四川省 for X11 Ver XSHISEN_VERSION\n\n\ +XShisen*aboutString: 四川省 for X11 Ver 1.51\n\n\ 四川省 for X11 by 小林 正興 \n\ 四川省 for Win by 小野 晋二 \n\ 牌デザイン by 秋山 隆之 debian/patches/0004-xshisen-buffer-overflow-when-handling-GECOS-field.patch0000644000000000000000000000175512233254024023455 0ustar From: Ulf Harnhammar Date: Tue, 11 Jan 2005 01:18:00 +0100 Subject: xshisen: buffer overflow when handling GECOS field Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=289784 Bug-Debian: http://bugs.debian.org/289784 --- score.C | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/score.C b/score.C index 9af95d6..c87470f 100644 --- a/score.C +++ b/score.C @@ -372,12 +372,13 @@ Score::Register(void) 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; s1 = scoreToRegister / 1000; ms_to_hms(scoreToRegister, h, m, s); pw = getpwuid(getuid()); - strcpy(gecos, pw->pw_gecos); + strncpy(gecos, pw->pw_gecos, sizeof(gecos)); + gecos[sizeof(gecos) - 1] = '\0'; if ((po = strchr(gecos, ',')) != NULL) *po = 0; sprintf(namebuf, "%-8.8s (%s)", pw->pw_name, gecos); debian/patches/0003-xshisen-allows-local-user-to-gain-GID-games.patch0000644000000000000000000000223512233254024022270 0ustar From: Steve Kemp Date: Fri, 3 Oct 2003 16:17:58 +0100 Subject: xshisen allows local user to gain GID(games); Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=213957 Bug-Debian: http://bugs.debian.org/213957 --- main.C | 2 +- readxpm.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.C b/main.C index afa888e..2669f6f 100644 --- a/main.C +++ b/main.C @@ -210,7 +210,7 @@ kanjiconvert(const char *operation) char buffer[100], *p; char *(*codeconv)(const char*); - strcpy(buffer, operation); + strncpy(buffer, operation,sizeof(buffer)-1); if (strchr(buffer, '-') == NULL) { strcat(buffer, "-" KANJICODE); } diff --git a/readxpm.C b/readxpm.C index ba8305b..5737cf4 100644 --- a/readxpm.C +++ b/readxpm.C @@ -12,7 +12,7 @@ InitGlobalMahjong(Widget w, const char *directory, const char *subdir) char buffer[1024]; for(int i=0; i Date: Thu, 27 Jan 2005 03:05:30 -0500 Subject: patch numerous security holes in xshisen Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=55;bug=292065 Bug-Debian: http://bugs.debian.org/292065 --- Makefile.in | 2 +- main.C | 5 +++++ menubar.C | 5 +++++ score.C | 3 +++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 676d05d..cfca3ad 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ class_name = XShisen XSHISENLIB = @datadir@/xshisen XSHISENDAT = @sharedstatedir@ -CXXFLAGS = @CXXFLAGS@ +CXXFLAGS = @CXXFLAGS@ -DNO_GLOBAL_HIGHSCORE CPPFLAGS = $(CPPOPTS) @CPPFLAGS@ CPPOPTS = LDFLAGS = @LDFLAGS@ diff --git a/main.C b/main.C index 2669f6f..7ba1fbd 100644 --- a/main.C +++ b/main.C @@ -351,6 +351,7 @@ main(int argc, char **argv) delete[] scorefile; if (globRes.scoreOnly) { +#ifndef NO_GLOBAL_HIGHSCORE sc->DisplayScore(initial_game_state); #if USE_MOTIF XtAddCallback(*sc, XmNokCallback, (XtCallbackProc)ExitCB, NULL); @@ -358,6 +359,10 @@ main(int argc, char **argv) XtAddCallback(XtNameToWidget(*sc, "*ok_button"), XtNcallback, (XtCallbackProc)ExitCB, NULL); #endif +#else /* NO_GLOBAL_HIGHSCORE */ + fprintf(stderr, "System score files not enabled.\n"); + exit(1); +#endif /* NO_GLOBAL_HIGHSCORE */ } else { GetGameSize(initial_game_state, num_piece_x, num_piece_y); diff --git a/menubar.C b/menubar.C index 02e4cd9..a738a16 100644 --- a/menubar.C +++ b/menubar.C @@ -158,8 +158,13 @@ MenuBar::MenuBar(Widget parent, int radio_selection, int other_mode, int pixmap_ (XtCallbackProc)GameCB, (XtPointer)1); XtAddCallback(XtNameToWidget(menushell0, "button_2"), XtNcallback, (XtCallbackProc)GameCB, (XtPointer)2); +#ifdef NO_GLOBAL_HIGHSCORE + XtVaSetValues(XtNameToWidget(menushell0, "button_3"), XtNsensitive, + False, NULL); +#else XtAddCallback(XtNameToWidget(menushell0, "button_3"), XtNcallback, (XtCallbackProc)GameCB, (XtPointer)3); +#endif XtAddCallback(XtNameToWidget(menushell0, "button_4"), XtNcallback, (XtCallbackProc)GameCB, (XtPointer)4); XtAddCallback(XtNameToWidget(menushell0, "button_5"), XtNcallback, diff --git a/score.C b/score.C index c87470f..928324a 100644 --- a/score.C +++ b/score.C @@ -374,6 +374,8 @@ Score::Register(void) struct passwd *pw; 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()); @@ -425,6 +427,7 @@ Score::Register(void) sprintf(rec[i].time, "%2.2d:%2.2d:%2.2d", tp->tm_hour, tp->tm_min, tp->tm_sec); if (writefile() == 0) DisplayScore(game); +#endif /* NO_GLOBAL_HIGHSCORE */ } void