[Pkg-cups-devel] r538 - in cupsys/trunk/debian: . local local/filters

[Martin Pitt]

Author: mpitt
Date: Fri Aug 10 07:29:14 2007
New Revision: 538

Log:
* Moved all Debian specific filters to debian/local/filters.
* Cleaned up debian/rules, moved some file installs to
  debian/cupsys.install.

Added:
   cupsys/trunk/debian/local/filters/
   cupsys/trunk/debian/local/filters/oopstops
      - copied unchanged from r534, /cupsys/trunk/debian/local/oopstops.pl
   cupsys/trunk/debian/local/filters/pdftops
      - copied unchanged from r534, /cupsys/trunk/debian/pdftops
   cupsys/trunk/debian/local/filters/textonly
      - copied unchanged from r534, /cupsys/trunk/debian/local/textonly.filter
Removed:
   cupsys/trunk/debian/local/oopstops.pl
   cupsys/trunk/debian/local/textonly.filter
   cupsys/trunk/debian/pdftops
Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/cupsys.install
   cupsys/trunk/debian/rules

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Fri Aug 10 07:29:14 2007
@@ -1,8 +1,11 @@
 cupsys (1.2.12-4) UNRELEASED; urgency=low
 
   * cupsys.logrotate: Fix last occurence of 'cupsys' user.
+  * Moved all Debian specific filters to debian/local/filters.
+  * Cleaned up debian/rules, moved some file installs to
+    debian/cupsys.install.
 
- -- Martin Pitt <mpitt at debian.org>  Fri, 10 Aug 2007 08:57:06 +0200
+ -- Martin Pitt <mpitt at debian.org>  Fri, 10 Aug 2007 09:27:09 +0200
 
 cupsys (1.2.12-3) unstable; urgency=low
 

Modified: cupsys/trunk/debian/cupsys.install
==============================================================================
--- cupsys/trunk/debian/cupsys.install	(original)
+++ cupsys/trunk/debian/cupsys.install	Fri Aug 10 07:29:14 2007
@@ -1 +1,5 @@
-debian/presubj	usr/share/bug/cupsys
+debian/presubj	usr/share/bug/cupsys/
+debian/local/filters/* usr/lib/cups/filter/
+debian/local/*.ppd usr/share/ppd/cups-included/
+debian/local/*.types usr/share/cups/mime/
+debian/local/*.convs usr/share/cups/mime/

Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules	(original)
+++ cupsys/trunk/debian/rules	Fri Aug 10 07:29:14 2007
@@ -35,13 +35,9 @@
 
 binary-post-install/cupsys::
 	mv debian/cupsys/usr/lib/cups/backend/* debian/cupsys/usr/lib/cups/backend-available
-	install -o root -g root -m 644 doc/favicon.ico debian/cupsys/usr/share/cups/doc-root
 	(cd $(DEB_DESTDIR) && mv var/spool var/log $(DEB_DESTDIR)/../cupsys/var)
 	(cd $(DEB_DESTDIR) && mv etc/cups/interfaces etc/cups/ppd $(DEB_DESTDIR)/../cupsys/etc/cups)
 	(cd $(DEB_DESTDIR)/../cupsys/usr/share/doc/cupsys && ln -sf ../../cups/doc-root online-docs)
-	#(cd $(DEB_DESTDIR)/../cupsys/usr/share/man && mv man1/backend.1 man1/cups-backend.1 && mv man1/filter.1 man1/cups-filter.1)
-	(install -m 755 -o root -g root $(DEB_DESTDIR)/../pdftops $(DEB_DESTDIR)/../cupsys/usr/lib/cups/filter/)
-	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 debian/local/sharing_status debian/local/enable_sharing $(DEB_DESTDIR)/../cupsys/usr/share/cups
 
 	# Install PPDs into /usr/share/ppd/cups-included/<Manufacturer>, see
@@ -52,26 +48,14 @@
 	  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
-	#ln -s ../cups/model $(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-transitional-dir
 	dh_usrlocal
 
 	# Install DBUS configuration file so that job progress is reported to
 	# the system-config-printer applet
 	install -D -m 644 packaging/cups-dbus.conf $(DEB_DESTDIR)/../cupsys/etc/dbus-1/system.d/cups.conf
 
-	# Install driver and PPD for text-only printers
-	install -D -m 644 debian/local/textonly.ppd $(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-included/textonly.ppd
-	install -D -m 755 debian/local/textonly.filter $(DEB_DESTDIR)/../cupsys/usr/lib/cups/filter/textonly
-
-	# Helge Blischke's oopstops filter to work around bugs in
-	# OpenOffice.org's PostScript output from
-	# http://www.srz.de/Members/bla/cups/filter/oopstops
-	install -m 755 -o root -g root debian/local/oopstops.pl $(DEB_DESTDIR)/../cupsys/usr/lib/cups/filter/oopstops
-	install -d $(DEB_DESTDIR)/../cupsys/usr/share/cups/mime/
-	install -m 644 -o root -g root debian/local/oopstops.types $(DEB_DESTDIR)/../cupsys/usr/share/cups/mime/
-	install -m 644 -o root -g root debian/local/oopstops.convs $(DEB_DESTDIR)/../cupsys/usr/share/cups/mime/
+	# Fix permissions of filters installed from debian/local/
+	chmod 755 debian/cupsys/usr/lib/cups/filter/*
 
 binary-post-install/libcupsimage2-dev::
 	rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev