[Pkg-cups-devel] r189 - cupsys/branches/cups-1.2/debian

[Martin Pitt]

Author: mpitt
Date: Wed Apr 19 11:17:27 2006
New Revision: 189

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.dirs
   cupsys/branches/cups-1.2/debian/rules
Log:
Merge PpdFileStructureSpecification fix from Ubuntu branch:
* Implement http://wiki.debian.org/PpdFileStructureSpecification:
  - debian/dirs: Create /usr/share/ppd/cups-included/.
  - debian/rules: Install shipped PPDs into
    /usr/share/ppd/cups-included/<Manufacturer>/ and provide a symlink to
    the old /usr/share/cups/model directory for backwards compatibility.



Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Apr 19 11:17:27 2006
@@ -3,8 +3,13 @@
   [Martin Pitt]
   * debian/patches/55_ppd_okidata_name.dpatch: Change "Oki" manufacturer name
     to "Okidata" to be consistent with other PPD files.
+  * Implement http://wiki.debian.org/PpdFileStructureSpecification:
+    - debian/dirs: Create /usr/share/ppd/cups-included/.
+    - debian/rules: Install shipped PPDs into
+      /usr/share/ppd/cups-included/<Manufacturer>/ and provide a symlink to
+      the old /usr/share/cups/model directory for backwards compatibility.
 
- -- Kenshi Muto <kmuto at debian.org>  Wed, 19 Apr 2006 13:08:15 +0200
+ -- Kenshi Muto <kmuto at debian.org>  Wed, 19 Apr 2006 13:11:08 +0200
 
 cupsys (1.1.99.rc2-0exp1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.dirs
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.dirs	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.dirs	Wed Apr 19 11:17:27 2006
@@ -4,3 +4,4 @@
 etc/cups/cups.d
 usr/lib/cups/backend-available
 var/cache/cups/ppd
+usr/share/ppd/cups-included

Modified: cupsys/branches/cups-1.2/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2/debian/rules	(original)
+++ cupsys/branches/cups-1.2/debian/rules	Wed Apr 19 11:17:27 2006
@@ -57,6 +57,17 @@
 	install -o root -g root -m 644 debian/cupsys.default debian/cupsys/etc/default/cupsys
 	install -m 755 debian/local/browsing_status debian/local/enable_browsing $(DEB_DESTDIR)/../cupsys/usr/share/cups
 
+	# Install PPDs into /usr/share/ppd/cups-included/<Manufacturer>, see
+	# http://wiki.debian.org/PpdFileStructureSpecification
+	for i in $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/*.ppd; do \
+	  m=$$(sed -n -e '/^\*Manufacturer:/s/.*"\([^"]*\)".*/\1/p' $$i); \
+	  mkdir -p "$(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-included/$$m"; \
+	  mv $$i "$(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-included/$$m/"; \
+	done
+
+	# Compatibility for programs which still look in the old location
+	ln -s ../../ppd/cups-included $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/cups-included
+
 binary-post-install/libcupsimage2-dev::
 	rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
 	ln -s libcupsimage2 debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev