[Pkg-kde-commits] rev 1222 - in branches/kde-3.4.0/packages/kdebase/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-06-12 20:30:22 +0000 (Sun, 12 Jun 2005)
New Revision: 1222

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
   branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
   branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
Log:
Slight improvement for the default fonts patch.

Also don't generate a random ForgingSeed on package build, since this makes
every build's kdmrc different, therefore always prompting the user to overwrite.


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-06-12 14:45:55 UTC (rev 1221)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-06-12 20:30:22 UTC (rev 1222)
@@ -18,6 +18,10 @@
     did not work with arts, had arts ever once been unavailable.
     (Closes: #312217)
 
+  * No longer set a random ForgingSeed in the kdmrc conffile, for this caused
+    each kdebase build to generate a different kdmrc, and therefore made
+    updates a nuissance.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 12 Jun 2005 10:43:24 -0400
 
 kdebase (4:3.4.1-1) experimental; urgency=low

Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2005-06-12 14:45:55 UTC (rev 1221)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2005-06-12 20:30:22 UTC (rev 1222)
@@ -51,3 +51,11 @@
  User: greeter
  Instance: #*/"K Desktop Environment (%n)"
  Comment:
+@@ -2434,7 +2434,6 @@
+ Default: 0
+ User: greeter
+ Instance: #*/
+-Update: upd_forgingseed
+ Comment:
+  Random seed for forging saved session types, etc. of unknown users.
+  This value should be random but constant across the login domain.

Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff	2005-06-12 14:45:55 UTC (rev 1221)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff	2005-06-12 20:30:22 UTC (rev 1222)
@@ -172,3 +172,23 @@
  Comment: &
  Description:
   Whether the fonts used in the greeter should be antialiased.
+--- kde.orig/ksplashml/themeengine/standard/themestandard.cpp
++++ kde.patched/ksplashml/themeengine/standard/themestandard.cpp
+@@ -32,7 +32,7 @@
+
+ ThemeStandard::ThemeStandard( QWidget *parent, const char *name, const QStringList &args )
+   :ThemeEngine( parent, name, args ), mIcon(0L), mPrevIcon(0L), mIconCount(0), mStdIconWidth(-1),
+-  mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("helvetica"),
++  mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("Sans Serif"),
+   mSbFontSz(16), mSbFontBold(true), mSbFontItalic(false), mSbFont(QFont()), mSbFg(QColor()), mSbBg(QColor()),
+   mSbIcon("run"), mIconsVisible(true), mIconsJumping(true), mSplashScreen("(Default)")
+ {
+@@ -148,7 +148,7 @@
+   mSbVisible = cfg->readBoolEntry( "Statusbar Visible", true);
+   mSbPbVisible = cfg->readBoolEntry( "Progress Visible", true);
+
+-  mSbFontName = cfg->readEntry( "Statusbar Font", "helvetica" );
++  mSbFontName = cfg->readEntry( "Statusbar Font", "Sans Serif" );
+   mSbFontSz = cfg->readNumEntry( "Statusbar Font Size", 16 );
+   mSbFontBold = cfg->readBoolEntry( "Statusbar Font Bold", true );
+   mSbFontItalic = cfg->readBoolEntry( "Statusbar Font Italic", false );