wok-next rev 18716
cups, cups-pam: remove duplicate files with libcups; misc. edits.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Dec 17 05:25:15 2015 +0200 (2015-12-17) |
| parents | 16d87ac5f8c3 |
| children | 247563705078 |
| files | cups-pam/receipt cups/receipt cups/stuff/cups.desktop cups/stuff/cups.png cups/stuff/etc/init.d/cupsd libcups/receipt slitaz-menus/receipt slitaz-menus/stuff/desktop-directories/Science.directory |
line diff
1.1 --- a/cups-pam/receipt Wed Dec 16 23:00:12 2015 +0100 1.2 +++ b/cups-pam/receipt Thu Dec 17 05:25:15 2015 +0200 1.3 @@ -3,7 +3,7 @@ 1.4 PACKAGE="cups-pam" 1.5 VERSION="2.0.2" 1.6 CATEGORY="system-tools" 1.7 -SHORT_DESC="Common UNIX Printing System with pam support." 1.8 +SHORT_DESC="Common UNIX Printing System with PAM support." 1.9 MAINTAINER="pascal.bellard@slitaz.org" 1.10 LICENSE="GPL2 LGPL2" 1.11 SOURCE="cups" 1.12 @@ -12,15 +12,13 @@ 1.13 WGET_URL="http://www.cups.org/software/$VERSION/$TARBALL" 1.14 PROVIDE="cups:pam" 1.15 1.16 -DEPENDS="libssl libgcrypt cups-doc slitaz-base-files gnutls dbus jpeg libpng tiff \ 1.17 -zlib pam libcomerr libkrb5 acl libcomerr3 cups-filters" 1.18 +DEPENDS="pam cups-filters libcups" 1.19 BUILD_DEPENDS="openssl-dev gnutls-dev dbus-dev jpeg-dev libpng-dev tiff-dev \ 1.20 pam libcomerr-dev pam-dev acl-dev libgcrypt-dev" 1.21 1.22 # Rules to configure and make the package. 1.23 compile_rules() 1.24 { 1.25 - cd $src 1.26 patch -Np1 -i ${WOK}/cups/stuff/install-sh.u 1.27 ./configure \ 1.28 --prefix=/usr \ 1.29 @@ -36,13 +34,14 @@ 1.30 $CONFIGURE_ARGS && 1.31 make && 1.32 make BUILDROOT=$DESTDIR install 1.33 + cp -f $WOK/cups/stuff/cups.desktop $install/usr/share/applications/cups.desktop 1.34 } 1.35 1.36 # Rules to gen a SliTaz package suitable for Tazpkg. 1.37 genpkg_rules() 1.38 { 1.39 - mkdir -p $fs/etc $fs/usr/lib $fs/usr/share/pixmaps 1.40 - 1.41 + mkdir -p $fs/etc $fs/usr/lib $fs/usr/share 1.42 + 1.43 cp -a $install/etc/cups $fs/etc 1.44 cp -a $install/etc/dbus* $fs/etc 1.45 cp -a $install/usr/bin $fs/usr 1.46 @@ -50,53 +49,50 @@ 1.47 cp -a $install/usr/lib/*.so* $fs/usr/lib 1.48 cp -a $install/usr/lib/cups $fs/usr/lib 1.49 cp -a $install/usr/share/cups $fs/usr/share 1.50 - cp -a $install/usr/share/icons/hicolor/32x32/apps/cups.png \ 1.51 - $fs/usr/share/pixmaps 1.52 + cp -a $install/usr/share/icons $fs/usr/share 1.53 cp -a $install/var $fs 1.54 - 1.55 + 1.56 # Remove files provided by cups-filters 1.57 rm -f $fs/usr/share/cups/banners/* 1.58 rm -f $fs/usr/share/cups/data/testprint 1.59 - 1.60 + 1.61 + # Remove files provided by libcups 1.62 + rm -f $fs/usr/lib/libcups.so* 1.63 + 1.64 # PAM conf 1.65 cp -a $stuff/etc $fs 1.66 1.67 # Daemon script 1.68 - cp -a ${WOK}/cups/stuff/etc $fs 1.69 + cp -a $WOK/cups/stuff/etc $fs 1.70 + 1.71 + # TazPanel link 1.72 + cp -a $WOK/cups/stuff/var $fs 1.73 + 1.74 } 1.75 1.76 -# Start cups daemon and edit daemons.conf. 1.77 post_install() 1.78 { 1.79 - local root 1.80 - root=$1 1.81 - if [ -z "$root" ]; then 1.82 + # Start CUPS daemon and edit daemons.conf 1.83 + if [ -z "$1" -a ! -s /aufs-umount.sh ]; then 1.84 /etc/init.d/cupsd start || continue 1.85 fi 1.86 - if ! grep -q ^CUPSD_OPTIONS $root/etc/daemons.conf; then 1.87 - echo '# Cups printing daemon options.' >> $root/etc/daemons.conf 1.88 - echo 'CUPSD_OPTIONS=""' >> $root/etc/daemons.conf 1.89 - echo '' >> $root/etc/daemons.conf 1.90 + if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then 1.91 + cat >> "$1/etc/daemons.conf" <<EOT 1.92 +# CUPS printing daemon options. 1.93 +CUPSD_OPTIONS="" 1.94 + 1.95 +EOT 1.96 fi 1.97 } 1.98 1.99 -# Stop cups daemon before rm. 1.100 pre_remove() 1.101 { 1.102 - local root 1.103 - root=$1 1.104 - if [ -z "$root" -a -x /etc/init.d/cupsd ]; then 1.105 - /etc/init.d/cupsd stop 1.106 - fi 1.107 -} 1.108 - 1.109 -# Overlap busybox 1.110 -pre_install() 1.111 -{ 1.112 - rm -f $1/usr/bin/lpr 1.113 + # Stop CUPS daemon before rm. 1.114 + [ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop 1.115 + : 1.116 } 1.117 1.118 post_remove() 1.119 { 1.120 - ln -s /bin/busybox $1/usr/bin/lpr 1.121 + ln -s /bin/busybox "$1/usr/bin/lpr" 1.122 }
2.1 --- a/cups/receipt Wed Dec 16 23:00:12 2015 +0100 2.2 +++ b/cups/receipt Thu Dec 17 05:25:15 2015 +0200 2.3 @@ -11,9 +11,7 @@ 2.4 WGET_URL="http://www.cups.org/software/$VERSION/$TARBALL" 2.5 TAGS="printer printing" 2.6 2.7 -DEPENDS="libssl slitaz-base-files libgcrypt gnutls dbus jpeg libpng tiff zlib \ 2.8 -libcomerr cups-doc libkrb5 libcomerr3 gcc-lib-base libusb-compat libtasn1 acl \ 2.9 -poppler-apps cups-filters" 2.10 +DEPENDS="cups-filters libcups" 2.11 BUILD_DEPENDS="libgcrypt-dev gnutls-dev dbus-dev jpeg-dev libpng-dev \ 2.12 tiff-dev zlib-dev libtasn1-dev openssl-dev libusb-compat-dev php-dev \ 2.13 acl-dev poppler-apps" 2.14 @@ -21,7 +19,6 @@ 2.15 # Rules to configure and make the package. 2.16 compile_rules() 2.17 { 2.18 - cd $src 2.19 patch -Np1 -i $stuff/install-sh.u 2.20 ./configure \ 2.21 --prefix=/usr \ 2.22 @@ -43,13 +40,13 @@ 2.23 $CONFIGURE_ARGS && 2.24 make && 2.25 make BUILDROOT=$DESTDIR install 2.26 - 2.27 + cp -f $stuff/cups.desktop $install/usr/share/applications/cups.desktop 2.28 } 2.29 2.30 # Rules to gen a SliTaz package suitable for Tazpkg. 2.31 genpkg_rules() 2.32 { 2.33 - mkdir -p $fs/etc $fs/usr/lib $fs/usr/share/pixmaps 2.34 + mkdir -p $fs/etc $fs/usr/lib $fs/usr/share 2.35 2.36 cp -a $install/etc/cups $fs/etc 2.37 cp -a $install/etc/dbus* $fs/etc 2.38 @@ -58,53 +55,46 @@ 2.39 cp -a $install/usr/lib/*.so* $fs/usr/lib 2.40 cp -a $install/usr/lib/cups $fs/usr/lib 2.41 cp -a $install/usr/share/cups $fs/usr/share 2.42 - cp -a $install/usr/share/icons/hicolor/32x32/apps/cups.png $fs/usr/share/pixmaps 2.43 + cp -a $install/usr/share/icons $fs/usr/share 2.44 cp -a $install/var $fs 2.45 2.46 - # Remove files provided by cups-filters 2.47 - rm -f $fs/usr/share/cups/banners/* 2.48 - rm -f $fs/usr/share/cups/data/testprint 2.49 - 2.50 + # Remove files provided by cups-filters 2.51 + rm -f $fs/usr/share/cups/banners/* 2.52 + rm -f $fs/usr/share/cups/data/testprint 2.53 + 2.54 + # Remove files provided by libcups 2.55 + rm -f $fs/usr/lib/libcups.so* 2.56 + 2.57 # Daemon script 2.58 cp -a $stuff/etc $fs 2.59 2.60 - # Tazpanel link 2.61 + # TazPanel link 2.62 cp -a $stuff/var $fs 2.63 } 2.64 2.65 -# Start cups daemon and edit daemons.conf. 2.66 post_install() 2.67 { 2.68 - local root 2.69 - root=$1 2.70 - if [ -z "$root" -a ! -s /aufs-umount.sh ]; then 2.71 + # Start CUPS daemon and edit daemons.conf 2.72 + if [ -z "$1" -a ! -s /aufs-umount.sh ]; then 2.73 /etc/init.d/cupsd start || continue 2.74 fi 2.75 - if ! grep -q ^CUPSD_OPTIONS $root/etc/daemons.conf; then 2.76 - echo '# Cups printing daemon options.' >> $root/etc/daemons.conf 2.77 - echo 'CUPSD_OPTIONS=""' >> $root/etc/daemons.conf 2.78 - echo '' >> $root/etc/daemons.conf 2.79 + if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then 2.80 + cat >> "$1/etc/daemons.conf" <<EOT 2.81 +# CUPS printing daemon options. 2.82 +CUPSD_OPTIONS="" 2.83 + 2.84 +EOT 2.85 fi 2.86 } 2.87 2.88 -# Stop cups daemon before rm. 2.89 pre_remove() 2.90 { 2.91 - local root 2.92 - root=$1 2.93 - if [ -z "$root" ]; then 2.94 - /etc/init.d/cupsd stop 2.95 - fi 2.96 -} 2.97 - 2.98 -# Overlap busybox 2.99 -pre_install() 2.100 -{ 2.101 - rm -f $1/usr/bin/lpr 2.102 + # Stop CUPS daemon before rm. 2.103 + [ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop 2.104 + : 2.105 } 2.106 2.107 post_remove() 2.108 { 2.109 - ln -s /bin/busybox $1/usr/bin/lpr 2.110 + ln -s /bin/busybox "$1/usr/bin/lpr" 2.111 } 2.112 -
3.1 --- a/cups/stuff/cups.desktop Wed Dec 16 23:00:12 2015 +0100 3.2 +++ b/cups/stuff/cups.desktop Thu Dec 17 05:25:15 2015 +0200 3.3 @@ -1,23 +1,46 @@ 3.4 [Desktop Entry] 3.5 -Encoding=UTF-8 3.6 +Type=Application 3.7 +Name=Manage Printing 3.8 +Name[ca]=Gestor d'impressió 3.9 +Name[cs]=Správa tisku CUPS 3.10 +Name[de]=Druckerverwaltung 3.11 +Name[es]=Administrar impresión 3.12 +Name[et]=Trükkimise haldur 3.13 +Name[eu]=Kudeatu inprimaketak 3.14 +Name[fr]=Gestionnaire d'impression 3.15 +Name[he]=נהל הדפסות 3.16 +Name[id]=Manajemen Pencetakan 3.17 +Name[it]=Gestione stampa 3.18 +Name[ja]=印刷の管理 3.19 +Name[pl]=Zarządzanie drukowaniem 3.20 +Name[pt]=Gerenciamento de impressão 3.21 +Name[pt_BR]=Gerenciamento de impressão 3.22 +Name[ru]=Настройка печати 3.23 +Name[sv]=Hantera skrivare 3.24 +Name[zh]=打印机管理 3.25 +Name[zh_TW]=印表管理 3.26 +Comment=CUPS Web Interface 3.27 +Comment[ca]=Interfície web de CUPS 3.28 +Comment[cs]=Webové rozhraní CUPS 3.29 +Comment[de]=CUPS Webinterface 3.30 +Comment[es]=Interfaz Web de CUPS 3.31 +Comment[et]=CUPS-i veebiliides 3.32 +Comment[eu]=CUPSen web interfazea 3.33 +Comment[fr]=Interface Web de CUPS 3.34 +Comment[he]=ממשק דפדפן של CUPS 3.35 +Comment[id]=Antarmuka Web CUPS 3.36 +Comment[it]=Interfaccia web di CUPS 3.37 +Comment[ja]=CUPS Web インタフェース 3.38 +Comment[pl]=Interfejs WWW CUPS 3.39 +Comment[pt]=Interface Web do CUPS 3.40 +Comment[pt_BR]=Interface Web do CUPS 3.41 +Comment[ru]=Веб-интерфейс CUPS 3.42 +Comment[sv]=CUPS webb-gränssnitt 3.43 +Comment[uk]=Веб-інтерфейс CUPS 3.44 +Comment[zh]=CUPS网页界面 3.45 +Comment[zh_TW]=CUPS 網頁介面 3.46 +Terminal=false 3.47 +StartupNotify=false 3.48 Exec=browser http://localhost:631/ 3.49 Icon=cups 3.50 -Name=Manage Printing 3.51 -Name[de]=Druckerverwaltung 3.52 -Name[es]=Administrar impresión 3.53 -Name[fr]=Gestionnaire d'impression 3.54 -Name[it]=Gestione stampa 3.55 -Name[pt]=Gerenciamento de impressão 3.56 -Name[pt_BR]=Gerenciamento de impressão 3.57 -Name[zh_TW]=印表管理 3.58 -Name[zh_CN]=打印管理 3.59 -Comment=CUPS Web Interface 3.60 -Comment[es]=Interfaz Web de CUPS 3.61 -Comment[fr]=Interface Web de CUPS 3.62 -Comment[it]=Interfaccia web di CUPS 3.63 -Comment[pt]=Interface Web do CUPS 3.64 -Comment[pt_BR]=Interface Web do CUPS 3.65 -StartupNotify=false 3.66 -Terminal=false 3.67 -Type=Application 3.68 -Categories=Application;System; 3.69 +Categories=Settings;HardwareSettings;Printing;
4.1 Binary file cups/stuff/cups.png has changed
5.1 --- a/cups/stuff/etc/init.d/cupsd Wed Dec 16 23:00:12 2015 +0100 5.2 +++ b/cups/stuff/etc/init.d/cupsd Thu Dec 17 05:25:15 2015 +0200 5.3 @@ -1,8 +1,8 @@ 5.4 #!/bin/sh 5.5 -# /etc/init.d/cups: Start, stop and restart Cups deamon on SliTaz, at boot 5.6 +# /etc/init.d/cups: Start, stop and restart CUPS deamon on SliTaz, at boot 5.7 # time or with the command line. 5.8 # 5.9 -# To start daemon at boot time, add cupsd to the $RUN_DAEMONS variable 5.10 +# To start daemon at boot time, add 'cupsd' to the $RUN_DAEMONS variable 5.11 # of /etc/rcS.conf and configure options with /etc/daemons.conf. 5.12 # 5.13 . /etc/init.d/rc.functions 5.14 @@ -16,27 +16,25 @@ 5.15 5.16 case "$1" in 5.17 stop) 5.18 - echo -n "Stopping $DESC: $NAME... " 5.19 + action 'Stopping $DESC: $NAME... ' 5.20 kill $(pgrep -f cupsd) 5.21 sleep 2 5.22 [ -e /var/run/cups/cups.sock ] && rm -f $PIDFILE 5.23 status 5.24 ;; 5.25 start) 5.26 - if ! active_pidfile $PIDFILE cupsd 2> /dev/null ; then 5.27 - echo -n "Starting $DESC: $NAME... " 5.28 + if ! active_pidfile $PIDFILE cupsd 2>/dev/null; then 5.29 + action 'Starting $DESC: $NAME... ' 5.30 $DAEMON $OPTIONS 5.31 status 5.32 else 5.33 - echo -n "Not starting $DESC: $DESC is already running" 5.34 - false 5.35 - status 5.36 + action 'Not starting $DESC: $DESC is already running' 5.37 + false; status 5.38 fi 5.39 ;; 5.40 *) 5.41 - echo "" 5.42 - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop]" 5.43 - echo "" 5.44 + emsg "<n><b>Usage:</b> /etc/init.d/$(basename $0) [start|stop]" 5.45 + newline 5.46 exit 1 5.47 ;; 5.48 esac
6.1 --- a/libcups/receipt Wed Dec 16 23:00:12 2015 +0100 6.2 +++ b/libcups/receipt Thu Dec 17 05:25:15 2015 +0200 6.3 @@ -7,10 +7,10 @@ 6.4 MAINTAINER="erjo@slitaz.org" 6.5 LICENSE="GPL2 LGPL2" 6.6 WEB_SITE="http://www.cups.org/" 6.7 -WANTED="cups" 6.8 TAGS="printer printing" 6.9 6.10 -DEPENDS="libssl" 6.11 +WANTED="cups" 6.12 +DEPENDS="libgnutls zlib" 6.13 6.14 # Rules to gen a SliTaz package suitable for Tazpkg. 6.15 genpkg_rules()
7.1 --- a/slitaz-menus/receipt Wed Dec 16 23:00:12 2015 +0100 7.2 +++ b/slitaz-menus/receipt Thu Dec 17 05:25:15 2015 +0200 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="slitaz-menus" 7.7 -VERSION="2.4.2" 7.8 +VERSION="2.4.3" 7.9 CATEGORY="x-window" 7.10 SHORT_DESC="SliTaz i18n Freedesktop menus" 7.11 MAINTAINER="pankso@slitaz.org"
8.1 --- a/slitaz-menus/stuff/desktop-directories/Science.directory Wed Dec 16 23:00:12 2015 +0100 8.2 +++ b/slitaz-menus/stuff/desktop-directories/Science.directory Thu Dec 17 05:25:15 2015 +0200 8.3 @@ -1,5 +1,4 @@ 8.4 [Desktop Entry] 8.5 -Encoding=UTF-8 8.6 Type=Directory 8.7 Name=Science 8.8 Name[br]=Skiant