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

[Adeodato Sim??]

Author: dato-guest
Date: 2004-12-18 12:19:52 -0700 (Sat, 18 Dec 2004)
New Revision: 341

Added:
   branches/kde-3.3.2/kdebase/debian/local/README.Linux-font
   branches/kde-3.3.2/kdebase/debian/patches/14_konsole_README.Linux-font.diff
Removed:
   branches/kde-3.3.2/kdebase/debian/local/README.linux.console
Modified:
   branches/kde-3.3.2/kdebase/debian/changelog
   branches/kde-3.3.2/kdebase/debian/konsole.docs
Log:
  * 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.



Modified: branches/kde-3.3.2/kdebase/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdebase/debian/changelog	2004-12-18 18:31:18 UTC (rev 340)
+++ branches/kde-3.3.2/kdebase/debian/changelog	2004-12-18 19:19:52 UTC (rev 341)
@@ -22,6 +22,16 @@
   * Acknowledge old NMUs. (Closes: #178507, #261740, #244547, #247407)
     (Closes: #237062, #237065, #237067)
 
+  * 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.
+
  -- Christopher Martin <chrsmrtn@freeshell.org>  Wed, 15 Dec 2004 12:44:04 -0500
 
 kdebase (4:3.3.1-3) unstable; urgency=medium

Modified: branches/kde-3.3.2/kdebase/debian/konsole.docs
===================================================================
--- branches/kde-3.3.2/kdebase/debian/konsole.docs	2004-12-18 18:31:18 UTC (rev 340)
+++ branches/kde-3.3.2/kdebase/debian/konsole.docs	2004-12-18 19:19:52 UTC (rev 341)
@@ -1 +1 @@
-debian/local/README.linux.console
+debian/local/README.Linux-font

Copied: branches/kde-3.3.2/kdebase/debian/local/README.Linux-font (from rev 339, branches/kde-3.3.2/kdebase/debian/local/README.linux.console)
===================================================================
--- branches/kde-3.3.2/kdebase/debian/local/README.linux.console	2004-12-18 17:31:58 UTC (rev 339)
+++ branches/kde-3.3.2/kdebase/debian/local/README.Linux-font	2004-12-18 19:19:52 UTC (rev 341)
@@ -0,0 +1,16 @@
+README.Linux-font
+-----------------
+
+To make the linux console font work you will need to install the
+xfonts-konsole package and make certain that fontconfig is configured
+to support bitmap fonts. You can install xfonts-konsole by running
+"apt-get install xfonts-konsole". To reconfigure fontconfig you must run
+"dpkg-reconfigure -plow fontconfig" and answer "Yes" to the question:
+"Enable bitmapped fonts by default?".
+
+After doing this selecting the Linux font still fails, try logging out
+and relogin and/or running "fc-cache -f" as root to update the fontconfig
+font cache.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat, 10 Apr 2004 04:15:53 -0500
+ -- Adeodato Simó <asp16@alu.ua.es>  Sat, 18 Dec 2004 20:03:49 +0100

Deleted: branches/kde-3.3.2/kdebase/debian/local/README.linux.console

Added: 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 18:31:18 UTC (rev 340)
+++ branches/kde-3.3.2/kdebase/debian/patches/14_konsole_README.Linux-font.diff	2004-12-18 19:19:52 UTC (rev 341)
@@ -0,0 +1,22 @@
+--- 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
+@@ -1794,7 +1794,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);
+ }
+ 
+--- 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
+@@ -678,7 +678,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));
+ }
+