[Pkg-kde-commits] rev 343 - in branches/kde-3.3.2/kdebase/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2004-12-18 13:45:58 -0700 (Sat, 18 Dec 2004)
New Revision: 343

Modified:
   branches/kde-3.3.2/kdebase/debian/changelog
   branches/kde-3.3.2/kdebase/debian/patches/14_konsole_README.Linux-font.diff
Log:
Final changes for kdebase-3.3.2-0pre1


Modified: branches/kde-3.3.2/kdebase/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdebase/debian/changelog	2004-12-18 19:43:16 UTC (rev 342)
+++ branches/kde-3.3.2/kdebase/debian/changelog	2004-12-18 20:45:58 UTC (rev 343)
@@ -21,19 +21,18 @@
   * Remove build-dependency on automake1.9.
   * Acknowledge old NMUs. (Closes: #178507, #261740, #244547, #247407)
     (Closes: #237062, #237065, #237067)
+  * Take some action wrt #284844: [AS]
+    - rename README.linux.console to README.Linux-font, more explicit
+      and does not create confusion with the original file. Removed
+      note about this file not being the original one.
+    - when talking about dpkg-reconfigure fontconfig, be clear about
+      which one the relevant question is and what the answer has to be.
+    - added patches/14_konsole_README.Linux-font.diff to make the popup
+      that konsole displays when it can find the font specify the full
+      path to the README file. (Closes: #284844)
 
-  * Take some action wrt #284844: [dato]
-    - rename README.linux.console to README.Linux-font, more explicit and does
-      not create confusion with the original file. Removed note about this
-      file not being the original one.
-    - when talking about dpkg-reconfigure fontconfig, be clear about which one
-      the relevant question is and what the answer has to be.
-    - added patches/14_konsole_README.Linux-font.diff to make the popup that
-      konsole displays when it can find the font specify the full path to the
-      README file. (Closes: #284844)
+ -- Christopher Martin <chrsmrtn@freeshell.org>  Sat, 18 Dec 2004 14:54:58 -0500
 
- -- Christopher Martin <chrsmrtn@freeshell.org>  Wed, 15 Dec 2004 12:44:04 -0500
-
 kdebase (4:3.3.1-3) unstable; urgency=medium
 
   * Include patch to fix CAN-2004-1171 ("plain text password exposure").

Modified: branches/kde-3.3.2/kdebase/debian/patches/14_konsole_README.Linux-font.diff
===================================================================
--- branches/kde-3.3.2/kdebase/debian/patches/14_konsole_README.Linux-font.diff	2004-12-18 19:43:16 UTC (rev 342)
+++ branches/kde-3.3.2/kdebase/debian/patches/14_konsole_README.Linux-font.diff	2004-12-18 20:45:58 UTC (rev 343)
@@ -1,5 +1,5 @@
---- a/konsole/konsole/konsole.cpp	2004-11-28 18:27:15.000000000 +0100
-+++ b/konsole/konsole/konsole.cpp	2004-12-18 20:07:31.000000000 +0100
+--- kdebase-orig/konsole/konsole/konsole.cpp
++++ kdebase-patched/konsole/konsole/konsole.cpp
 @@ -1794,7 +1794,7 @@
    static bool showMessage = true;
    if (!showMessage) return;
@@ -9,8 +9,8 @@
    KMessageBox::error(this,  msg);
  }
  
---- a/konsole/konsole/konsole_part.cpp	2004-05-22 22:26:55.000000000 +0200
-+++ b/konsole/konsole/konsole_part.cpp	2004-12-18 20:07:49.000000000 +0100
+--- kdebase-orig/konsole/konsole/konsole_part.cpp
++++ kdebase-patched/konsole/konsole/konsole_part.cpp
 @@ -678,7 +678,7 @@
  
  void konsolePart::fontNotFound()