[Pkg-cups-devel] r542 - in cupsys/branches/cups-1.2-ubuntu/debian: . local local/filters
Martin Pitt
mpitt at alioth.debian.org
Fri Aug 10 16:12:49 UTC 2007
Author: mpitt
Date: Fri Aug 10 16:12:49 2007
New Revision: 542
Log:
merge changes from trunk
Added:
cupsys/branches/cups-1.2-ubuntu/debian/local/filters/
- copied from r541, /cupsys/trunk/debian/local/filters/
Removed:
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.files
cupsys/branches/cups-1.2-ubuntu/debian/local/oopstops.pl
cupsys/branches/cups-1.2-ubuntu/debian/local/textonly.filter
cupsys/branches/cups-1.2-ubuntu/debian/pdftops
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.logrotate
cupsys/branches/cups-1.2-ubuntu/debian/rules
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Fri Aug 10 16:12:49 2007
@@ -1,3 +1,17 @@
+cupsys (1.2.12-3ubuntu2) 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.
+ * Merge debian/cupsys.files into debian/cupsys.install and remove the
+ former. Two different files are just too confusing.
+ * debian/local/filters/pdftops: Do not pass /etc/cups/pdftops.conf to
+ pdftops if it does not exist (poppler-utils does not have this file).
+ (LP: #125300)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 10 Aug 2007 18:11:56 +0200
+
cupsys (1.2.12-3ubuntu1) gutsy; urgency=low
* Merge latest fixes from Debian unstable. (LP: #29050)
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install Fri Aug 10 16:12:49 2007
@@ -1 +1,36 @@
-debian/presubj usr/share/bug/cupsys
+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/branches/cups-1.2-ubuntu/debian/cupsys.logrotate
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.logrotate (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.logrotate Fri Aug 10 16:12:49 2007
@@ -11,5 +11,5 @@
endscript
compress
notifempty
- create 640 cupsys lpadmin
+ create 640 root lpadmin
}
Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules Fri Aug 10 16:12:49 2007
@@ -24,6 +24,7 @@
DEB_DH_INSTALLINIT_ARGS := -u'multiuser 19'
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,14 +35,7 @@
dh_movefiles -p$(cdbs_curpkg)
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 +46,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/*
# install AppArmor profile
install -D -m 644 debian/local/apparmor-profile $(DEB_DESTDIR)/../cupsys/etc/apparmor.d/usr.sbin.cupsd
More information about the Pkg-cups-devel
mailing list