rev 4666 - trunk/packages/kdewebdev/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-10-10 22:09:35 +0000 (Tue, 10 Oct 2006)
New Revision: 4666

Modified:
   trunk/packages/kdewebdev/debian/changelog
   trunk/packages/kdewebdev/debian/control
   trunk/packages/kdewebdev/debian/quanta.README.Debian
   trunk/packages/kdewebdev/debian/quanta.links
Log:
Ready to upload. Add bab's fixes.


Modified: trunk/packages/kdewebdev/debian/changelog
===================================================================
--- trunk/packages/kdewebdev/debian/changelog	2006-10-10 22:00:32 UTC (rev 4665)
+++ trunk/packages/kdewebdev/debian/changelog	2006-10-10 22:09:35 UTC (rev 4666)
@@ -1,4 +1,4 @@
-kdewebdev (4:3.5.5-1) UNRELEASED; urgency=low
+kdewebdev (4:3.5.5-1) unstable; urgency=medium
 
   * New upstream release.
     + Add some more special characters to the list. (Closes: #342705)
@@ -7,8 +7,14 @@
     + Fixes quanta: missing ř U+0159 latin small letter r with
       caron. (Closes: #377302)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 Sep 2006 17:35:24 -0400
+  * phpdoc is now php-doc, so update debian/control and debian/quanta.links
+    appropriately. Also lower php-doc from Recommends to Suggests, as it is
+    non-free, and add a note in the Quanta README.Debian explaining the
+    situation. Thanks to Ben Burton for the report and analysis. This is RC,
+    so urgency medium. (Closes: #391672)
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Oct 2006 18:01:00 -0400
+
 kdewebdev (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdewebdev/debian/control
===================================================================
--- trunk/packages/kdewebdev/debian/control	2006-10-10 22:00:32 UTC (rev 4665)
+++ trunk/packages/kdewebdev/debian/control	2006-10-10 22:09:35 UTC (rev 4666)
@@ -43,8 +43,8 @@
 Architecture: any
 Section: web
 Depends: ${shlibs:Depends}, kfilereplace (= ${Source-Version}), klinkstatus (= ${Source-Version}), kommander (= ${Source-Version}), quanta-data (>> ${KDE-Version3}), quanta-data (<< ${KDE-Next-Version3}), tidy
-Recommends: cervisia, gnupg, kompare, kxsldbg (= ${Source-Version}), phpdoc, wdg-html-reference, docbook-defguide
-Suggests: gubed, kimagemapeditor (= ${Source-Version}), wget, khelpcenter
+Recommends: cervisia, gnupg, kompare, kxsldbg (= ${Source-Version}), wdg-html-reference, docbook-defguide
+Suggests: gubed, kimagemapeditor (= ${Source-Version}), wget, khelpcenter, php-doc
 Description: web development environment for KDE
  Quanta Plus is a web development environment for working with HTML
  and associated languages. It strives to be neutral and transparent

Modified: trunk/packages/kdewebdev/debian/quanta.README.Debian
===================================================================
--- trunk/packages/kdewebdev/debian/quanta.README.Debian	2006-10-10 22:00:32 UTC (rev 4665)
+++ trunk/packages/kdewebdev/debian/quanta.README.Debian	2006-10-10 22:09:35 UTC (rev 4666)
@@ -7,8 +7,10 @@
   external sources.
 
   Reference documentation for HTML, CSS and PHP can be downloaded as
-  separate Debian packages (wdg-html-reference and phpdoc).  Quanta Plus
-  will be able to access this documentation out of the box.
+  separate Debian packages, wdg-html-reference and php-doc.  Note that
+  php-doc is non-free, but without it, you'll get file-not-found errors
+  in your documentation pane.  Once these packages are installed, Quanta
+  Plus will be able to access this documentation out of the box.
 
   JavaScript and MySQL reference documentation is also available but is
   not supported natively by this package.  To make JavaScript or MySQL

Modified: trunk/packages/kdewebdev/debian/quanta.links
===================================================================
--- trunk/packages/kdewebdev/debian/quanta.links	2006-10-10 22:00:32 UTC (rev 4665)
+++ trunk/packages/kdewebdev/debian/quanta.links	2006-10-10 22:09:35 UTC (rev 4666)
@@ -1,4 +1,4 @@
-/usr/share/doc/phpdoc/html /usr/share/apps/quanta/doc/php
+/usr/share/doc/php-doc/html /usr/share/apps/quanta/doc/php
 /usr/share/doc/docbook-defguide/html /usr/share/apps/quanta/doc/docbook
 /usr/share/doc/wdg-html-reference/reference/css /usr/share/apps/quanta/doc/css
 /usr/share/doc/wdg-html-reference/reference/html40 /usr/share/apps/quanta/doc/html