# HG changeset patch # User Christopher Rogers # Date 1370081555 0 # Node ID d66c8cb687e8649d772ba57befe3c2ae02e48785 # Parent a94ccb8c0d25a2f56cc10e47a4ff9becd0ec19c8 Up: cups to 1.6.1. diff -r a94ccb8c0d25 -r d66c8cb687e8 cups-dev/receipt --- a/cups-dev/receipt Sat Jun 01 10:03:23 2013 +0000 +++ b/cups-dev/receipt Sat Jun 01 10:12:35 2013 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt." PACKAGE="cups-dev" -VERSION="1.5.3" +VERSION="1.6.1" CATEGORY="development" SHORT_DESC="Common UNIX Printing System dev files." MAINTAINER="erjo@slitaz.org" @@ -12,6 +12,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - cp -a $_pkg/usr/include $fs/usr - cp -a $_pkg/usr/lib/*.*a $fs/usr/lib + cp -a $install/usr/include $fs/usr + cp -a $install/usr/lib/*.*a $fs/usr/lib } diff -r a94ccb8c0d25 -r d66c8cb687e8 cups-doc/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cups-doc/receipt Sat Jun 01 10:12:35 2013 +0000 @@ -0,0 +1,17 @@ +# SliTaz package receipt. + +PACKAGE="cups-doc" +VERSION="1.6.1" +CATEGORY="misc" +SHORT_DESC="Docs for cups" +MAINTAINER="slaxemulator@gmail.com" +WEB_SITE="http://www.cups.org/" +WANTED="cups" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/share + # We need the doc for CSS, images and help in the web interface. + cp -a $install/usr/share/doc $fs/usr/share +} diff -r a94ccb8c0d25 -r d66c8cb687e8 cups/receipt --- a/cups/receipt Sat Jun 01 10:03:23 2013 +0000 +++ b/cups/receipt Sat Jun 01 10:12:35 2013 +0000 @@ -1,23 +1,26 @@ # SliTaz package receipt. PACKAGE="cups" -VERSION="1.5.3" +VERSION="1.6.1" CATEGORY="system-tools" SHORT_DESC="Common UNIX Printing System." MAINTAINER="erjo@slitaz.org" -DEPENDS="libssl slitaz-base-files gnutls dbus jpeg libpng tiff zlib \ -libcomerr libkrb5 gcc-lib-base libusb-compat libtasn1 poppler-apps" -BUILD_DEPENDS="openssl-dev php-dev poppler-apps" TARBALL="$PACKAGE-$VERSION-source.tar.bz2" WEB_SITE="http://www.cups.org/" WGET_URL="ftp://ftp.easysw.com/pub/cups/$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" +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" + # Rules to configure and make the package. compile_rules() { cd $src - patch -p1 < $stuff/install-sh.u + patch -Np1 -i $stuff/install-sh.u ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -37,7 +40,7 @@ --with-pdftops=pdftops \ $CONFIGURE_ARGS && make && - make BUILDROOT=$PWD/_pkg install + make BUILDROOT=$DESTDIR install } @@ -46,18 +49,15 @@ { mkdir -p $fs/etc $fs/usr/lib $fs/usr/share/pixmaps - cp -a $_pkg/etc/cups $fs/etc - cp -a $_pkg/etc/dbus* $fs/etc - cp -a $_pkg/usr/bin $fs/usr - cp -a $_pkg/usr/sbin $fs/usr - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib - cp -a $_pkg/usr/lib/cups $fs/usr/lib - cp -a $_pkg/usr/share/cups $fs/usr/share - cp -a $_pkg/usr/share/icons/hicolor/32x32/apps/cups.png $fs/usr/share/pixmaps - cp -a $_pkg/var $fs - - # We need the doc for CSS, images and help in the web interface. - cp -a $_pkg/usr/share/doc $fs/usr/share + cp -a $install/etc/cups $fs/etc + cp -a $install/etc/dbus* $fs/etc + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/sbin $fs/usr + 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/var $fs # tazwok does not strip files other than .so in usr/lib @@ -90,7 +90,11 @@ # Stop cups daemon before rm. pre_remove() { - [ -z "$1" ] && /etc/init.d/cupsd stop + local root + root=$1 + if [ -z "$root" ]; then + /etc/init.d/cupsd stop + fi } # Overlap busybox @@ -101,5 +105,5 @@ post_remove() { - ln -s /bin/busybox /usr/bin/lpr + ln -s /bin/busybox $1/usr/bin/lpr } diff -r a94ccb8c0d25 -r d66c8cb687e8 cups/stuff/cups.desktop --- a/cups/stuff/cups.desktop Sat Jun 01 10:03:23 2013 +0000 +++ b/cups/stuff/cups.desktop Sat Jun 01 10:12:35 2013 +0000 @@ -1,28 +1,19 @@ [Desktop Entry] -Type=Application +Encoding=UTF-8 +Exec=browser http://localhost:631/ +Icon=cups Name=Manage Printing -Name[ca]=Gestor d'impressió Name[de]=Druckerverwaltung Name[es]=Administrar impresión Name[fr]=Gestionnaire d'impression -Name[id]=Manajemen Pencetakan Name[it]=Gestione stampa -Name[ru]=Настройка печати -Name[sv]=Hantera skrivare +Name[zh_TW]=印表管理 Name[zh_CN]=打印管理 -Name[zh_TW]=印表管理 Comment=CUPS Web Interface -Comment[de]=CUPS Webinterface Comment[es]=Interfaz Web de CUPS Comment[fr]=Interface Web de CUPS -Comment[id]=Antarmuka Web CUPS Comment[it]=Interfaccia web di CUPS -Comment[ru]=Веб-интерфейс CUPS -Comment[sv]=CUPS webb-gränssnitt -Comment[zh_CN]=CUPS网页界面 -Comment[zh_TW]=CUPS 網頁介面 -Exec=browser http://localhost:631/ -Icon=cups +StartupNotify=false Terminal=false -StartupNotify=false -Categories=Settings; \ No newline at end of file +Type=Application +Categories=Application;System; diff -r a94ccb8c0d25 -r d66c8cb687e8 cups/stuff/etc/init.d/cupsd --- a/cups/stuff/etc/init.d/cupsd Sat Jun 01 10:03:23 2013 +0000 +++ b/cups/stuff/etc/init.d/cupsd Sat Jun 01 10:12:35 2013 +0000 @@ -18,7 +18,6 @@ stop) echo -n "Stopping $DESC: $NAME... " killall -q cupsd - sleep 2 rm -f $PIDFILE status ;;