[Pkg-kde-commits] rev 631 - branches/kde-3.4.0/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-04 05:57:36 +0100 (Fri, 04 Mar 2005)
New Revision: 631

Added:
   branches/kde-3.4.0/packages/kdebase/debian/patches/15_cups_docroot.diff
   branches/kde-3.4.0/packages/kdebase/debian/patches/16_konsole_README.Linux-font.diff
Removed:
   branches/kde-3.4.0/packages/kdebase/debian/patches/13_cups_docroot.diff
   branches/kde-3.4.0/packages/kdebase/debian/patches/14_konsole_README.Linux-font.diff
Log:
Re-order patches for neatness.


Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/13_cups_docroot.diff

Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/14_konsole_README.Linux-font.diff

Added: branches/kde-3.4.0/packages/kdebase/debian/patches/15_cups_docroot.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/15_cups_docroot.diff	2005-03-04 04:57:10 UTC (rev 630)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/15_cups_docroot.diff	2005-03-04 04:57:36 UTC (rev 631)
@@ -0,0 +1,34 @@
+--- kde.orig/doc/kdeprint/cups-config.docbook
++++ kde.patched/doc/kdeprint/cups-config.docbook
+@@ -487,11 +487,11 @@
+ <term><guilabel>Server group</guilabel></term>
+ <listitem>
+ <para>The group the server runs under.  Normally this must be
+-<systemitem class="groupname">sys</systemitem>, however you can
++<systemitem class="groupname">lpadmin</systemitem>, however you can
+ configure things for another group as needed.</para>
+
+ <informalexample>
+-<para>Enter for example <userinput>sys</userinput>.</para>
++<para>Enter for example <userinput>lpadmin</userinput>.</para>
+ </informalexample>
+ </listitem>
+ </varlistentry>
+@@ -1012,7 +1012,7 @@
+ <listitem>
+ <para>The root folder for &HTTP; documents that are served.  By
+ default the compiled in folder, <filename
+-class="directory">/usr/share/cups/doc</filename></para>
++class="directory">/usr/share/cups/doc-root</filename></para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -1756,7 +1756,7 @@
+ <para>The group name for <systemitem
+ class="groupname">System</systemitem> or printer administration
+ access.  The default varies depending on the operating system, but
+-will be <systemitem class="groupname">sys</systemitem>, <systemitem
++will be <systemitem class="groupname">lpadmin</systemitem>, <systemitem
+ class="groupname">system</systemitem> or <systemitem
+ class="groupname">root</systemitem> (checked for in that order).</para>
+ </listitem>

Added: branches/kde-3.4.0/packages/kdebase/debian/patches/16_konsole_README.Linux-font.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/16_konsole_README.Linux-font.diff	2005-03-04 04:57:10 UTC (rev 630)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/16_konsole_README.Linux-font.diff	2005-03-04 04:57:36 UTC (rev 631)
@@ -0,0 +1,22 @@
+--- kde.orig/konsole/konsole/konsole.cpp
++++ kde.patched/konsole/konsole/konsole.cpp
+@@ -1819,7 +1819,7 @@
+   static bool showMessage = true;
+   if (!showMessage) return;
+   showMessage = false;
+-  QString msg = i18n("Font `%1' not found.\nCheck README.linux.console for help.").arg(fontNotFound_par);
++  QString msg = i18n("Font `%1' not found.\nCheck /usr/share/doc/konsole/README.Linux-font for help.").arg(fontNotFound_par);
+   KMessageBox::error(this,  msg);
+ }
+ 
+--- kde.orig/konsole/konsole/konsole_part.cpp
++++ kde.patched/konsole/konsole/konsole_part.cpp
+@@ -731,7 +731,7 @@
+ 
+ void konsolePart::fontNotFound()
+ {
+-  QString msg = i18n("Font `%1' not found.\nCheck README.linux.console for help.").arg(fontNotFound_par);
++  QString msg = i18n("Font `%1' not found.\nCheck /usr/share/doc/konsole/README.Linux-font for help.").arg(fontNotFound_par);
+   KMessageBox::information(parentWidget,  msg, i18n("Font Not Found"), QString("font_not_found_%1").arg(fontNotFound_par));
+ }
+