# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1511006855 -7200
# Node ID 4d3f87a6c521ce223ac1bf3c6de2625accc8ab82
# Parent  16a417e1e89d3704c804d395456b2a06e3013c7b
Up/patch tazpkg

diff -r 16a417e1e89d -r 4d3f87a6c521 tazpkg/receipt
--- a/tazpkg/receipt	Sat Nov 18 13:59:34 2017 +0200
+++ b/tazpkg/receipt	Sat Nov 18 14:07:35 2017 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="tazpkg"
-VERSION="951"
+VERSION="954"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz packages manager"
 MAINTAINER="pankso@slitaz.org"
@@ -15,41 +15,25 @@
 BUILD_DEPENDS_arm=""
 BUILD_DEPENDS="gettext tidy-html5 libnotify-dev"
 
-# Rules to gen a SliTaz package suitable for TazPkg.
-#
-# TazPkg is SliTaz packages manager. On an other GNU/Linux install
-# can be do with `make install` from the sources directory.
-#
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make DESTDIR=$DESTDIR VERSION=$VERSION install
-}
-
-genpkg_rules()
-{
-	cp -a $install/* $fs
-	chown -R root.root $fs
+compile_rules() {
+	make &&
+	make DESTDIR=$DESTDIR VERSION=$VERSION install || return 1
 
 	# Default icon for mimetype (freedesktop standard compliant file
 	# manager will diplay a tazpkg icon for SliTaz packages).
-	icons="$fs/usr/share/icons/hicolor/32x32/mimetypes"
+	icons="$install/usr/share/icons/hicolor/32x32/mimetypes"
 	mkdir -p $icons
 	ln -s ../apps/tazpkg.png $icons/application-x-tazpkg.png
+
+	rm $install/usr/share/doc/tazpkg/tazpkg.html
+	cp $stuff/tazpkg.html $install/usr/share/doc/tazpkg/
+
+	chown -R root.root $install
+}
+
+genpkg_rules() {
+	copy @std doc/ hicolor/ *.mo
 	DEPENDS="busybox gettext-base"
 	SUGGESTED="tazpanel"
 	TAGS="slitaz package-manager"
 }
-
-post_install() {
-	# Make sure new config is present
-	if ! grep -q ^NOTIFY_GEOM "$1/etc/slitaz/tazpkg.conf"; then
-		cat >> "$1/etc/slitaz/tazpkg.conf" <<EOT
-# The geometry of the desktop notification
-NOTIFY_GEOM="360x80-0+24"
-
-EOT
-	fi
-	:
-}
diff -r 16a417e1e89d -r 4d3f87a6c521 tazpkg/stuff/patches/r954.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg/stuff/patches/r954.diff	Sat Nov 18 14:07:35 2017 +0200
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User Richard Dunbar <mojo@slitaz.org>
+# Date 1509739839 14400
+# Node ID ecb60a87e3e840843ad7698cee37380f374819ec
+# Parent  40c8ad3478fdb0436487ff71966099a7546c7492
+modules/install: PKG_SUM restores update new build detection
+
+diff -r 40c8ad3478fd -r ecb60a87e3e8 modules/install
+--- a/modules/install	Mon Oct 09 17:16:43 2017 +0100
++++ b/modules/install	Fri Nov 03 16:10:39 2017 -0400
+@@ -620,7 +620,8 @@
+ 
+ 	# Remove newlines from some receipts
+ 	DEPENDS=$(echo $DEPENDS)
+-
++	PKG_SUM="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" "$PKGS_DB/installed.$SUM" | cut -d' ' -f1)"
++	
+ 	# Calculate "release checksum": md5sum of file containing md5sums of:
+ 	# a) all files, b) receipt, and c) description.txt.
+ 	rsumf=$(mktemp)
+@@ -637,7 +638,7 @@
+ 	sed -i "/^$PACKAGE	/d" "$ii"
+ 
+ 	cat >> "$ii" <<EOT
+-$PACKAGE	$VERSION$EXTRAVERSION	$CATEGORY	$SHORT_DESC	$WEB_SITE	$TAGS	$SIZES	$DEPENDS	$RSUM
++$PACKAGE	$VERSION$EXTRAVERSION	$CATEGORY	$SHORT_DESC	$WEB_SITE	$TAGS	$SIZES	$DEPENDS	$PKG_SUM
+ EOT
+ 
+ 	TEMP_FILE="$(mktemp)"
+
diff -r 16a417e1e89d -r 4d3f87a6c521 tazpkg/stuff/patches/release.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg/stuff/patches/release.patch	Sat Nov 18 14:07:35 2017 +0200
@@ -0,0 +1,11 @@
+--- a/modules/getenv
++++ b/modules/getenv
+@@ -69,7 +69,7 @@
+ missing_dir  "$root/etc/slitaz/"
+ missing_file "$root/etc/slitaz/slitaz.conf" '/etc/slitaz/slitaz.conf'
+ missing_file "$root/etc/slitaz/tazpkg.conf" '/etc/slitaz/tazpkg.conf'
+-missing_file "$root/etc/slitaz-release"; fill "$root/etc/slitaz-release" 'cooking'
++missing_file "$root/etc/slitaz-release"; fill "$root/etc/slitaz-release" 'next'
+ 
+ # Read configuration
+ if [ -n "$root" ]; then
diff -r 16a417e1e89d -r 4d3f87a6c521 tazpkg/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg/stuff/patches/series	Sat Nov 18 14:07:35 2017 +0200
@@ -0,0 +1,4 @@
+-Rp1|r954.diff # revert changeset # 954
+release.patch
+tazpanel.desktop.patch
+tazpkg.conf.patch
diff -r 16a417e1e89d -r 4d3f87a6c521 tazpkg/stuff/patches/tazpanel.desktop.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg/stuff/patches/tazpanel.desktop.patch	Sat Nov 18 14:07:35 2017 +0200
@@ -0,0 +1,19 @@
+--- a/applications/tazpanel-pkgs.desktop
++++ b/applications/tazpanel-pkgs.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+ Type=Application
+-Name=Package Manager
+-Name[fr]=Gestionnaire de paquets
+-Name[pt]=Gerenciador de Pacotes
+-Name[pt_BR]=Gerenciador de Pacotes
+-Name[ru]=Менеджер пакетов
++Name=Package Manager web interface
++Name[fr]=Interface web du gestionnaire de paquets
++Name[pt_BR]=Interface da web do gerenciador de pacotes
++Name[ru]=Веб-интерфейс менеджера пакетов
+ TryExec=tazweb
+-Exec=sh -c 'tazweb root:$$@127.0.0.1:82/user/pkgs.cgi'
++Exec=tazbox su tazpanel pkgs
+ Icon=system-software-installer
+ Categories=Settings;PackageManager;
diff -r 16a417e1e89d -r 4d3f87a6c521 tazpkg/stuff/patches/tazpkg.conf.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg/stuff/patches/tazpkg.conf.patch	Sat Nov 18 14:07:35 2017 +0200
@@ -0,0 +1,9 @@
+--- a/tazpkg.conf
++++ b/tazpkg.conf
+@@ -10,4 +10,5 @@
+ # Packages cache directory.
+ CACHE_DIR="/var/cache/tazpkg"
+ 
+-
++# The geometry of the desktop notification
++NOTIFY_GEOM="360x80-0+24"
diff -r 16a417e1e89d -r 4d3f87a6c521 tazpkg/stuff/tazpkg.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg/stuff/tazpkg.html	Sat Nov 18 14:07:35 2017 +0200
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<script>
+var uilang = navigator.language || navigator.userLanguage;
+var lang = uilang.split('-')[0];
+switch (lang) {
+	case 'de':
+	case 'es':
+	case 'fr':
+	case 'pt':
+	case 'ru':
+		found = lang;
+		break;
+	default:
+		found = 'en';
+}
+window.location = 'tazpkg.' + found + '.html';
+</script>