From f03f39a74d2f6502712e73e49d67d346aa9d79d0 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sun, 28 Feb 2010 22:05:03 +0100
Subject: Maj cups#1.4.2-2, scindé en 2 ports lib et utilitaires
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/cups/.footprint | 35 -----------------------------------
 extra/cups/Pkgfile    | 10 ++++++----
 2 files changed, 6 insertions(+), 39 deletions(-)

(limited to 'extra/cups')

diff --git a/extra/cups/.footprint b/extra/cups/.footprint
index 0399a7fc2..d6c531279 100644
--- a/extra/cups/.footprint
+++ b/extra/cups/.footprint
@@ -33,7 +33,6 @@ drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -r-xr-xr-x	root/root	usr/bin/cancel
--r-xr-xr-x	root/root	usr/bin/cups-config
 -r-xr-xr-x	root/root	usr/bin/cupstestdsc
 -r-xr-xr-x	root/root	usr/bin/cupstestppd
 -r-xr-xr-x	root/root	usr/bin/lp
@@ -48,28 +47,6 @@ drwxr-xr-x	root/root	usr/bin/
 -r-xr-xr-x	root/root	usr/bin/ppdi
 -r-xr-xr-x	root/root	usr/bin/ppdmerge
 -r-xr-xr-x	root/root	usr/bin/ppdpo
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/cups/
--r--r--r--	root/root	usr/include/cups/adminutil.h
--r--r--r--	root/root	usr/include/cups/array.h
--r--r--r--	root/root	usr/include/cups/backend.h
--r--r--r--	root/root	usr/include/cups/cgi.h
--r--r--r--	root/root	usr/include/cups/cups.h
--r--r--r--	root/root	usr/include/cups/dir.h
--r--r--r--	root/root	usr/include/cups/driver.h
--r--r--r--	root/root	usr/include/cups/file.h
--r--r--r--	root/root	usr/include/cups/help-index.h
--r--r--r--	root/root	usr/include/cups/http.h
--r--r--r--	root/root	usr/include/cups/image.h
--r--r--r--	root/root	usr/include/cups/ipp.h
--r--r--r--	root/root	usr/include/cups/language.h
--r--r--r--	root/root	usr/include/cups/mime.h
--r--r--r--	root/root	usr/include/cups/ppd.h
--r--r--r--	root/root	usr/include/cups/ppdc.h
--r--r--r--	root/root	usr/include/cups/raster.h
--r--r--r--	root/root	usr/include/cups/sidechannel.h
--r--r--r--	root/root	usr/include/cups/transcode.h
--r--r--r--	root/root	usr/include/cups/versioning.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
 drwxr-xr-x	root/root	usr/lib/cups/backend/
@@ -118,18 +95,6 @@ drwxr-xr-x	root/root	usr/lib/cups/monitor/
 drwxr-xr-x	root/root	usr/lib/cups/notifier/
 -r-xr-xr-x	root/root	usr/lib/cups/notifier/mailto
 -r-xr-xr-x	root/root	usr/lib/cups/notifier/rss
-lrwxrwxrwx	root/root	usr/lib/libcups.so -> libcups.so.2
--r-xr-xr-x	root/root	usr/lib/libcups.so.2
-lrwxrwxrwx	root/root	usr/lib/libcupscgi.so -> libcupscgi.so.1
--r-xr-xr-x	root/root	usr/lib/libcupscgi.so.1
-lrwxrwxrwx	root/root	usr/lib/libcupsdriver.so -> libcupsdriver.so.1
--r-xr-xr-x	root/root	usr/lib/libcupsdriver.so.1
-lrwxrwxrwx	root/root	usr/lib/libcupsimage.so -> libcupsimage.so.2
--r-xr-xr-x	root/root	usr/lib/libcupsimage.so.2
-lrwxrwxrwx	root/root	usr/lib/libcupsmime.so -> libcupsmime.so.1
--r-xr-xr-x	root/root	usr/lib/libcupsmime.so.1
-lrwxrwxrwx	root/root	usr/lib/libcupsppdc.so -> libcupsppdc.so.1
--r-xr-xr-x	root/root	usr/lib/libcupsppdc.so.1
 drwxr-xr-x	root/root	usr/sbin/
 lrwxrwxrwx	root/root	usr/sbin/accept -> cupsaccept
 -r-xr-xr-x	root/root	usr/sbin/cupsaccept
diff --git a/extra/cups/Pkgfile b/extra/cups/Pkgfile
index 9262fdfff..6ec44907d 100755
--- a/extra/cups/Pkgfile
+++ b/extra/cups/Pkgfile
@@ -1,12 +1,12 @@
-# Description: Common UNIX Printing System, le système d'impression pour Linux
+# Description: Serveur et programmes pour Common UNIX Printing System, le système d'impression pour Linux
 # URL: http://www.cups.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libjpeg, libpng, libtiff, poppler, xdg-utils, dbus, hicolor-icon-theme, linux-pam
+# Depends on: libcups, dbus-glib, libusb, hicolor-icon-theme
 
 name=cups
 version=1.4.2
-release=1
+release=2
 source=( http://ftp.easysw.com/pub/$name/$version/$name-$version-source.tar.bz2\
        cups)
 
@@ -30,7 +30,9 @@ build() {
 		--enable-gnutls=no \
 		--infodir=/usr/share/info
 	make -j3
-	make BUILDROOT=$PKG install
+	make BUILDROOT=$PKG install-data install-exec
+	# Appartient à libcups
+	rm -f $PKG/usr/bin/cups-config
 	# Startup Script 
 	cd ../$scripts-$scriptsversion
 	make DESTDIR=$PKG install-$name
-- 
cgit v1.2.3-70-g09d2