[Pkg-cups-devel] r539 - cupsys/trunk/debian

[Martin Pitt]

Author: mpitt
Date: Fri Aug 10 07:59:21 2007
New Revision: 539

Log:
* Merge debian/cupsys.files into debian/cupsys.install and remove the
  former. Two different files are just too confusing.

Removed:
   cupsys/trunk/debian/cupsys.files
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:59:21 2007
@@ -4,8 +4,10 @@
   * Moved all Debian specific filters to debian/local/filters.
   * Cleaned up debian/rules, moved some file installs to
     debian/cupsys.install.
+  * Merge debian/cupsys.files into debian/cupsys.install and remove the
+    former. Two different files are just too confusing.
 
- -- Martin Pitt <mpitt at debian.org>  Fri, 10 Aug 2007 09:27:09 +0200
+ -- Martin Pitt <mpitt at debian.org>  Fri, 10 Aug 2007 09:55:26 +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:59:21 2007
@@ -1,5 +1,36 @@
-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/
+var/
+etc/cups/cupsd.conf
+etc/cups/ppd
+etc/cups/mime.*
+usr/lib/cups/backend/* usr/lib/cups/backend-available
+usr/lib/cups/cgi-bin
+usr/lib/cups/monitor
+usr/lib/cups/daemon/
+usr/lib/cups/filter/
+usr/lib/cups/notifier
+usr/sbin/cupsd
+usr/share/cups/banners
+usr/share/cups/data
+usr/share/cups/doc-root
+usr/share/cups/fonts
+usr/share/cups/model
+usr/share/cups/templates
+usr/share/man/man7/backend.7.gz
+usr/share/man/man7/filter.7.gz
+usr/share/man/man5/classes.conf.5.gz
+usr/share/man/man5/cupsd.conf.5.gz
+usr/share/man/man5/cups-snmp.conf.5.gz
+usr/share/man/man5/mailto.conf.5.gz
+usr/share/man/man5/subscriptions.conf.5.gz
+usr/share/man/man5/mime.convs.5.gz
+usr/share/man/man5/mime.types.5.gz
+usr/share/man/man5/printers.conf.5.gz
+usr/share/man/man8/cups-polld.8.gz
+usr/share/man/man8/cupsd.8.gz
+usr/share/man/man8/cups-deviced.8.gz
+usr/share/man/man8/cups-driverd.8.gz
+../presubj usr/share/bug/cupsys/
+../local/filters/* usr/lib/cups/filter/
+../local/*.ppd usr/share/ppd/cups-included/
+../local/*.types usr/share/cups/mime/
+../local/*.convs usr/share/cups/mime/

Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules	(original)
+++ cupsys/trunk/debian/rules	Fri Aug 10 07:59:21 2007
@@ -24,6 +24,7 @@
 DEB_DH_STRIP_ARGS := --dbg-package=cupsys-dbg
 DEB_DH_FIXPERMS_ARGS := -Xusr/lib/cups/backend-available
 DEB_DH_COMPRESS_ARGS := -Xusr/share/doc/cupsys/examples/scripting
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
 clean::
 	rm -f man/client.conf.man packaging/cups.list
@@ -34,9 +35,6 @@
 	dh_movefiles -p$(cdbs_curpkg)
 
 binary-post-install/cupsys::
-	mv debian/cupsys/usr/lib/cups/backend/* debian/cupsys/usr/lib/cups/backend-available
-	(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)
 	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