# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1450322715 -7200
# Node ID 77dc6129b023e47ef331fb5b211cf37fac51fbdb
# Parent  16d87ac5f8c36ea28889d533844a34a7633169c9
cups, cups-pam: remove duplicate files with libcups; misc. edits.

diff -r 16d87ac5f8c3 -r 77dc6129b023 cups-pam/receipt
--- a/cups-pam/receipt	Wed Dec 16 23:00:12 2015 +0100
+++ b/cups-pam/receipt	Thu Dec 17 05:25:15 2015 +0200
@@ -3,7 +3,7 @@
 PACKAGE="cups-pam"
 VERSION="2.0.2"
 CATEGORY="system-tools"
-SHORT_DESC="Common UNIX Printing System with pam support."
+SHORT_DESC="Common UNIX Printing System with PAM support."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2 LGPL2"
 SOURCE="cups"
@@ -12,15 +12,13 @@
 WGET_URL="http://www.cups.org/software/$VERSION/$TARBALL"
 PROVIDE="cups:pam"
 
-DEPENDS="libssl libgcrypt cups-doc slitaz-base-files gnutls dbus jpeg libpng tiff \
-zlib pam libcomerr libkrb5 acl libcomerr3 cups-filters"
+DEPENDS="pam cups-filters libcups"
 BUILD_DEPENDS="openssl-dev gnutls-dev dbus-dev jpeg-dev libpng-dev tiff-dev \
 pam libcomerr-dev pam-dev acl-dev libgcrypt-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	patch -Np1 -i ${WOK}/cups/stuff/install-sh.u
 	./configure \
 		--prefix=/usr \
@@ -36,13 +34,14 @@
 		$CONFIGURE_ARGS &&
 	make &&
 	make BUILDROOT=$DESTDIR install
+	cp -f $WOK/cups/stuff/cups.desktop $install/usr/share/applications/cups.desktop
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share/pixmaps
-	
+	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
+
 	cp -a $install/etc/cups $fs/etc
 	cp -a $install/etc/dbus* $fs/etc
 	cp -a $install/usr/bin $fs/usr
@@ -50,53 +49,50 @@
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/lib/cups $fs/usr/lib
 	cp -a $install/usr/share/cups $fs/usr/share
-	cp -a $install/usr/share/icons/hicolor/32x32/apps/cups.png \
-		 $fs/usr/share/pixmaps
+	cp -a $install/usr/share/icons $fs/usr/share
 	cp -a $install/var $fs
-	
+
 	# Remove files provided by cups-filters
 	rm -f $fs/usr/share/cups/banners/*
 	rm -f $fs/usr/share/cups/data/testprint
-	
+
+	# Remove files provided by libcups
+	rm -f $fs/usr/lib/libcups.so*
+
 	# PAM conf
 	cp -a $stuff/etc $fs
 
 	# Daemon script
-	cp -a ${WOK}/cups/stuff/etc $fs
+	cp -a $WOK/cups/stuff/etc $fs
+
+	# TazPanel link
+	cp -a $WOK/cups/stuff/var $fs
+
 }
 
-# Start cups daemon and edit daemons.conf.
 post_install()
 {
-	local root
-	root=$1
-	if [ -z "$root" ]; then
+	# Start CUPS daemon and edit daemons.conf
+	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
 		/etc/init.d/cupsd start || continue
 	fi
-	if ! grep -q ^CUPSD_OPTIONS $root/etc/daemons.conf; then
-		echo '# Cups printing daemon options.' >> $root/etc/daemons.conf
-		echo 'CUPSD_OPTIONS=""' >> $root/etc/daemons.conf
-		echo '' >> $root/etc/daemons.conf
+	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then
+		cat >> "$1/etc/daemons.conf" <<EOT
+# CUPS printing daemon options.
+CUPSD_OPTIONS=""
+
+EOT
 	fi
 }
 
-# Stop cups daemon before rm.
 pre_remove()
 {
-	local root
-	root=$1
-	if [ -z "$root" -a -x /etc/init.d/cupsd ]; then
-		/etc/init.d/cupsd stop
-	fi
-}
-
-# Overlap busybox
-pre_install()
-{
-	rm -f $1/usr/bin/lpr
+	# Stop CUPS daemon before rm.
+	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
+	:
 }
 
 post_remove()
 {
-	ln -s /bin/busybox $1/usr/bin/lpr
+	ln -s /bin/busybox "$1/usr/bin/lpr"
 }
diff -r 16d87ac5f8c3 -r 77dc6129b023 cups/receipt
--- a/cups/receipt	Wed Dec 16 23:00:12 2015 +0100
+++ b/cups/receipt	Thu Dec 17 05:25:15 2015 +0200
@@ -11,9 +11,7 @@
 WGET_URL="http://www.cups.org/software/$VERSION/$TARBALL"
 TAGS="printer printing"
 
-DEPENDS="libssl slitaz-base-files libgcrypt gnutls dbus jpeg libpng tiff zlib \
-libcomerr cups-doc libkrb5 libcomerr3 gcc-lib-base libusb-compat libtasn1 acl \
-poppler-apps cups-filters"
+DEPENDS="cups-filters libcups"
 BUILD_DEPENDS="libgcrypt-dev gnutls-dev dbus-dev jpeg-dev libpng-dev \
 tiff-dev zlib-dev libtasn1-dev openssl-dev libusb-compat-dev php-dev \
 acl-dev poppler-apps"
@@ -21,7 +19,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	patch -Np1 -i $stuff/install-sh.u
 	./configure \
 		--prefix=/usr \
@@ -43,13 +40,13 @@
 		$CONFIGURE_ARGS &&
 	make &&
 	make BUILDROOT=$DESTDIR install
-
+	cp -f $stuff/cups.desktop $install/usr/share/applications/cups.desktop
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share/pixmaps
+	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
 
 	cp -a $install/etc/cups $fs/etc
 	cp -a $install/etc/dbus* $fs/etc
@@ -58,53 +55,46 @@
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/lib/cups $fs/usr/lib
 	cp -a $install/usr/share/cups $fs/usr/share
-	cp -a $install/usr/share/icons/hicolor/32x32/apps/cups.png $fs/usr/share/pixmaps
+	cp -a $install/usr/share/icons $fs/usr/share
 	cp -a $install/var $fs
 
-        # Remove files provided by cups-filters
-        rm -f $fs/usr/share/cups/banners/*
-        rm -f $fs/usr/share/cups/data/testprint	
-	
+	# Remove files provided by cups-filters
+	rm -f $fs/usr/share/cups/banners/*
+	rm -f $fs/usr/share/cups/data/testprint
+
+	# Remove files provided by libcups
+	rm -f $fs/usr/lib/libcups.so*
+
 	# Daemon script
 	cp -a $stuff/etc $fs
 
-	# Tazpanel link
+	# TazPanel link
 	cp -a $stuff/var $fs
 }
 
-# Start cups daemon and edit daemons.conf.
 post_install()
 {
-	local root
-	root=$1
-	if [ -z "$root" -a ! -s /aufs-umount.sh ]; then
+	# Start CUPS daemon and edit daemons.conf
+	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
 		/etc/init.d/cupsd start || continue
 	fi
-	if ! grep -q ^CUPSD_OPTIONS $root/etc/daemons.conf; then
-		echo '# Cups printing daemon options.' >> $root/etc/daemons.conf
-		echo 'CUPSD_OPTIONS=""' >> $root/etc/daemons.conf
-		echo '' >> $root/etc/daemons.conf
+	if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then
+		cat >> "$1/etc/daemons.conf" <<EOT
+# CUPS printing daemon options.
+CUPSD_OPTIONS=""
+
+EOT
 	fi
 }
 
-# Stop cups daemon before rm.
 pre_remove()
 {
-	local root
-	root=$1
-	if [ -z "$root" ]; then
-		/etc/init.d/cupsd stop
-	fi
-}
-
-# Overlap busybox
-pre_install()
-{
-	rm -f $1/usr/bin/lpr
+	# Stop CUPS daemon before rm.
+	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
+	:
 }
 
 post_remove()
 {
-	ln -s /bin/busybox $1/usr/bin/lpr
+	ln -s /bin/busybox "$1/usr/bin/lpr"
 }
-
diff -r 16d87ac5f8c3 -r 77dc6129b023 cups/stuff/cups.desktop
--- a/cups/stuff/cups.desktop	Wed Dec 16 23:00:12 2015 +0100
+++ b/cups/stuff/cups.desktop	Thu Dec 17 05:25:15 2015 +0200
@@ -1,23 +1,46 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
+Name=Manage Printing
+Name[ca]=Gestor d'impressió
+Name[cs]=Správa tisku CUPS
+Name[de]=Druckerverwaltung
+Name[es]=Administrar impresión
+Name[et]=Trükkimise haldur
+Name[eu]=Kudeatu inprimaketak
+Name[fr]=Gestionnaire d'impression
+Name[he]=נהל הדפסות
+Name[id]=Manajemen Pencetakan
+Name[it]=Gestione stampa
+Name[ja]=印刷の管理
+Name[pl]=Zarządzanie drukowaniem
+Name[pt]=Gerenciamento de impressão
+Name[pt_BR]=Gerenciamento de impressão
+Name[ru]=Настройка печати
+Name[sv]=Hantera skrivare
+Name[zh]=打印机管理
+Name[zh_TW]=印表管理
+Comment=CUPS Web Interface
+Comment[ca]=Interfície web de CUPS
+Comment[cs]=Webové rozhraní CUPS
+Comment[de]=CUPS Webinterface
+Comment[es]=Interfaz Web de CUPS
+Comment[et]=CUPS-i veebiliides
+Comment[eu]=CUPSen web interfazea
+Comment[fr]=Interface Web de CUPS
+Comment[he]=ממשק דפדפן של CUPS
+Comment[id]=Antarmuka Web CUPS
+Comment[it]=Interfaccia web di CUPS
+Comment[ja]=CUPS Web インタフェース
+Comment[pl]=Interfejs WWW CUPS
+Comment[pt]=Interface Web do CUPS
+Comment[pt_BR]=Interface Web do CUPS
+Comment[ru]=Веб-интерфейс CUPS
+Comment[sv]=CUPS webb-gränssnitt
+Comment[uk]=Веб-інтерфейс CUPS
+Comment[zh]=CUPS网页界面
+Comment[zh_TW]=CUPS 網頁介面
+Terminal=false
+StartupNotify=false
 Exec=browser http://localhost:631/
 Icon=cups
-Name=Manage Printing
-Name[de]=Druckerverwaltung
-Name[es]=Administrar impresión
-Name[fr]=Gestionnaire d'impression
-Name[it]=Gestione stampa
-Name[pt]=Gerenciamento de impressão
-Name[pt_BR]=Gerenciamento de impressão
-Name[zh_TW]=印表管理
-Name[zh_CN]=打印管理
-Comment=CUPS Web Interface
-Comment[es]=Interfaz Web de CUPS
-Comment[fr]=Interface Web de CUPS
-Comment[it]=Interfaccia web di CUPS
-Comment[pt]=Interface Web do CUPS
-Comment[pt_BR]=Interface Web do CUPS
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;System;
+Categories=Settings;HardwareSettings;Printing;
diff -r 16d87ac5f8c3 -r 77dc6129b023 cups/stuff/cups.png
Binary file cups/stuff/cups.png has changed
diff -r 16d87ac5f8c3 -r 77dc6129b023 cups/stuff/etc/init.d/cupsd
--- a/cups/stuff/etc/init.d/cupsd	Wed Dec 16 23:00:12 2015 +0100
+++ b/cups/stuff/etc/init.d/cupsd	Thu Dec 17 05:25:15 2015 +0200
@@ -1,8 +1,8 @@
 #!/bin/sh
-# /etc/init.d/cups: Start, stop and restart Cups deamon on SliTaz, at boot
+# /etc/init.d/cups: Start, stop and restart CUPS deamon on SliTaz, at boot
 # time or with the command line.
 #
-# To start daemon at boot time, add cupsd to the $RUN_DAEMONS variable
+# To start daemon at boot time, add 'cupsd' to the $RUN_DAEMONS variable
 # of /etc/rcS.conf and configure options with /etc/daemons.conf.
 #
 . /etc/init.d/rc.functions
@@ -16,27 +16,25 @@
 
 case "$1" in
 	stop)
-		echo -n "Stopping $DESC: $NAME... "
+		action 'Stopping $DESC: $NAME... '
 		kill $(pgrep -f cupsd)
 		sleep 2
 		[ -e /var/run/cups/cups.sock ] && rm -f $PIDFILE
 		status
 		;;
 	start)
-		if ! active_pidfile $PIDFILE cupsd 2> /dev/null ; then
-			echo -n "Starting $DESC: $NAME... "
+		if ! active_pidfile $PIDFILE cupsd 2>/dev/null; then
+			action 'Starting $DESC: $NAME... '
 			$DAEMON $OPTIONS
 			status
 		else
-			echo -n "Not starting $DESC: $DESC is already running"
-			false
-			status
+			action 'Not starting $DESC: $DESC is already running'
+			false; status
 		fi
 		;;
 	*)
-		echo ""
-		echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop]"
-		echo ""
+		emsg "<n><b>Usage:</b> /etc/init.d/$(basename $0) [start|stop]"
+		newline
 		exit 1
 		;;
 esac
diff -r 16d87ac5f8c3 -r 77dc6129b023 libcups/receipt
--- a/libcups/receipt	Wed Dec 16 23:00:12 2015 +0100
+++ b/libcups/receipt	Thu Dec 17 05:25:15 2015 +0200
@@ -7,10 +7,10 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2 LGPL2"
 WEB_SITE="http://www.cups.org/"
-WANTED="cups"
 TAGS="printer printing"
 
-DEPENDS="libssl"
+WANTED="cups"
+DEPENDS="libgnutls zlib"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 16d87ac5f8c3 -r 77dc6129b023 slitaz-menus/receipt
--- a/slitaz-menus/receipt	Wed Dec 16 23:00:12 2015 +0100
+++ b/slitaz-menus/receipt	Thu Dec 17 05:25:15 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-menus"
-VERSION="2.4.2"
+VERSION="2.4.3"
 CATEGORY="x-window"
 SHORT_DESC="SliTaz i18n Freedesktop menus"
 MAINTAINER="pankso@slitaz.org"
diff -r 16d87ac5f8c3 -r 77dc6129b023 slitaz-menus/stuff/desktop-directories/Science.directory
--- a/slitaz-menus/stuff/desktop-directories/Science.directory	Wed Dec 16 23:00:12 2015 +0100
+++ b/slitaz-menus/stuff/desktop-directories/Science.directory	Thu Dec 17 05:25:15 2015 +0200
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Directory
 Name=Science
 Name[br]=Skiant