[Pkg-cups-devel] r568 - in cupsys/branches/cups-1.2-ubuntu/debian: . patches
Martin Pitt
mpitt at alioth.debian.org
Wed Aug 15 07:41:29 UTC 2007
Author: mpitt
Date: Wed Aug 15 07:41:28 2007
New Revision: 568
Log:
merge to trunk
Added:
cupsys/branches/cups-1.2-ubuntu/debian/patches/classes_crash.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/classes_crash.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/confdirperms.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/confdirperms.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/cupsaccept.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/cupsaccept.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/cupsd.conf-AllowLocal.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/cupsd.conf-AllowLocal.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/default_log_warn.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/default_log_warn.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/device_uri.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/device_uri.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/dont_force_ssl.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/dont_force_ssl.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/freebsd.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/freebsd.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/include_krb5_h_in_job_h.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/pam.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/pam.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/pidfile.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/pidfile.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/quiesce_ipp_logging.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/quiesce_ipp_logging.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/reactivate_recommended_driver.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/reactivate_recommended_driver.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/removecvstag.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/removecvstag.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch
- copied unchanged from r567, /cupsys/trunk/debian/patches/search_mime_files_in_usr_share.dpatch
Removed:
cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/04_freebsd.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/07_removecvstag.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/11_pam.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/12_quiesce_ipp_logging.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/13_default_log_warn.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/14_dont_force_ssl.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/19_cupsaccept.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/44_fixconfdirperms.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/47_pid.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/54_cups-config_modeldir.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/56_dirsvc.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/58_cupsd.conf-AllowLocal.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/60_device_uri.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/62_classes_crash.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/67_printcap.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/70_reactivate_recommended_driver.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/90_include_krb5_h_in_job_h.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/98_search_mime_files_in_usr_share.dpatch
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/control
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
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 Wed Aug 15 07:41:28 2007
@@ -1,3 +1,68 @@
+cupsys (1.3.0-2ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - TearDown (fast shutdown):
+ + debian/control: Add sysv-rc (>= 2.86.ds1-14.1ubuntu2) dependency.
+ + debian/rules: Use 'multiuser' update-rc.d mode.
+ - debian/control, debian/rules: Drop cupsys-dbg package.
+ - debian/cupsys.postinst: Various transitions that need to be kept until
+ the next LTS:
+ + Auto-enable snmp, scsi, and serial backends on upgrade.
+ + Revert to single cupsd.conf file.
+ + Remove obsolete rc.d links.
+ - debian/patches/ubuntu-default-error-policy-retry-job.dpatch: Retry a
+ failed job instead of stopping the print queue.
+ - debian/patches/ubuntu-disable-browsing.dpatch: Disable browsing by
+ default.
+ - Add AppArmor profile:
+ + debian/local/apparmor-profile
+ + debian/cupsys.postinst: Reload AA profile on configuration.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Wed, 15 Aug 2007 09:39:08 +0200
+
+cupsys (1.3.0-2) unstable; urgency=low
+
+ * debian/control: Re-add erroneously dropped adduser dependencies to cupsys
+ and cupsys-client. Still needed for addgroup lpadmin. (closes: #437951)
+ * debian/control: Add missing libkrb5-dev dependency to libcupsys2-dev.
+
+ -- Martin Pitt <mpitt at debian.org> Wed, 15 Aug 2007 09:22:29 +0200
+
+cupsys (1.3.0-1) unstable; urgency=low
+
+ [ Till Kamppeter ]
+ * New upstream release (first release of 1.3.x generation)
+ * 90_include_krb5_h_in_job_h.dpatch: Added a missing "#include <krb5.h>" to
+ the scheduler/job.h file (upstream bug).
+ * Regenerated patches: 44_fixconfdirperms.dpatch, 47_pid.dpatch,
+ 70_reactivate_recommended_driver.dpatch.
+ * Removed patches (fixed upstream): 53_usr_share_ppd_support.dpatch,
+ 55_ppd_okidata_name.dpatch, 68_edit-config.dpatch
+ * debian/control: Added "libkrb5-dev", and "libavahi-compat-libdnssd-dev"
+ to the build dependencies, so that the new Kerberos and DNS Service
+ Discovery support of CUPS gets compiled.
+ * debian/libcupsys2-dev.files: Removed /usr/include/cups/md5.h This file is
+ not provided any more by CUPS
+ * debian/cupsys.install, debian/cupsys-client.files: Added new files.
+ * debian/rules: Added more files to "clean::" rule which upstream has
+ forgotten in "make clean".
+
+ [ Martin Pitt ]
+ * Bump library shlibs to >= 1.3.0.
+ * Drop 02_configure.dpatch, upstream configure does not set rpath any more
+ for prefix=/usr.
+ * Drop 54_cups-config_modeldir.dpatch, --modeldir was never actually used
+ anywhere and not documented, and LSB prescribes /usr/share/ppd/ anyway.
+ * Drop 56_dirsvc.dpatch, which was fixed upstream long ago and disabled in
+ 00list anyway since then.
+ * Drop 67_printcap.dpatch: /var/run/cups/printcap is now the implicit
+ default upstream.
+ * debian/patches: Drop number prefixes from patches. The enumeration is not
+ useful at all any more since it both got inflated and is not sorted by any
+ category. With dpatch we also do not need number prefixes.
+
+ -- Martin Pitt <mpitt at debian.org> Tue, 14 Aug 2007 21:10:50 +0200
+
cupsys (1.3.0-0ubuntu1) gutsy; urgency=low
[ Till Kamppeter ]
@@ -25,6 +90,31 @@
-- Martin Pitt <martin.pitt at ubuntu.com> Tue, 14 Aug 2007 20:00:00 +0200
+cupsys (1.2.12-4) unstable; urgency=low
+
+ [ Martin Pitt ]
+ * cupsys.logrotate: Fix last occurence of 'cupsys' user.
+ (closes: #437536)
+ * 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).
+ (https://launchpad.net/bugs/125300)
+
+ [ Martin-Éric Racine ]
+ * Corrected download URL in debian/copyright.
+ * Added debian/watch file using that URL.
+ * Revised the Uploaders in debian/control:
+ - Fixed the name for Masayuki Hatta.
+ - Added Roger Leigh.
+ * Removed cupsys-driver-gimpprint alternative in debian/control;
+ superseded by cupsys-driver-gutenprint since Etch.
+
+ -- Martin-Éric Racine <q-funk at iki.fi> Sun, 12 Aug 2007 13:36:30 +0300
+
cupsys (1.2.12-3ubuntu3) gutsy; urgency=low
* debian/local/apparmor-profile: Allow unrestricted access to hplip. This
Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control Wed Aug 15 07:41:28 2007
@@ -51,7 +51,7 @@
Priority: optional
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), sysv-rc (>= 2.86.ds1-14.1ubuntu2)
+Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), adduser, sysv-rc (>= 2.86.ds1-14.1ubuntu2)
Replaces: cupsys-pstoraster
Conflicts: cupsys-pstoraster (<< 2)
Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters
@@ -72,7 +72,7 @@
Priority: optional
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, cupsys-common
+Depends: ${shlibs:Depends}, cupsys-common, adduser
Conflicts: lprng
Suggests: cupsys, kdeprint, gtklp, cupsys-pt, xpp, cupsys-bsd
Replaces: cupsys (<= 1.1.18-3)
@@ -92,7 +92,7 @@
Priority: optional
Section: libdevel
Architecture: any
-Depends: libcupsys2 (= ${binary:Version}), libgnutls-dev
+Depends: libcupsys2 (= ${binary:Version}), libgnutls-dev, libkrb5-dev
Provides: libcupsys-dev
Conflicts: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
Replaces: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Wed Aug 15 07:41:28 2007
@@ -1,21 +1,17 @@
-02_configure.dpatch
-04_freebsd.dpatch
-07_removecvstag.dpatch
-11_pam.dpatch
-12_quiesce_ipp_logging.dpatch
-13_default_log_warn.dpatch
-14_dont_force_ssl.dpatch
-19_cupsaccept.dpatch
-44_fixconfdirperms.dpatch
-47_pid.dpatch
-54_cups-config_modeldir.dpatch
-#56_dirsvc.dpatch
-58_cupsd.conf-AllowLocal.dpatch
-60_device_uri.dpatch
-62_classes_crash.dpatch
-67_printcap.dpatch
-70_reactivate_recommended_driver.dpatch
-90_include_krb5_h_in_job_h.dpatch
-98_search_mime_files_in_usr_share.dpatch
+freebsd.dpatch
+removecvstag.dpatch
+pam.dpatch
+quiesce_ipp_logging.dpatch
+default_log_warn.dpatch
+dont_force_ssl.dpatch
+cupsaccept.dpatch
+confdirperms.dpatch
+pidfile.dpatch
+cupsd.conf-AllowLocal.dpatch
+device_uri.dpatch
+classes_crash.dpatch
+reactivate_recommended_driver.dpatch
+include_krb5_h_in_job_h.dpatch
+search_mime_files_in_usr_share.dpatch
ubuntu-disable-browsing.dpatch
ubuntu-default-error-policy-retry-job.dpatch
More information about the Pkg-cups-devel
mailing list