Upstream version 18.0

3 files changed, 36 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34c05420145f..7aaf05b33a10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = pzl_games
 	pkgdesc = Small collection of puzzle games.
-	pkgver = 17.0
+	pkgver = 18.0
 	pkgrel = 1
 	url = http://pzl.org.uk/
 	arch = any
 	license = GPL
-	source = http://pzl.org.uk/pzl3_17_0.zip
+	source = http://pzl.org.uk/pzl3_18_0.zip
 	source = pzl_ajs.desktop
 	source = pzl_akari.desktop
 	source = pzl_arrowsudoku.desktop
@@ -20,6 +20,7 @@ pkgbase = pzl_games
 	source = pzl_jigsawsudoku.desktop
 	source = pzl_kakuro.desktop
 	source = pzl_minesweeper.desktop
+	source = pzl_numberlink.desktop
 	source = pzl_nurikabe.desktop
 	source = pzl_scrabbler.desktop
 	source = pzl_othello.desktop
@@ -30,7 +31,7 @@ pkgbase = pzl_games
 	source = pzl_sumpuzzle.desktop
 	source = pzl_wordwheel.desktop
 	source = pzl_wordladder.desktop
-	md5sums = 569795363a95d14994913c33ac61d480
+	md5sums = 912a8af2810f3e693be07a571105ace6
 	md5sums = 6f5058e263976d69a2eb356ca2c2a6b5
 	md5sums = 37af6d1fa020f7fa532a69a0e07b32ad
 	md5sums = a1e25c7621e92598bcdb8d442133031a
@@ -45,6 +46,7 @@ pkgbase = pzl_games
 	md5sums = fa5438c87ada71ae5bdf2edd84df4290
 	md5sums = 27c7b30bf6c9365397b35d4cca7044f8
 	md5sums = 3938559de7b10ca25f86ccb59676547e
+	md5sums = ab1d907a83c8b7e359eff308ee89d9d9
 	md5sums = 08f441dcf7ec24f4148d9a952738d7f4
 	md5sums = bdcdc0250d61c33f85289e7e436546a6
 	md5sums = b56963fa4b72c8b93e799ed25055a3b4
@@ -132,6 +134,11 @@ pkgname = pzl_minesweeper
 	url = http://pzl.org.uk/minesweeper.html
 	depends = pzl_common
 
+pkgname = pzl_numberlink
+	pkgdesc = A game in which the player makes non-intersecting paths between pairs of numbers.
+	url = http://pzl.org.uk/numberlink.html
+	depends = pzl_common
+
 pkgname = pzl_nurikabe
 	pkgdesc = Each clue cell of value N must be part of a cluster of white cells and all other cells must be black.
 	url = http://pzl.org.uk/nurikabe.html
diff --git a/PKGBUILD b/PKGBUILD
index 1f9be028a4aa..e874d453858b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: SanskritFritz (gmail)
 
-pkgname=(pzl_common pzl_ajs pzl_akari pzl_arrowsudoku pzl_boggle pzl_bridges pzl_codeword pzl_fillomino pzl_futoshiki pzl_hidato pzl_hitori pzl_jigsaw pzl_jigsawsudoku pzl_kakuro pzl_minesweeper pzl_nurikabe pzl_scrabbler pzl_othello pzl_shikaku pzl_sokoban pzl_sudoku pzl_suguru pzl_sumpuzzle pzl_wordwheel pzl_wordladder)
+pkgname=(pzl_common pzl_ajs pzl_akari pzl_arrowsudoku pzl_boggle pzl_bridges pzl_codeword pzl_fillomino pzl_futoshiki pzl_hidato pzl_hitori pzl_jigsaw pzl_jigsawsudoku pzl_kakuro pzl_minesweeper pzl_numberlink pzl_nurikabe pzl_scrabbler pzl_othello pzl_shikaku pzl_sokoban pzl_sudoku pzl_suguru pzl_sumpuzzle pzl_wordwheel pzl_wordladder)
 pkgbase="pzl_games"
-pkgver=17.0
-_pkgver=17_0
+pkgver=18.0
+_pkgver=18_0
 pkgrel=1
 pkgdesc="Small collection of puzzle games."
 arch=('any')
@@ -24,6 +24,7 @@ source=("http://pzl.org.uk/pzl3_$_pkgver.zip"
         "pzl_jigsawsudoku.desktop"
         "pzl_kakuro.desktop"
         "pzl_minesweeper.desktop"
+        "pzl_numberlink.desktop"
         "pzl_nurikabe.desktop"
         "pzl_scrabbler.desktop"
         "pzl_othello.desktop"
@@ -35,7 +36,7 @@ source=("http://pzl.org.uk/pzl3_$_pkgver.zip"
         "pzl_wordwheel.desktop"
         "pzl_wordladder.desktop")
 
-md5sums=('569795363a95d14994913c33ac61d480'
+md5sums=('912a8af2810f3e693be07a571105ace6'
          '6f5058e263976d69a2eb356ca2c2a6b5'
          '37af6d1fa020f7fa532a69a0e07b32ad'
          'a1e25c7621e92598bcdb8d442133031a'
@@ -50,6 +51,7 @@ md5sums=('569795363a95d14994913c33ac61d480'
          'fa5438c87ada71ae5bdf2edd84df4290'
          '27c7b30bf6c9365397b35d4cca7044f8'
          '3938559de7b10ca25f86ccb59676547e'
+         'ab1d907a83c8b7e359eff308ee89d9d9'
          '08f441dcf7ec24f4148d9a952738d7f4'
          'bdcdc0250d61c33f85289e7e436546a6'
          'b56963fa4b72c8b93e799ed25055a3b4'
@@ -214,6 +216,17 @@ package_pzl_minesweeper() {
 	install -m644 pzl_minesweeper.desktop "$pkgdir/usr/share/applications"
 }
 
+package_pzl_numberlink() {
+	pkgdesc="A game in which the player makes non-intersecting paths between pairs of numbers."
+	url="http://pzl.org.uk/numberlink.html"
+	depends=('pzl_common')
+	install -dm755 "$pkgdir"/usr/share/{applications,pixmaps/pzl_games,pzl_games}
+	install -m644 pzl3_download/numberlink.pyw "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/numberlink_data.py "$pkgdir/usr/share/pzl_games"
+	install -m644 pzl3_download/numberlink_icon.png "$pkgdir/usr/share/pixmaps/pzl_games"
+	install -m644 pzl_numberlink.desktop "$pkgdir/usr/share/applications"
+}
+
 package_pzl_nurikabe() {
 	pkgdesc="Each clue cell of value N must be part of a cluster of white cells and all other cells must be black."
 	url="http://pzl.org.uk/nurikabe.html"
diff --git a/pzl_numberlink.desktop b/pzl_numberlink.desktop
new file mode 100644
index 000000000000..226f792e1d33
--- /dev/null
+++ b/pzl_numberlink.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=pzl games Numberlink
+Comment=Numberlink (pzl games)
+Categories=Game;LogicGame
+Exec=python /usr/share/pzl_games/numberlink.pyw
+Terminal=false
+Icon=/usr/share/pixmaps/pzl_games/numberlink_icon.png
+Type=Application