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

[Martin Pitt]

Author: mpitt
Date: Thu Apr 13 08:53:13 2006
New Revision: 175

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-nowebadmin.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
Log:
* debian/patches/ubuntu-nowebadmin.dpatch: Explain disabling of
  administrative functions in the web interface and point to doc how to
  reenable it.



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	Thu Apr 13 08:53:13 2006
@@ -18,12 +18,15 @@
     ports in the default install' policy.
   * debian/README.Debian: Explain disabling of administrative functions in web
     interface and describe how to re-enable it.
-  * debian/cupsys.preinst: 
+  * debian/cupsys.preinst:
     - Migrate /etc/cups/cupsd-browsing.conf to /etc/cups/cups.d/browse.conf
       for smooth upgrades from Hoary.
     - Fix owner of /etc/cups/ppd/* on upgrades.
+  * debian/patches/ubuntu-nowebadmin.dpatch: Explain disabling of
+    administrative functions in the web interface and point to doc how to
+    reenable it.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 13 Apr 2006 10:48:37 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 13 Apr 2006 10:52:25 +0200
 
 cupsys (1.1.99.rc2-1) UNRELEASED-experimental; urgency=low
 

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	Thu Apr 13 08:53:13 2006
@@ -17,3 +17,4 @@
 44_fixconfdirperms.dpatch
 47_pid.dpatch
 #48_stdlib.dpatch
+ubuntu-nowebadmin.dpatch

Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-nowebadmin.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-nowebadmin.dpatch	Thu Apr 13 08:53:13 2006
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ubuntu-nowebadmin.dpatch by  <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4892~/doc/index.html.in cupsys-1.1.99.b1.r4892/doc/index.html.in
+--- cupsys-1.1.99.b1.r4892~/doc/index.html.in	2005-12-10 22:20:14.000000000 +0100
++++ cupsys-1.1.99.b1.r4892/doc/index.html.in	2006-01-13 15:23:18.000000000 +0100
+@@ -73,8 +73,10 @@
+ <A HREF="/admin"><IMG SRC="/images/manage-server.gif" CLASS="button" ALT="Manage Server"></A>
+ </P>
+ 
+-<P><I>If you are asked for a username and password, enter your login
+-username and password or the "root" username and password.</I></P>
++<P><I>Administrative commands are disabled in the web interface for security
++reasons. Please use the GNOME CUPS manager (System &gt; Administration &gt;
++Printing). <code>/usr/share/doc/cupsys/README.Debian.gz</code>
++describes the details and how to reenable it again.</I></P>
+ 
+ <H2 CLASS="title">About CUPS</H2>
+