Upstream version 26.0

5 files changed, 94 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28e4ebec0171..2750150b4f3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = pzl_games
 	pkgdesc = Collection of puzzle games.
-	pkgver = 23.0
+	pkgver = 26.0
 	pkgrel = 1
 	url = http://pzl.org.uk/
 	arch = any
 	license = GPL
-	source = http://pzl.org.uk/pzl3_23_0.zip
+	source = http://pzl.org.uk/pzl3_26_0.zip
 	source = pzl_ajs.desktop
 	source = pzl_akari.desktop
 	source = pzl_arrowsudoku.desktop
@@ -14,6 +14,7 @@ pkgbase = pzl_games
 	source = pzl_bridges.desktop
 	source = pzl_codeword.desktop
 	source = pzl_fillomino.desktop
+	source = pzl_follow_123.desktop
 	source = pzl_futoshiki.desktop
 	source = pzl_gol.desktop
 	source = pzl_hidato.desktop
@@ -21,6 +22,7 @@ pkgbase = pzl_games
 	source = pzl_jigsaw.desktop
 	source = pzl_jigsawsudoku.desktop
 	source = pzl_kakuro.desktop
+	source = pzl_marupeke.desktop
 	source = pzl_masyu.desktop
 	source = pzl_minesweeper.desktop
 	source = pzl_numberlink.desktop
@@ -33,10 +35,11 @@ pkgbase = pzl_games
 	source = pzl_sudoku.desktop
 	source = pzl_suguru.desktop
 	source = pzl_sumpuzzle.desktop
+	source = pzl_targets.desktop
 	source = pzl_tetrofit.desktop
 	source = pzl_wordwheel.desktop
 	source = pzl_wordladder.desktop
-	md5sums = 7021d5709ffffe43e55011c148343bdb
+	md5sums = 3b6367171785549aab90cb78c401184d
 	md5sums = 6f5058e263976d69a2eb356ca2c2a6b5
 	md5sums = 37af6d1fa020f7fa532a69a0e07b32ad
 	md5sums = a1e25c7621e92598bcdb8d442133031a
@@ -45,6 +48,7 @@ pkgbase = pzl_games
 	md5sums = b62c538e5baba89f6fe1e195af8e39af
 	md5sums = 02df03e4c57e8b77062df51971f7c582
 	md5sums = 493fa819c6a145a873ec81bab55bf96a
+	md5sums = 51133afd3dcae236d0276221434400c5
 	md5sums = 744840240079721ae72b14b49589ef4b
 	md5sums = 512c219ec03d89e100e0aca6ff5b3f42
 	md5sums = a07ce126d031c9fbed8c1cbe2c6af1a1
@@ -52,6 +56,7 @@ pkgbase = pzl_games
 	md5sums = 00333ad5a67aa529189cb8d5efce7ec2
 	md5sums = fa5438c87ada71ae5bdf2edd84df4290
 	md5sums = 27c7b30bf6c9365397b35d4cca7044f8
+	md5sums = cf9a1d524f7e5563c37413f0227fe1a1
 	md5sums = 0ff3ac0767cd8fc94388ef3b301c8adc
 	md5sums = 3938559de7b10ca25f86ccb59676547e
 	md5sums = ab1d907a83c8b7e359eff308ee89d9d9
@@ -64,6 +69,7 @@ pkgbase = pzl_games
 	md5sums = 068873d936f6592065010b056da87cc7
 	md5sums = 0c1b99051ab88c9aacf108a4d7d577e2
 	md5sums = 652ec7a6aa6a225f62579a315bd98421
+	md5sums = 1c6a099a8b6fff65b9856eb8baab784f
 	md5sums = adf64f6092e1d05aafb1bc0c093d56b2
 	md5sums = b7b52cd6e554eb01aa0537bb5526e297
 	md5sums = b0afcb5b6a3f2f05b8fd8e6d59d8e6ca
@@ -113,6 +119,11 @@ pkgname = pzl_fillomino
 	url = http://pzl.org.uk/fillomino.html
 	depends = pzl_common
 
+pkgname = pzl_follow_123
+	pkgdesc = Puzzle game in which the player tries to find a path through a grid.
+	url = http://pzl.org.uk/follow_123.html
+	depends = pzl_common
+
 pkgname = pzl_futoshiki
 	pkgdesc = Logic game in which players solve a Latin square.
 	url = http://pzl.org.uk/futoshiki.html
@@ -149,6 +160,11 @@ pkgname = pzl_kakuro
 	url = http://pzl.org.uk/kakuro.html
 	depends = pzl_common
 
+pkgname = pzl_marupeke
+	pkgdesc = Puzzle where there is a potential for three symbols to be adjacent. And block them.
+	url = http://pzl.org.uk/marupeke.html
+	depends = pzl_common
+
 pkgname = pzl_masyu
 	pkgdesc = A game played on a rectangular grid in which some of the vertices contain black or white circles.
 	url = http://pzl.org.uk/masyu.html
@@ -209,6 +225,11 @@ pkgname = pzl_sumpuzzle
 	url = http://pzl.org.uk/sumpuzzle.html
 	depends = pzl_common
 
+pkgname = pzl_targets
+	pkgdesc = Each row, column and shape must contain a single Target. They cannot touch.
+	url = http://pzl.org.uk/targets.html
+	depends = pzl_common
+
 pkgname = pzl_tetrofit
 	pkgdesc = Use Tetromino shapes to exacly cover a grid.
 	url = http://pzl.org.uk/tetrofit.html
diff --git a/PKGBUILD b/PKGBUILD
index a134049d6b9f..6b5ee1a50201 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: SanskritFritz (gmail)
 
-pkgname=(pzl_common pzl_ajs pzl_akari pzl_arrowsudoku pzl_binary pzl_boggle pzl_bridges pzl_codeword pzl_fillomino pzl_futoshiki pzl_gol pzl_hidato pzl_hitori pzl_jigsaw pzl_jigsawsudoku pzl_kakuro pzl_masyu pzl_minesweeper pzl_numberlink pzl_nurikabe pzl_scrabbler pzl_othello pzl_ripple pzl_shikaku pzl_sokoban pzl_sudoku pzl_suguru pzl_sumpuzzle pzl_tetrofit pzl_wordwheel pzl_wordladder)
+pkgname=(pzl_common pzl_ajs pzl_akari pzl_arrowsudoku pzl_binary pzl_boggle pzl_bridges pzl_codeword pzl_fillomino pzl_follow_123 pzl_futoshiki pzl_gol pzl_hidato pzl_hitori pzl_jigsaw pzl_jigsawsudoku pzl_kakuro pzl_marupeke pzl_masyu pzl_minesweeper pzl_numberlink pzl_nurikabe pzl_scrabbler pzl_othello pzl_ripple pzl_shikaku pzl_sokoban pzl_sudoku pzl_suguru pzl_sumpuzzle pzl_targets pzl_tetrofit pzl_wordwheel pzl_wordladder)
 pkgbase="pzl_games"
-pkgver=23.0
-_pkgver=23_0
+pkgver=26.0
+_pkgver=26_0
 pkgrel=1
 pkgdesc="Collection of puzzle games."
 arch=('any')
@@ -18,6 +18,7 @@ source=("http://pzl.org.uk/pzl3_$_pkgver.zip"
         "pzl_bridges.desktop"
         "pzl_codeword.desktop"
         "pzl_fillomino.desktop"
+        "pzl_follow_123.desktop"
         "pzl_futoshiki.desktop"
         "pzl_gol.desktop"
         "pzl_hidato.desktop"
@@ -25,6 +26,7 @@ source=("http://pzl.org.uk/pzl3_$_pkgver.zip"
         "pzl_jigsaw.desktop"
         "pzl_jigsawsudoku.desktop"
         "pzl_kakuro.desktop"
+        "pzl_marupeke.desktop"
         "pzl_masyu.desktop"
         "pzl_minesweeper.desktop"
         "pzl_numberlink.desktop"
@@ -37,11 +39,12 @@ source=("http://pzl.org.uk/pzl3_$_pkgver.zip"
         "pzl_sudoku.desktop"
         "pzl_suguru.desktop"
         "pzl_sumpuzzle.desktop"
+        "pzl_targets.desktop"
         "pzl_tetrofit.desktop"
         "pzl_wordwheel.desktop"
         "pzl_wordladder.desktop")
 
-md5sums=('7021d5709ffffe43e55011c148343bdb'
+md5sums=('3b6367171785549aab90cb78c401184d'
          '6f5058e263976d69a2eb356ca2c2a6b5'
          '37af6d1fa020f7fa532a69a0e07b32ad'
          'a1e25c7621e92598bcdb8d442133031a'
@@ -50,6 +53,7 @@ md5sums=('7021d5709ffffe43e55011c148343bdb'
          'b62c538e5baba89f6fe1e195af8e39af'
          '02df03e4c57e8b77062df51971f7c582'
          '493fa819c6a145a873ec81bab55bf96a'
+         '51133afd3dcae236d0276221434400c5'
          '744840240079721ae72b14b49589ef4b'
          '512c219ec03d89e100e0aca6ff5b3f42'
          'a07ce126d031c9fbed8c1cbe2c6af1a1'
@@ -57,6 +61,7 @@ md5sums=('7021d5709ffffe43e55011c148343bdb'
          '00333ad5a67aa529189cb8d5efce7ec2'
          'fa5438c87ada71ae5bdf2edd84df4290'
          '27c7b30bf6c9365397b35d4cca7044f8'
+         'cf9a1d524f7e5563c37413f0227fe1a1'
          '0ff3ac0767cd8fc94388ef3b301c8adc'
          '3938559de7b10ca25f86ccb59676547e'
          'ab1d907a83c8b7e359eff308ee89d9d9'
@@ -69,6 +74,7 @@ md5sums=('7021d5709ffffe43e55011c148343bdb'
          '068873d936f6592065010b056da87cc7'
          '0c1b99051ab88c9aacf108a4d7d577e2'
          '652ec7a6aa6a225f62579a315bd98421'
+         '1c6a099a8b6fff65b9856eb8baab784f'
          'adf64f6092e1d05aafb1bc0c093d56b2'
          'b7b52cd6e554eb01aa0537bb5526e297'
          'b0afcb5b6a3f2f05b8fd8e6d59d8e6ca')
@@ -165,6 +171,17 @@ package_pzl_fillomino() {
 	install -m644 pzl_fillomino.desktop "$pkgdir/usr/share/applications"
 }
 
+package_pzl_follow_123() {
+	pkgdesc="Puzzle game in which the player tries to find a path through a grid."
+	url="http://pzl.org.uk/follow_123.html"
+	depends=('pzl_common')
+	install -dm755 "$pkgdir"/usr/share/{applications,pixmaps/pzl_games,pzl_games}
+	install -m644 pzl3_download/follow_123.pyw "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/follow_123_data.py "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/follow_123_icon.png "$pkgdir/usr/share/pixmaps/pzl_games"
+	install -m644 pzl_follow_123.desktop "$pkgdir/usr/share/applications"
+}
+
 package_pzl_futoshiki() {
 	pkgdesc="Logic game in which players solve a Latin square."
 	url="http://pzl.org.uk/futoshiki.html"
@@ -237,6 +254,17 @@ package_pzl_kakuro() {
 	install -m644 pzl_kakuro.desktop "$pkgdir/usr/share/applications"
 }
 
+package_pzl_marupeke() {
+	pkgdesc="Puzzle where there is a potential for three symbols to be adjacent. And block them."
+	url="http://pzl.org.uk/marupeke.html"
+	depends=('pzl_common')
+	install -dm755 "$pkgdir"/usr/share/{applications,pixmaps/pzl_games,pzl_games}
+	install -m644 pzl3_download/marupeke.pyw "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/marupeke_data.py "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/marupeke_icon.png "$pkgdir/usr/share/pixmaps/pzl_games"
+	install -m644 pzl_marupeke.desktop "$pkgdir/usr/share/applications"
+}
+
 package_pzl_masyu() {
 	pkgdesc="A game played on a rectangular grid in which some of the vertices contain black or white circles."
 	url="http://pzl.org.uk/masyu.html"
@@ -300,6 +328,17 @@ package_pzl_sumpuzzle() {
 	install -m644 pzl_sumpuzzle.desktop "$pkgdir/usr/share/applications"
 }
 
+package_pzl_targets() {
+	pkgdesc="Each row, column and shape must contain a single Target. They cannot touch."
+	url="http://pzl.org.uk/targets.html"
+	depends=('pzl_common')
+	install -dm755 "$pkgdir"/usr/share/{applications,pixmaps/pzl_games,pzl_games}
+	install -m644 pzl3_download/targets.pyw "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/targets_data.py "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/targets_icon.png "$pkgdir/usr/share/pixmaps/pzl_games"
+	install -m644 pzl_targets.desktop "$pkgdir/usr/share/applications"
+}
+
 package_pzl_othello() {
 	pkgdesc="Also known as Reversi. Flip the opponents disk."
 	url="http://pzl.org.uk/othello.html"
diff --git a/pzl_follow_123.desktop b/pzl_follow_123.desktop
new file mode 100644
index 000000000000..d5338f6b5ce2
--- /dev/null
+++ b/pzl_follow_123.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=pzl games Follow_123
+Comment=Follow_123 (pzl games)
+Categories=Game;LogicGame
+Exec=python /usr/share/pzl_games/follow_123.pyw
+Terminal=false
+Icon=/usr/share/pixmaps/pzl_games/follow_123_icon.png
+Type=Application
diff --git a/pzl_marupeke.desktop b/pzl_marupeke.desktop
new file mode 100644
index 000000000000..6f0e926f49e5
--- /dev/null
+++ b/pzl_marupeke.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=pzl games Marupeke
+Comment=Marupeke (pzl games)
+Categories=Game;LogicGame
+Exec=python /usr/share/pzl_games/marupeke.pyw
+Terminal=false
+Icon=/usr/share/pixmaps/pzl_games/marupeke_icon.png
+Type=Application
diff --git a/pzl_targets.desktop b/pzl_targets.desktop
new file mode 100644
index 000000000000..b65598be5b73
--- /dev/null
+++ b/pzl_targets.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=pzl games Targets
+Comment=Targets (pzl games)
+Categories=Game;LogicGame
+Exec=python /usr/share/pzl_games/targets.pyw
+Terminal=false
+Icon=/usr/share/pixmaps/pzl_games/targets_icon.png
+Type=Application