wok-6.x rev 14621

Up: cups to 1.6.1.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Jun 01 10:12:35 2013 +0000 (2013-06-01)
parents a94ccb8c0d25
children a2bab5234954
files cups-dev/receipt cups-doc/receipt cups/receipt cups/stuff/cups.desktop cups/stuff/etc/init.d/cupsd
line diff
     1.1 --- a/cups-dev/receipt	Sat Jun 01 10:03:23 2013 +0000
     1.2 +++ b/cups-dev/receipt	Sat Jun 01 10:12:35 2013 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt."
     1.5  
     1.6  PACKAGE="cups-dev"
     1.7 -VERSION="1.5.3"
     1.8 +VERSION="1.6.1"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Common UNIX Printing System dev files."
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12 @@ -12,6 +12,6 @@
    1.13  genpkg_rules()
    1.14  {
    1.15  	mkdir -p $fs/usr/lib
    1.16 -	cp -a $_pkg/usr/include $fs/usr
    1.17 -	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    1.18 +	cp -a $install/usr/include $fs/usr
    1.19 +	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.20  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/cups-doc/receipt	Sat Jun 01 10:12:35 2013 +0000
     2.3 @@ -0,0 +1,17 @@
     2.4 +# SliTaz package receipt.
     2.5 +
     2.6 +PACKAGE="cups-doc"
     2.7 +VERSION="1.6.1"
     2.8 +CATEGORY="misc"
     2.9 +SHORT_DESC="Docs for cups"
    2.10 +MAINTAINER="slaxemulator@gmail.com"
    2.11 +WEB_SITE="http://www.cups.org/"
    2.12 +WANTED="cups"
    2.13 +
    2.14 +# Rules to gen a SliTaz package suitable for Tazpkg.
    2.15 +genpkg_rules()
    2.16 +{
    2.17 +	mkdir -p $fs/usr/share
    2.18 +	# We need the doc for CSS, images and help in the web interface.
    2.19 +	cp -a $install/usr/share/doc $fs/usr/share
    2.20 +}
     3.1 --- a/cups/receipt	Sat Jun 01 10:03:23 2013 +0000
     3.2 +++ b/cups/receipt	Sat Jun 01 10:12:35 2013 +0000
     3.3 @@ -1,23 +1,26 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="cups"
     3.7 -VERSION="1.5.3"
     3.8 +VERSION="1.6.1"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="Common UNIX Printing System."
    3.11  MAINTAINER="erjo@slitaz.org"
    3.12 -DEPENDS="libssl slitaz-base-files gnutls dbus jpeg libpng tiff zlib \
    3.13 -libcomerr libkrb5 gcc-lib-base libusb-compat libtasn1 poppler-apps"
    3.14 -BUILD_DEPENDS="openssl-dev php-dev poppler-apps"
    3.15  TARBALL="$PACKAGE-$VERSION-source.tar.bz2"
    3.16  WEB_SITE="http://www.cups.org/"
    3.17  WGET_URL="ftp://ftp.easysw.com/pub/cups/$VERSION/$TARBALL"
    3.18  TAGS="printer printing"
    3.19  
    3.20 +DEPENDS="libssl slitaz-base-files libgcrypt gnutls dbus jpeg libpng tiff zlib \
    3.21 +libcomerr cups-doc libkrb5 libcomerr3 gcc-lib-base libusb-compat libtasn1 acl poppler-apps"
    3.22 +BUILD_DEPENDS="libgcrypt-dev gnutls-dev dbus-dev jpeg-dev libpng-dev \
    3.23 +tiff-dev zlib-dev libtasn1-dev openssl-dev libusb-compat-dev php-dev \
    3.24 +acl-dev poppler-apps"
    3.25 +
    3.26  # Rules to configure and make the package.
    3.27  compile_rules()
    3.28  {
    3.29  	cd $src
    3.30 -	patch -p1 < $stuff/install-sh.u
    3.31 +	patch -Np1 -i $stuff/install-sh.u
    3.32  	./configure \
    3.33  		--prefix=/usr \
    3.34  		--sysconfdir=/etc \
    3.35 @@ -37,7 +40,7 @@
    3.36  		--with-pdftops=pdftops \
    3.37  		$CONFIGURE_ARGS &&
    3.38  	make &&
    3.39 -	make BUILDROOT=$PWD/_pkg install
    3.40 +	make BUILDROOT=$DESTDIR install
    3.41  
    3.42  }
    3.43  
    3.44 @@ -46,18 +49,15 @@
    3.45  {
    3.46  	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share/pixmaps
    3.47  
    3.48 -	cp -a $_pkg/etc/cups $fs/etc
    3.49 -	cp -a $_pkg/etc/dbus* $fs/etc
    3.50 -	cp -a $_pkg/usr/bin $fs/usr
    3.51 -	cp -a $_pkg/usr/sbin $fs/usr
    3.52 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    3.53 -	cp -a $_pkg/usr/lib/cups $fs/usr/lib
    3.54 -	cp -a $_pkg/usr/share/cups $fs/usr/share
    3.55 -	cp -a $_pkg/usr/share/icons/hicolor/32x32/apps/cups.png $fs/usr/share/pixmaps
    3.56 -	cp -a $_pkg/var $fs
    3.57 -
    3.58 -	# We need the doc for CSS, images and help in the web interface.
    3.59 -	cp -a $_pkg/usr/share/doc $fs/usr/share
    3.60 +	cp -a $install/etc/cups $fs/etc
    3.61 +	cp -a $install/etc/dbus* $fs/etc
    3.62 +	cp -a $install/usr/bin $fs/usr
    3.63 +	cp -a $install/usr/sbin $fs/usr
    3.64 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    3.65 +	cp -a $install/usr/lib/cups $fs/usr/lib
    3.66 +	cp -a $install/usr/share/cups $fs/usr/share
    3.67 +	cp -a $install/usr/share/icons/hicolor/32x32/apps/cups.png $fs/usr/share/pixmaps
    3.68 +	cp -a $install/var $fs
    3.69  
    3.70  	# tazwok does not strip files other than .so in usr/lib
    3.71  
    3.72 @@ -90,7 +90,11 @@
    3.73  # Stop cups daemon before rm.
    3.74  pre_remove()
    3.75  {
    3.76 -	[ -z "$1" ] && /etc/init.d/cupsd stop
    3.77 +	local root
    3.78 +	root=$1
    3.79 +	if [ -z "$root" ]; then
    3.80 +		/etc/init.d/cupsd stop
    3.81 +	fi
    3.82  }
    3.83  
    3.84  # Overlap busybox
    3.85 @@ -101,5 +105,5 @@
    3.86  
    3.87  post_remove()
    3.88  {
    3.89 -	ln -s /bin/busybox /usr/bin/lpr
    3.90 +	ln -s /bin/busybox $1/usr/bin/lpr
    3.91  }
     4.1 --- a/cups/stuff/cups.desktop	Sat Jun 01 10:03:23 2013 +0000
     4.2 +++ b/cups/stuff/cups.desktop	Sat Jun 01 10:12:35 2013 +0000
     4.3 @@ -1,28 +1,19 @@
     4.4  [Desktop Entry]
     4.5 -Type=Application
     4.6 +Encoding=UTF-8
     4.7 +Exec=browser http://localhost:631/
     4.8 +Icon=cups
     4.9  Name=Manage Printing
    4.10 -Name[ca]=Gestor d'impressió
    4.11  Name[de]=Druckerverwaltung
    4.12  Name[es]=Administrar impresión
    4.13  Name[fr]=Gestionnaire d'impression
    4.14 -Name[id]=Manajemen Pencetakan
    4.15  Name[it]=Gestione stampa
    4.16 -Name[ru]=Настройка печати
    4.17 -Name[sv]=Hantera skrivare
    4.18 +Name[zh_TW]=印表管理
    4.19  Name[zh_CN]=打印管理
    4.20 -Name[zh_TW]=印表管理
    4.21  Comment=CUPS Web Interface
    4.22 -Comment[de]=CUPS Webinterface
    4.23  Comment[es]=Interfaz Web de CUPS
    4.24  Comment[fr]=Interface Web de CUPS
    4.25 -Comment[id]=Antarmuka Web CUPS
    4.26  Comment[it]=Interfaccia web di CUPS
    4.27 -Comment[ru]=Веб-интерфейс CUPS
    4.28 -Comment[sv]=CUPS webb-gränssnitt
    4.29 -Comment[zh_CN]=CUPS网页界面
    4.30 -Comment[zh_TW]=CUPS 網頁介面
    4.31 -Exec=browser http://localhost:631/
    4.32 -Icon=cups
    4.33 +StartupNotify=false
    4.34  Terminal=false
    4.35 -StartupNotify=false
    4.36 -Categories=Settings;
    4.37 \ No newline at end of file
    4.38 +Type=Application
    4.39 +Categories=Application;System;
     5.1 --- a/cups/stuff/etc/init.d/cupsd	Sat Jun 01 10:03:23 2013 +0000
     5.2 +++ b/cups/stuff/etc/init.d/cupsd	Sat Jun 01 10:12:35 2013 +0000
     5.3 @@ -18,7 +18,6 @@
     5.4  	stop)
     5.5  		echo -n "Stopping $DESC: $NAME... "
     5.6  		killall -q cupsd
     5.7 -		sleep 2
     5.8  		rm -f $PIDFILE
     5.9  		status
    5.10  		;;