r15984 - in packages/trunk/morris/debian: . patches source
Markus Koschany
apo at moszumanska.debian.org
Wed Jul 19 13:32:37 UTC 2017
Author: apo
Date: 2017-07-19 13:32:37 +0000 (Wed, 19 Jul 2017)
New Revision: 15984
Removed:
packages/trunk/morris/debian/README.source
packages/trunk/morris/debian/morris.menu
packages/trunk/morris/debian/morris.xpm
Modified:
packages/trunk/morris/debian/changelog
packages/trunk/morris/debian/compat
packages/trunk/morris/debian/control
packages/trunk/morris/debian/copyright
packages/trunk/morris/debian/docs
packages/trunk/morris/debian/morris.6
packages/trunk/morris/debian/morris.desktop
packages/trunk/morris/debian/morris.install
packages/trunk/morris/debian/morris.manpages
packages/trunk/morris/debian/morris.png
packages/trunk/morris/debian/patches/build.patch
packages/trunk/morris/debian/patches/i18n_es.patch
packages/trunk/morris/debian/rules
packages/trunk/morris/debian/source/options
Log:
Release morris 0.2-3
Deleted: packages/trunk/morris/debian/README.source
===================================================================
--- packages/trunk/morris/debian/README.source 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/README.source 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1 +0,0 @@
-See /usr/share/doc/quilt/README.source
Modified: packages/trunk/morris/debian/changelog
===================================================================
--- packages/trunk/morris/debian/changelog 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/changelog 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1,3 +1,26 @@
+morris (0.2-3) unstable; urgency=medium
+
+ * Team upload.
+ * Drop deprecated menu file and xpm icon.
+ * Switch to compat level 10.
+ * wrap-and-sort -sa.
+ * Remove autoconf and automake from Build-Depends.
+ These are all packages that are automatically installed.
+ * Vcs-Browser: Use secure connection.
+ * Declare compliance with Debian Policy 4.0.0.
+ * Drop morris-dbg in favor of the automatic -dbgsym package.
+ * Remove README.source because we use quilt by default now.
+ * Use https for Format field.
+ * morris.desktop: Translate the Name into German too.
+ Thanks to Ronny Standtke for the report. (Closes: #721834)
+ * morris.desktop: Change the category to BoardGame.
+ Thanks to Xavier Brochard for the report. (Closes: #862224)
+ * d/rules: define DATADIRHOME explicitly because the variable was undefined
+ on my system.
+ * Fix Lintian warning spelling-error-in-manpage.
+
+ -- Markus Koschany <apo at debian.org> Wed, 19 Jul 2017 13:42:01 +0200
+
morris (0.2-2) unstable; urgency=medium
* Team upload.
@@ -9,7 +32,7 @@
[ Jackson Doak ]
* debian/rules: include /usr/share/dpkg/default.mk and
- add --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+ add --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
to configure. Fixes FTBFS (Closes: #741751)
[ Logan Rosen ]
Modified: packages/trunk/morris/debian/compat
===================================================================
--- packages/trunk/morris/debian/compat 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/compat 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1 +1 @@
-9
+10
Modified: packages/trunk/morris/debian/control
===================================================================
--- packages/trunk/morris/debian/control 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/control 2017-07-19 13:32:37 UTC (rev 15984)
@@ -2,35 +2,37 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <miriam at debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev, quilt,
- intltool, automake, autoconf, libtool,
- libglib2.0-dev, libgtk2.0-dev, libcairo2-dev, libfreetype6-dev,
- libboost-signals-dev, libgconf2-dev
-Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 3.9.5
+Uploaders:
+ Miriam Ruiz <miriam at debian.org>
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 10),
+ intltool,
+ libboost-signals-dev,
+ libcairo2-dev,
+ libfreetype6-dev,
+ libgconf2-dev,
+ libglib2.0-dev,
+ libgtk2.0-dev,
+ libtool,
+ quilt
+Build-Conflicts:
+ autoconf2.13,
+ automake1.4
+Standards-Version: 4.0.0
Homepage: http://nine-mens-morris.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/morris/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/morris/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/morris/
Package: morris
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: morris-dbg (= ${binary:Version})
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Nine men's morris game
Morris is an implementation of the board game "Nine Men's Morris".
Sometimes simply called Mills, Morris, Merrills, or Mühle in German.
This implementation supports not only the standard game, but also
- several rule-variants and different boards. The game supports a
+ several rule-variants and different boards. The game supports a
strong computer player which learns from past games played.
-Package: morris-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: morris (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Nine men's morris game - debug
- Morris is an implementation of the board game "Nine Men's Morris".
- Sometimes simply called Mills, Morris, Merrills, or Mühle in German.
- .
- This package contains the debugging symbols.
Modified: packages/trunk/morris/debian/copyright
===================================================================
--- packages/trunk/morris/debian/copyright 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/copyright 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: morris
Upstream-Contact: Dirk Farin <dirk.farin at gmx.de>
Source: http://nine-mens-morris.net/downloads.html
Modified: packages/trunk/morris/debian/docs
===================================================================
--- packages/trunk/morris/debian/docs 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/docs 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1 +1 @@
-README
\ No newline at end of file
+README
Modified: packages/trunk/morris/debian/morris.6
===================================================================
--- packages/trunk/morris/debian/morris.6 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/morris.6 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1,4 +1,4 @@
-.\"
+.\"
.TH "morris" "6" "0.2" "" "Games"
.SH "NAME"
morris \- Nine Men's Morris game for the Gnome desktop
@@ -7,11 +7,11 @@
.SH "DESCRIPTION"
Morris is an implementation of the board game "Nine Men's Morris". Other names for this game are: Mills, Merrills, Morris, or Mühle in German. Nine Men's Morris, being probably 2000-3000 years old, appears to be one of the oldest board games, much older than chess. From the 12th to the 18th century, Nine Men's Morris was one of the most popular board games in Europe. However, it is still actively played today and exists in several variants, e.g., Morabaraba, which is particularly popular in South Africa.
-This implementation of Nine Men's Morris supports not only the standard game, but also several rule-variants and different board layouts. You can play against the computer, or simply use the program to present the board, but play against another human opponent. The computer opponent learns from previous games and tries not to make the same mistake twice. This ensures enough variation in game-play, should you once have managed to beat the program.
+This implementation of Nine Men's Morris supports not only the standard game, but also several rule-variants and different board layouts. You can play against the computer, or simply use the program to present the board, but play against another human opponent. The computer opponent learns from previous games and tries not to make the same mistake twice. This ensures enough variation in game-play, should you once have managed to beat the program.
.SH "FEATURES"
.P
-Among others, the game plays the following variants:
+Among others, the game plays the following variants:
.TP
- Lasker variant (moves are also allowed in the set-phase)
.TP
@@ -29,7 +29,7 @@
.TP
- Tapatan, Achi, Nine Holes
.P
-Furthermore, the game supports:
+Furthermore, the game supports:
.TP
- Advanced AI controls to tweak AI playing style
.TP
@@ -51,21 +51,21 @@
Each player has nine pieces (hence the name, Nine Men's Morris) which are placed and moved on the line crossings of the board. Whenever three pieces of the same color are placed in a straight row, a mill is closed and one opponent piece may be removed. The goal of the game is to reduce the opponent to only two pieces (such that he cannot form a mill anymore), or to surround the opponent pieces in such a way that there are no valid moves for the opponent.
-The game proceeds in three distinct phases (opening, midgame, and endgame). Unlike chess, these phases are distinguished by special rules for each phase.
+The game proceeds in three distinct phases (opening, midgame, and endgame). Unlike chess, these phases are distinguished by special rules for each phase.
.TP
.B Opening - Setting pieces
-The white player begins. Each player places one piece on an unoccupied position on the board in turns. If a mill is closed by setting a piece, the player may take one of the opponent's pieces. Once all pieces are set, the midgame starts.
+The white player begins. Each player places one piece on an unoccupied position on the board in turns. If a mill is closed by setting a piece, the player may take one of the opponent's pieces. Once all pieces are set, the midgame starts.
.PP
.TP
.B Midgame - Moving pieces
-Each player moves one piece along the lines to a free, neighboring position. Again, if the move results in closing a mill, one of the opponent's pieces may be removed. Note that a player must move a piece in each turn. If there is no legal move, the player has lost.
+Each player moves one piece along the lines to a free, neighboring position. Again, if the move results in closing a mill, one of the opponent's pieces may be removed. Note that a player must move a piece in each turn. If there is no legal move, the player has lost.
.PP
.TP
.B Endgame - Flying
-If a player has only three pieces left, he my jump (or fly) with one piece to any unoccupied position instead of moving only along the board lines.
+If a player has only three pieces left, he my jump (or fly) with one piece to any unoccupied position instead of moving only along the board lines.
.PP
.SH "RULE DETAILS AND GAME VARIATIONS"
@@ -74,7 +74,8 @@
.TP
.B Taking from opponent mills
-When a mill is closed, one opponent stone may be taken. However, usually, it is not allowed to take a piece from an opponent's mill, if he still has pieces that are not part of a mill. If you want, you can also allow to take pieces from an opponent's mill. Note that you can always take pieces from an opponent's mill, if all of his pieces are within mills.
+When a mill is closed, one opponent stone may be taken. However, usually, it is
+not allowed to take a piece from an opponent's mill, if he still has pieces that are not part of a mill. If you want, you can also allow players to take pieces from an opponent's mill. Note that you can always take pieces from an opponent's mill, if all of his pieces are within mills.
.PP
.TP
@@ -94,7 +95,7 @@
.TP
.B Remis
-If the same board situation appeared for N times (with N usually 3), the game is declared remis.
+If the same board situation appeared for N times (with N usually 3), the game is declared remis.
.PP
.SH "AI ALGORITHM"
Modified: packages/trunk/morris/debian/morris.desktop
===================================================================
--- packages/trunk/morris/debian/morris.desktop 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/morris.desktop 2017-07-19 13:32:37 UTC (rev 15984)
@@ -4,8 +4,9 @@
Exec=morris
Icon=morris
Type=Application
-Categories=Game;LogicGame;
+Categories=Game;BoardGame;
Name=Morris
+Name[de]=Mühle
Name[es]=Molino
Comment=Nine Men's Morris Game
Comment[es]=Juego del Molino
Modified: packages/trunk/morris/debian/morris.install
===================================================================
--- packages/trunk/morris/debian/morris.install 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/morris.install 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1,3 +1,2 @@
-debian/*.xpm usr/share/pixmaps/
-debian/*.png usr/share/pixmaps/
debian/*.desktop usr/share/applications/
+debian/*.png usr/share/pixmaps/
Modified: packages/trunk/morris/debian/morris.manpages
===================================================================
--- packages/trunk/morris/debian/morris.manpages 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/morris.manpages 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1 +1 @@
-debian/morris.6
\ No newline at end of file
+debian/morris.6
Deleted: packages/trunk/morris/debian/morris.menu
===================================================================
--- packages/trunk/morris/debian/morris.menu 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/morris.menu 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1 +0,0 @@
-?package(morris):needs="x11" section="Games/Puzzles" title="Morris" command="/usr/games/morris" icon="/usr/share/pixmaps/morris.xpm"
Modified: packages/trunk/morris/debian/morris.png
===================================================================
(Binary files differ)
Deleted: packages/trunk/morris/debian/morris.xpm
===================================================================
--- packages/trunk/morris/debian/morris.xpm 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/morris.xpm 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1,433 +0,0 @@
-/* XPM */
-static char * morris_xpm[] = {
-"32 32 398 2",
-" c #C5B353",
-". c #C6B251",
-"+ c #C6B353",
-"@ c #C6B351",
-"# c #C6B352",
-"$ c #C5B251",
-"% c #C3B35B",
-"& c #C2B35B",
-"* c #BFAE4F",
-"= c #BEAD4F",
-"- c #C0AE51",
-"; c #C1AF51",
-"> c #C0AF51",
-", c #BFAD4F",
-"' c #BFAE50",
-") c #C0B15A",
-"! c #C3B45E",
-"~ c #C0AF50",
-"{ c #BFAD50",
-"] c #C1AF52",
-"^ c #BFB058",
-"/ c #C5B55E",
-"( c #C6B252",
-"_ c #BCAF5F",
-": c #B7AB5A",
-"< c #BBAB4F",
-"[ c #BDAD51",
-"} c #B9A94E",
-"| c #B8A94E",
-"1 c #BBAB50",
-"2 c #BCAC50",
-"3 c #B8A84D",
-"4 c #B9AB4F",
-"5 c #BBAA4E",
-"6 c #B5AB5B",
-"7 c #B8AD5E",
-"8 c #BCAC4F",
-"9 c #BCAC51",
-"0 c #B9AA4E",
-"a c #BBAC50",
-"b c #B7A84D",
-"c c #BAAB4F",
-"d c #BBAA4F",
-"e c #B5A959",
-"f c #BDB160",
-"g c #BDAD50",
-"h c #C2B152",
-"i c #C7B453",
-"j c #C7B353",
-"k c #C8B453",
-"l c #C1B051",
-"m c #BEAE50",
-"n c #CAB755",
-"o c #CCB955",
-"p c #CBB855",
-"q c #C5B252",
-"r c #BEAC4F",
-"s c #BDAD4E",
-"t c #C4B14E",
-"u c #C4B04E",
-"v c #C5B14F",
-"w c #CBB755",
-"x c #907F3C",
-"y c #503A25",
-"z c #806D36",
-"A c #C8B553",
-"B c #C9B75D",
-"C c #DBD6A8",
-"D c #DBD4A6",
-"E c #C9B75B",
-"F c #C5B250",
-"G c #D7CC8F",
-"H c #DED9B2",
-"I c #D0C174",
-"J c #BFAF51",
-"K c #BAAA4E",
-"L c #BEAD50",
-"M c #C8B554",
-"N c #40311C",
-"O c #271311",
-"P c #2B161A",
-"Q c #B2A24B",
-"R c #B9AA4F",
-"S c #BAAB4E",
-"T c #CDC589",
-"U c #ECEAD8",
-"V c #E5E4D0",
-"W c #CFC586",
-"X c #BAAA4F",
-"Y c #C0B35F",
-"Z c #E9E7D3",
-"` c #E3E0C8",
-" . c #E3DDB7",
-".. c #C4B04D",
-"+. c #BEAE51",
-"@. c #CAB754",
-"#. c #6D5733",
-"$. c #250F12",
-"%. c #483422",
-"&. c #C1B052",
-"*. c #C0B052",
-"=. c #CEC178",
-"-. c #EDEBD7",
-";. c #ECEAD5",
-">. c #CDBE70",
-",. c #C4B256",
-"'. c #E8E5C9",
-"). c #EBEAD8",
-"!. c #DFD5A0",
-"~. c #C3B04D",
-"{. c #B6A64A",
-"]. c #C9B654",
-"^. c #A79849",
-"/. c #C2B051",
-"(. c #BCAD55",
-"_. c #BDAE56",
-":. c #C5B253",
-"<. c #C4B253",
-"[. c #C0B360",
-"}. c #C5B150",
-"|. c #BAAA4C",
-"1. c #B8A94C",
-"2. c #C0AF52",
-"3. c #BDAE52",
-"4. c #C3B252",
-"5. c #C8B454",
-"6. c #C3B151",
-"7. c #C7B553",
-"8. c #C3B152",
-"9. c #BAAB50",
-"0. c #BDAE51",
-"a. c #BAAA50",
-"b. c #3E2E1B",
-"c. c #240E13",
-"d. c #837038",
-"e. c #BCAD53",
-"f. c #BFAF55",
-"g. c #C4B252",
-"h. c #C4B356",
-"i. c #C6B354",
-"j. c #BAAC50",
-"k. c #BFAE51",
-"l. c #BCAB4E",
-"m. c #B5A54B",
-"n. c #B8A54C",
-"o. c #17080C",
-"p. c #271613",
-"q. c #4B3725",
-"r. c #BAAD51",
-"s. c #B6A74C",
-"t. c #B4AB61",
-"u. c #B9AF65",
-"v. c #B8A94F",
-"w. c #B5A74C",
-"x. c #B7B06B",
-"y. c #C4B359",
-"z. c #C6B253",
-"A. c #B2A44A",
-"B. c #B7A74C",
-"C. c #B6A74D",
-"D. c #C3B153",
-"E. c #C8B654",
-"F. c #705935",
-"G. c #473321",
-"H. c #998542",
-"I. c #BDAC4F",
-"J. c #BCAD51",
-"K. c #B8A84C",
-"L. c #B5A64A",
-"M. c #C3B051",
-"N. c #B9A94F",
-"O. c #C3B052",
-"P. c #BDAC4E",
-"Q. c #B9AA4D",
-"R. c #B7A44C",
-"S. c #83723B",
-"T. c #AB9947",
-"U. c #CBBC6B",
-"V. c #CDC483",
-"W. c #C8B559",
-"X. c #B8A64C",
-"Y. c #84743B",
-"Z. c #A79746",
-"`. c #CBBB68",
-" + c #CEC484",
-".+ c #C8B65B",
-"++ c #C4B151",
-"@+ c #968341",
-"#+ c #8F7E3D",
-"$+ c #BCAF59",
-"%+ c #BEB15A",
-"&+ c #C2B052",
-"*+ c #4C3D20",
-"=+ c #210B10",
-"-+ c #3C271F",
-";+ c #C3B359",
-">+ c #E7E5CB",
-",+ c #E4E3D0",
-"'+ c #DFD6A6",
-")+ c #534423",
-"!+ c #200B10",
-"~+ c #3A251F",
-"{+ c #C2B157",
-"]+ c #E7E5CA",
-"^+ c #E4E3D1",
-"/+ c #DED7A9",
-"(+ c #C1AF4E",
-"_+ c #8E7D3C",
-":+ c #1A070B",
-"<+ c #2B1418",
-"[+ c #9D8A43",
-"}+ c #BDB162",
-"|+ c #B6AB5C",
-"1+ c #B8A94D",
-"2+ c #B9AA50",
-"3+ c #4A3722",
-"4+ c #1E0C0F",
-"5+ c #2E1B18",
-"6+ c #B3A34C",
-"7+ c #C3B664",
-"8+ c #E9E9D4",
-"9+ c #EDEBD8",
-"0+ c #E2DBAF",
-"a+ c #C3B04C",
-"b+ c #534026",
-"c+ c #2C1816",
-"d+ c #B1A24D",
-"e+ c #C3B561",
-"f+ c #EAE8D4",
-"g+ c #ECEBD7",
-"h+ c #E1DCB4",
-"i+ c #827239",
-"j+ c #1E0C11",
-"k+ c #1B080E",
-"l+ c #988442",
-"m+ c #B6A649",
-"n+ c #C0AE4F",
-"o+ c #B6A24E",
-"p+ c #72602F",
-"q+ c #A18E44",
-"r+ c #CEC076",
-"s+ c #CAC287",
-"t+ c #CBBA61",
-"u+ c #B8A44F",
-"v+ c #746130",
-"w+ c #9E8C43",
-"x+ c #CEC074",
-"y+ c #C9C188",
-"z+ c #CCBB63",
-"A+ c #C6B254",
-"B+ c #89733A",
-"C+ c #837237",
-"D+ c #C2AF51",
-"E+ c #C7B554",
-"F+ c #BCAD4E",
-"G+ c #C2AF4E",
-"H+ c #BCAD4F",
-"I+ c #BAAB51",
-"J+ c #C4B152",
-"K+ c #756332",
-"L+ c #473421",
-"M+ c #A89646",
-"N+ c #C9B554",
-"O+ c #C8B65C",
-"P+ c #DBD3A3",
-"Q+ c #DBD2A1",
-"R+ c #C8B659",
-"S+ c #CEBF70",
-"T+ c #DDD9B5",
-"U+ c #D6CA8B",
-"V+ c #BAAC51",
-"W+ c #B7A74D",
-"X+ c #BBA84E",
-"Y+ c #140509",
-"Z+ c #2F1A17",
-"`+ c #4E3B27",
-" @ c #BDAE4F",
-".@ c #CDC488",
-"+@ c #ECEBD8",
-"@@ c #D0C585",
-"#@ c #DDD9B4",
-"$@ c #E7E6CE",
-"%@ c #E9E8D5",
-"&@ c #B6A84D",
-"*@ c #B7A84E",
-"=@ c #402821",
-"-@ c #210E11",
-";@ c #715C32",
-">@ c #C5B453",
-",@ c #CFC27A",
-"'@ c #EDEAD5",
-")@ c #CEBF73",
-"!@ c #C0AE4E",
-"~@ c #DDD6A8",
-"{@ c #EAE6CA",
-"]@ c #B1A247",
-"^@ c #BAA74E",
-"/@ c #C5B151",
-"(@ c #C3B45F",
-"_@ c #C3B35D",
-":@ c #C8B75C",
-"<@ c #C1AF50",
-"[@ c #B3A549",
-"}@ c #B9A94C",
-"|@ c #C6B250",
-"1@ c #BEAF59",
-"2@ c #BEB058",
-"3@ c #D5CC8E",
-"4@ c #E8E7D5",
-"5@ c #DED7AB",
-"6@ c #A49244",
-"7@ c #2E1B16",
-"8@ c #36211A",
-"9@ c #AF9D4A",
-"0@ c #E0DAB0",
-"a@ c #E6E5D2",
-"b@ c #D8CB8B",
-"c@ c #DED9B4",
-"d@ c #E8E6CE",
-"e@ c #EDECDA",
-"f@ c #BAAE58",
-"g@ c #B6A74E",
-"h@ c #B1A44A",
-"i@ c #B4A64D",
-"j@ c #B6A84F",
-"k@ c #B8AA51",
-"l@ c #6C5E2F",
-"m@ c #17070B",
-"n@ c #230F14",
-"o@ c #806F3A",
-"p@ c #B7A94F",
-"q@ c #B3A54C",
-"r@ c #B1A44B",
-"s@ c #B6A84E",
-"t@ c #BFB365",
-"u@ c #E8E7D4",
-"v@ c #E6E4CB",
-"w@ c #E4DEB9",
-"x@ c #BAAA4D",
-"y@ c #D8CC8D",
-"z@ c #E3DDB9",
-"A@ c #DDD49E",
-"B@ c #B7A24F",
-"C@ c #543C27",
-"D@ c #513D24",
-"E@ c #B6A34C",
-"F@ c #DFD7A8",
-"G@ c #E1DCB8",
-"H@ c #D7CA86",
-"I@ c #BDAD4F",
-"J@ c #B7A84C",
-"K@ c #C8B653",
-"L@ c #BCAC4E",
-"M@ c #B9A94D",
-"N@ c #C6B454",
-"O@ c #CABF77",
-"P@ c #CDBE74",
-"Q@ c #968442",
-"R@ c #96843F",
-"S@ c #D0C378",
-"T@ c #EDECDB",
-"U@ c #E3E2CC",
-"V@ c #C2B151",
-"W@ c #8D7D3B",
-"X@ c #1B080C",
-"Y@ c #2D1619",
-"Z@ c #9D8B44",
-"`@ c #C2B050",
-" # c #BBAD56",
-".# c #C0B15B",
-"+# c #D3C684",
-"@# c #ECEBDA",
-"## c #EFEEDD",
-"$# c #CBC07D",
-"%# c #B4A64C",
-"&# c #B3A54B",
-"*# c #B7A84F",
-"=# c #B8AA50",
-"-# c #B3A44B",
-";# c #B5A74E",
-"># c #B9AB50",
-",# c #7B6B36",
-"'# c #1C090F",
-")# c #1B090F",
-"!# c #88773C",
-"~# c #B4A54B",
-"{# c #B5A74D",
-"]# c #B8AA4F",
-"^# c #B5AB5C",
-"/# c #C2B566",
-"(# c #D4C783",
-"_# c #D2C47E",
-":# c #C8B556",
-"<# c #C4AF53",
-"[# c #937D40",
-"}# c #917E3E",
-"|# c #C3AF51",
-"1# c #C7B452",
-" . . + + + + + + + + + + + + @ . + + + + + + + + + + + + # $ + ",
-". % & * = - = ; > , ' ' ; ' * ) ! ~ ' > = > > = ' { ] ~ * ^ / ( ",
-"@ _ : < [ } | 1 2 2 3 4 < 2 5 6 7 8 9 0 } a 2 2 b c 1 a d e f @ ",
-"+ g h i + j i j + j i j j + k ' ~ i + j i j + j j + + j i l m + ",
-"+ [ ' + + n o p q + + + + + @ r s # + + + + + + t u v + + > a j ",
-"+ 9 ] + w x y z A + + + + + B C D E + + + + + F G H I v + J [ + ",
-"j K L + M N O P Q < } R 1 S T U V W 0 X b a < Y Z ` ...+ L S i ",
-"j c +.+ @.#.$.%.&.&.' > *.l =.-.;.>.&.- - *.; ,.'.).!.~.+ L 1 i ",
-"i {.= + q ].^./.q + + + + . (._.@ + + + + + :.<.[.}.+ j |.1.j ",
-"+ [ 2.+ + ( 3.4.+ q 5.6.7.:.+ m +.+ + + # + + + 8.9.+ + + 2.0.j ",
-"+ 2 2.+ + + a.8.:.+ b.c.d.A q e.f.q g.q h.i. + 8.j.+ + + k.[ + ",
-"i 1.l.j + + m.; i n.o.p.q.r.s.t.u.| v.w.x.y.z.+ /.A.+ + + r B.i ",
-"i K 2.+ + + C.D.:.E.F.G.H. at .+ # # + + j < h + + /.R + + j I.J.j ",
-"i K.I.+ + + L.M.+ q 7.N. at .:.+ + + + + + 9 O.+ + /.L.+ + + P.Q.j ",
-"+ g ; j M R.S.T.i $ U.V.W.( + + + + i X.Y.Z.i $ `. +.+( ++ at +#+++",
-"@ $+%+~ &+*+=+-+{ ;+>+,+'+..q + + + p )+!+~+5 {+]+^+/+(+_+:+<+[+",
-"@ }+|+1+2+3+4+5+6+7+8+9+0+a+q + + + @.b+4+c+d+e+f+g+h+S i+j+k+l+",
-"i m+n+k ].o+p+q+M }.r+s+t+$ + q q + i u+v+w+M }.x+y+z+. A+B+C+D+",
-"j < ' + :.+ K 8.+ q E+F+].+ ( ....( + }.|.G+ + M.1.# + + > H++ ",
-"+ 9 ; + + + I+J+ M K+L+M+N+O+P+Q+R+F S+T+U+$ + 8.V++ + + J 0.+ ",
-"j K L + + + W+&+i X+Y+Z+`+ @. at +@V @@1 #@$@%@i.+ h &@+ + + L S i ",
-"j < m + + + *@8.+ J+=@-@;@>@, at 9+'@)@!@~@g+{@$ + M.v.+ + + m 1 i ",
-"i L.= + + + ]@&++ q g.^@E.q /@(@_ at F + v :@q :.+ <@[@+ + j |.}@j ",
-"j [ ; + + |@1 at J+( :.+ i z.+ i X K i + + q + + z.8.2@$ + + 2.[ j ",
-"+ 2 2.+ v 3 at 4@5 at ++q q :.q 6 at 7@8 at 9@q :.q :.q g.0 at a@b at t + k.[ + ",
-"i 1.l.+ + c at d@e at f@g at h@i at j@k at l@m at n@o at p@q at r@j at s@t at u@v at w@u + r B.i ",
-"i x@> + ..y at z@A at F + + + + + B at C@D at E@+ + + + + v F at G@H at u + I at J.j ",
-"i J at I@+ + ..q u + + + + + q K at x@L at N+q + + + + + ..$ u + j l.M at j ",
-"N at O@P@# + + + + + + + + + + ++Q at R@# + + + + + + + + + + + ; +.+ ",
-"S at T@U@)@<@h D+O.h /.V@/.8.8.W at X@Y at Z@M.h ; O.h /././.8./.`@ #.## ",
-"+#@###$#2+%#&#*#=#*#-#;#p@>#,#'#)#!#=#%#~#*#=#p@&#{#p@]#C.^#/#. ",
-"R+(#_#:#j i i i j i i i i j <#[#}#|#j i i i j j i i i j i 1#. + "};
Modified: packages/trunk/morris/debian/patches/build.patch
===================================================================
--- packages/trunk/morris/debian/patches/build.patch 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/patches/build.patch 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1,31 +1,26 @@
-Index: morris-0.2/src/gtk_prefRules.cc
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 19 Jul 2017 14:03:22 +0200
+Subject: build
+
===================================================================
---- morris-0.2.orig/src/gtk_prefRules.cc 2013-07-21 04:35:27.267249803 +0200
-+++ morris-0.2/src/gtk_prefRules.cc 2013-07-21 04:36:24.663249729 +0200
-@@ -30,8 +30,9 @@
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO,
-+ "%s",
- primaryText);
-- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), secondaryText);
-+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", secondaryText);
- gint button = gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy (dialog);
+---
+ src/gtk_appgui.cc | 4 ++--
+ src/gtk_prefRules.cc | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/gtk_appgui.cc b/src/gtk_appgui.cc
+index 85e77b2..729d696 100644
+--- a/src/gtk_appgui.cc
++++ b/src/gtk_appgui.cc
+@@ -82,7 +82,6 @@ ApplicationGUI_Gtk::~ApplicationGUI_Gtk()
-Index: morris-0.2/src/gtk_appgui.cc
-===================================================================
---- morris-0.2.orig/src/gtk_appgui.cc 2009-10-07 22:35:14.000000000 +0200
-+++ morris-0.2/src/gtk_appgui.cc 2013-07-21 04:46:34.591248940 +0200
-@@ -82,7 +82,6 @@
-
void ApplicationGUI_Gtk::initApplicationGUI(int& argc, char**& argv)
{
- g_thread_init(NULL);
gdk_threads_init();
gtk_init(&argc,&argv);
-@@ -206,8 +205,9 @@
+@@ -206,8 +205,9 @@ void ApplicationGUI_Gtk::showGameOverDialog(Player winner)
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
GTK_BUTTONS_OK,
@@ -36,3 +31,18 @@
gtk_dialog_run(GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
+diff --git a/src/gtk_prefRules.cc b/src/gtk_prefRules.cc
+index 311c035..ac51edb 100644
+--- a/src/gtk_prefRules.cc
++++ b/src/gtk_prefRules.cc
+@@ -30,8 +30,9 @@ bool confirmationRequester(GtkWindow* parent, const char* primaryText, const cha
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_YES_NO,
++ "%s",
+ primaryText);
+- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), secondaryText);
++ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", secondaryText);
+ gint button = gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy (dialog);
+
Modified: packages/trunk/morris/debian/patches/i18n_es.patch
===================================================================
--- packages/trunk/morris/debian/patches/i18n_es.patch 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/patches/i18n_es.patch 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1,7 +1,26 @@
-Index: morris-0.2/po/es.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ morris-0.2/po/es.po 2013-08-13 09:02:44.000000000 +0200
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 19 Jul 2017 14:03:22 +0200
+Subject: i18n_es
+
+---
+ po/LINGUAS | 1 +
+ po/es.po | 649 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 650 insertions(+)
+ create mode 100644 po/es.po
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index 77a80fc..62643bd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1,2 +1,3 @@
+ de
+ zh
++es
+diff --git a/po/es.po b/po/es.po
+new file mode 100644
+index 0000000..8cc63b0
+--- /dev/null
++++ b/po/es.po
@@ -0,0 +1,649 @@
+# Spanish translations for Morris package.
+# Copyright (C) 2013 Miriam Ruiz <miriam at debian.org>
@@ -652,11 +671,3 @@
+msgstr ""
+"Si los movimientos del ordenador deberían ser mostrados como pequeñas "
+"animaciones"
-Index: morris-0.2/po/LINGUAS
-===================================================================
---- morris-0.2.orig/po/LINGUAS 2013-08-13 08:56:17.000000000 +0200
-+++ morris-0.2/po/LINGUAS 2013-08-13 08:56:17.000000000 +0200
-@@ -1,2 +1,3 @@
- de
- zh
-+es
Modified: packages/trunk/morris/debian/rules
===================================================================
--- packages/trunk/morris/debian/rules 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/rules 2017-07-19 13:32:37 UTC (rev 15984)
@@ -12,7 +12,7 @@
LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined
config: config-stamp
-config-stamp:
+config-stamp:
dh_testdir
[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
dh_autotools-dev_updateconfig
@@ -25,6 +25,7 @@
--infodir=\$${prefix}/share/info \
--with-gconf-schema-file-dir=\$${prefix}/share/gconf/schemas/ \
--with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ DATADIRNAME=share \
CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
LDFLAGS="$(LDFLAGS) $(LDFLAGS2)"
@@ -47,7 +48,7 @@
rm -f build-stamp config-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.cache config.log
- [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+ [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make -f unpatch
dh_autotools-dev_restoreconfig
dh_clean
@@ -72,7 +73,7 @@
dh_installmenu
dh_installman
dh_link
- dh_strip --dbg-package=morris-dbg
+ dh_strip
dh_compress
dh_fixperms
[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
@@ -83,4 +84,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: config build-arch build-indep build clean binary-indep binary-arch binary install
+.PHONY: config build-arch build-indep build clean binary-indep binary-arch binary install
Modified: packages/trunk/morris/debian/source/options
===================================================================
--- packages/trunk/morris/debian/source/options 2017-07-18 09:19:10 UTC (rev 15983)
+++ packages/trunk/morris/debian/source/options 2017-07-19 13:32:37 UTC (rev 15984)
@@ -1,5 +1,2 @@
-# Bzip2 compression for debian.tar
-compression = "bzip2"
-compression-level = 7
# Do not generate diff for changes in config.(sub|guess)
extend-diff-ignore = "(^|/)config.(sub|guess)$"
More information about the Pkg-games-commits
mailing list