[Pkg-cups-devel] r187 - cupsys/branches/cups-1.2-ubuntu/debian

[Martin Pitt]

Author: mpitt
Date: Wed Apr 19 11:02:09 2006
New Revision: 187

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/NEWS
      - copied unchanged from r186, cupsys/branches/cups-1.2/debian/NEWS
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
Log:
merge final tweaks for 1.1.99.rc2-0exp1 Debian upload

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 Apr 19 11:02:09 2006
@@ -43,11 +43,7 @@
 
  -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 13 Apr 2006 11:26:41 +0200
 
-cupsys (1.1.99.rc2-1) UNRELEASED-experimental; urgency=low
-
-  TODO:
-  - /etc/cups/client.conf has been removed upstream; {dis,en}able have been
-    renamed to cups{dis,en}able. Should we care about them?
+cupsys (1.1.99.rc2-0exp1) experimental; urgency=low
 
   [ Kenshi Muto ]
   * New upstream release 1.2RC2.
@@ -78,6 +74,8 @@
   * Removed /etc/cups/pdftops.conf because it was for pdftops of upstream
     version. Debian CUPS uses xpdf-utils wrapper and doesn't need
     pdftops.conf.
+  * Notice: /etc/cups/client.conf has been removed upstream.
+  * Notice: {dis,en}able have been renamed to cups{dis,en}able.
 
   [ Martin Pitt ]
   * debian/patches/48_stdlib.dpatch: Adapted to new upstream version.
@@ -132,7 +130,7 @@
   * debian/patches/20_httpGetHostname_crash.dpatch: Add some robustifications
     to httpGetHostname() to hopefully fix a reported crash.
 
- -- Martin Pitt <mpitt at debian.org>  Thu, 13 Apr 2006 13:08:54 +0200
+ -- Kenshi Muto <kmuto at debian.org>  Sun, 16 Apr 2006 17:49:57 +0900
 
 cupsys (1.1.99.b1.r4929-0ubuntu8) dapper; urgency=low