[Pkg-kde-commits] rev 309 - in branches/kde-3.3.2/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2004-12-15 10:44:31 -0700 (Wed, 15 Dec 2004)
New Revision: 309

Added:
   branches/kde-3.3.2/kdelibs/debian/patches/12_cups_docroot.diff
Modified:
   branches/kde-3.3.2/kdelibs/debian/changelog
Log:
Add CUPS patch, update changelog.


Modified: branches/kde-3.3.2/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/changelog	2004-12-14 14:51:34 UTC (rev 308)
+++ branches/kde-3.3.2/kdelibs/debian/changelog	2004-12-15 17:44:31 UTC (rev 309)
@@ -3,18 +3,21 @@
   * New upstream release.
 
   * KDE_3_3_BRANCH update. Includes the kdelibs part of the fix
-    for CAN-2004-1158.
+    for CAN-2004-1158. [CM]
 
   * Removed patches:
     - post-3.3.1-kdelibs-khtml.diff and post-3.3.1-kdelibs-kio.diff since
-      these fixes are in KDE_3_3_BRANCH.
+      these fixes are in KDE_3_3_BRANCH. [CM]
 
   * New patches:
-    - 06_automake-1.9.diff
+    - 06_automake-1.9.diff [AS]
+    - 12_cups_docroot.diff: changed the CUPS document path in kdeprint to
+      reflect the Debian default. [CM]
 
-  * Updated dcop.1 manpage with patch by Helge Kreutzman. (Closes: #250631)
+  * Updated dcop.1 manpage with patch by Helge Kreutzman.
+    (Closes: #250631) [AS]
 
-  * New entries in debian/kdelibs-data.install:
+  * New entries in debian/kdelibs-data.install: [AS]
     - usr/share/mimelnk/application/java.desktop
     - usr/share/mimelnk/application/xml.desktop
     - usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
@@ -23,18 +26,18 @@
     - usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
     - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 
-  * New entries in debian/kdelibs4-dev.install:
+  * New entries in debian/kdelibs4-dev.install: [AS]
     - usr/include/kde/kiobuffer.h
     - usr/include/kde/kwallettypes.h
 
   * debian/control:
-    - removed unneeded build-dependency on automake1.9.
+    - removed unneeded build-dependency on automake1.9. [CM]
 
   * debian/rules:
     - call dh_makeshlibs with DH_COMPAT set to 3, so that -V works again for
-      us (works around debhelper bug #280830). (Closes: #280826)
+      us (works around debhelper bug #280830). (Closes: #280826) [AS]
 
- -- Adeodato Simó <asp16@alu.ua.es>  Tue, 14 Dec 2004 15:42:15 +0100
+ -- Adeodato Simó <asp16@alu.ua.es>  Wed, 15 Dec 2004 12:37:24 -0500 
 
 kdelibs (4:3.3.1-3) unstable; urgency=high
 

Added: branches/kde-3.3.2/kdelibs/debian/patches/12_cups_docroot.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/12_cups_docroot.diff	2004-12-14 14:51:34 UTC (rev 308)
+++ branches/kde-3.3.2/kdelibs/debian/patches/12_cups_docroot.diff	2004-12-15 17:44:31 UTC (rev 309)
@@ -0,0 +1,50 @@
+--- kdelibs-orig/kdeprint/cups/cupsdconf/cupsd.conf.template
++++ kdelibs-patched/kdeprint/cups/cupsdconf/cupsd.conf.template
+@@ -89,9 +89,9 @@
+ # The root directory for HTTP documents that are served.
+ # By default the compiled in directory.</p>
+ # <p>
+-# <i>ex</i>: /usr/share/cups/doc</p>
++# <i>ex</i>: /usr/share/cups/doc-root</p>
+ $$
+-#DocumentRoot /usr/share/cups/doc
++#DocumentRoot /usr/share/cups/doc-root
+ @@
+ 
+ # <b>ErrorLog</b>
+--- kdelibs-orig/kdeprint/cups/cupsdconf/cupsdserverhttppage.cpp
++++ kdelibs-patched/kdeprint/cups/cupsdconf/cupsdserverhttppage.cpp
+@@ -96,7 +96,7 @@
+ {
+ 	defaultcharset_->setText("utf-8");
+ 	defaultlanguage_->setText("en");
+-	documentroot_->setText("/usr/share/cups/doc");
++	documentroot_->setText("/usr/share/cups/doc-root");
+ }
+ 
+ void CupsdServerHTTPPage::setInfos(CupsdConf *conf)
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsd.conf.template
++++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsd.conf.template
+@@ -100,9 +100,9 @@
+ # The root directory for HTTP documents that are served.
+ # By default the compiled-in directory.</p>
+ # <p>
+-# <i>ex</i>: /usr/share/cups/doc</p>
++# <i>ex</i>: /usr/share/cups/doc-root</p>
+ $$
+-#DocumentRoot /usr/share/cups/doc
++#DocumentRoot /usr/share/cups/doc-root
+ @@
+ 
+ %%errorlog
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp
++++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsdconf.cpp2
+@@ -66,7 +66,7 @@
+ 			<< "/usr/local/share/cups"
+ 			<< "/opt/share/cups"
+ 			<< "/opt/local/share/cups");
+-	documentdir_ = findDir(QStringList(datadir_+"/doc")
++	documentdir_ = findDir(QStringList(datadir_+"/doc-root")
+ 			<< datadir_.left(datadir_.length()-5)+"/doc/cups");
+ 	//fontpath_ << (datadir_+"/fonts");
+ 	requestdir_ = findDir(QStringList("/var/spool/cups")