[Pkg-cups-devel] r603 - in cupsys/branches/cups-1.2-ubuntu: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Wed Sep 19 07:05:20 2007
New Revision: 603

Log:
merge trunk

Removed:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/fix_auto_rotate_images.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/patches/str2488-fix-localedir.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/patches/str2505_localize.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch
Modified:
   cupsys/branches/cups-1.2-ubuntu/   (props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   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 Sep 19 07:05:20 2007
@@ -1,5 +1,8 @@
-cupsys (1.3.0-4ubuntu5) UNRELEASED; urgency=low
+cupsys (1.3.2-1ubuntu1) UNRELEASED; urgency=low
 
+  * Merge from Debian to get new upstream bug fix microrelease. (LP: #140877)
+  * Removed debian/patches/fix_auto_rotate_images.dpatch: Fixed upstream
+    (although slightly differently).
   * debian/local/apparmor-profile: Allow 'm' access to /etc/{passwd,group}.
     Apparently some backends want it that way. (part of LP #139665)
   * debian/local/apparmor-profile: Add forgotten /usr/lib/cups/cgi-bin/* rule
@@ -7,6 +10,15 @@
 
  -- Martin Pitt <martin.pitt at ubuntu.com>  Wed, 19 Sep 2007 08:39:59 +0200
 
+cupsys (1.3.2-1) unstable; urgency=low
+
+  * New upstream bug fix release.
+    - Fixes web interface for many browsers. (STR#2472, Closes: #440589)
+  * Remove str2488-fix-localedir.dpatch, str2505_localize.dpatch,
+    str2508-dont_kill_edit-config.tmpl.dpatch: Fixed upstream.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 18 Sep 2007 08:15:17 +0200
+
 cupsys (1.3.0-4ubuntu4) gutsy; urgency=low
 
   [ Martin Pitt ]

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 Sep 19 07:05:20 2007
@@ -1,6 +1,3 @@
-str2488-fix-localedir.dpatch
-str2505_localize.dpatch
-str2508-dont_kill_edit-config.tmpl.dpatch
 freebsd.dpatch
 removecvstag.dpatch
 pam.dpatch
@@ -18,4 +15,3 @@
 search_mime_files_in_usr_share.dpatch
 ubuntu-disable-browsing.dpatch
 ubuntu-default-error-policy-retry-job.dpatch
-fix_auto_rotate_images.dpatch