rev 11376 - in branches/kde4/packages/kdebase-workspace/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Mon Jul 7 14:54:26 UTC 2008 

Author: ana
Date: 2008-07-07 14:54:26 +0000 (Mon, 07 Jul 2008)
New Revision: 11376

Removed:
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
new snapshot (85+) redo patches


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-07-07 14:25:58 UTC (rev 11375)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-07-07 14:54:26 UTC (rev 11376)
@@ -1,9 +1,18 @@
-kdebase-workspace (4:4.0.84-2) UNRELEASED; urgency=low
+kdebase-workspace (4:4.0.85+svn829067-0) UNRELEASED; urgency=low
 
+  * New development snapshot.
+
   +++ Changes by Xavier Vello:
 
-    * ksysguard now depends on ksysguardd.
+  * ksysguard now recommends on ksysguardd.
 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+  
+  * Resync patches: 07_kdmrc_defaults,
+    12_be_better_at_honouring_user_kdm_theming and
+    21_kdm_doesnt_use_kstandarddirs.
+  * Remove 97_fix_target_link_libraries.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 2 Jul 2008 13:57:09 +0200
 
 kdebase-workspace (4:4.0.84-1) experimental; urgency=low

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-07-07 14:25:58 UTC (rev 11375)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-07-07 14:54:26 UTC (rev 11376)
@@ -132,7 +132,8 @@
 Package: ksysguard
 Section: admin
 Architecture: any
-Depends: ${shlibs:Depends}, ksysguardd (= ${binary:Version})
+Depends: ${shlibs:Depends}
+Recommends: ksysguardd (= ${binary:Version})
 Description: System Guard for KDE 4
  KDE System Guard allows you to monitor various statistics about your system.
  .

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2008-07-07 14:25:58 UTC (rev 11375)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2008-07-07 14:54:26 UTC (rev 11376)
@@ -1,15 +1,15 @@
 --- a/kcontrol/kdm/kdm-dlg.cpp
 +++ b/kcontrol/kdm/kdm-dlg.cpp
-@@ -279,7 +279,7 @@
+@@ -282,7 +282,7 @@
  
  	// Read the greeting string
  	greetstr_lined->setText( configGrp.readEntry( "GreetString",
--	                                            i18n("Welcome to %s at %n") ) );
-+	                                            i18n("Welcome to Debian at %n") ) );
+-	                                              i18n("Welcome to %s at %n") ) );
++	                                              i18n("Welcome to Debian at %n") ) );
  
  	// Regular logo or clock
  	QString logoArea = configGrp.readEntry( "LogoArea", "Logo" );
-@@ -307,7 +307,7 @@
+@@ -310,7 +310,7 @@
  
  void KDMDialogWidget::defaults()
  {

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2008-07-07 14:25:58 UTC (rev 11375)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2008-07-07 14:54:26 UTC (rev 11376)
@@ -4,7 +4,7 @@
  Type: string
  Default: ""
  User: greeter
--Instance: */KDMDATA "/themes/circles"
+-Instance: */KDMDATA "/themes/oxygen"
 +Instance: */ "@@@ToBeReplacedByDesktopBase@@@"
  Comment: &
  Description:

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-07-07 14:25:58 UTC (rev 11375)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-07-07 14:54:26 UTC (rev 11376)
@@ -4,7 +4,7 @@
 
 --- a/config-workspace.h.cmake
 +++ b/config-workspace.h.cmake
-@@ -120,6 +120,9 @@
+@@ -123,6 +123,9 @@
  /* KDE's static data directory */
  #define KDE_DATADIR "${DATA_INSTALL_DIR}"
  
@@ -16,26 +16,32 @@
  
 --- a/kcontrol/kdm/background.cpp
 +++ b/kcontrol/kdm/background.cpp
-@@ -43,7 +43,7 @@
- 		     " If it is disabled, you have to look after the background yourself."
- 		     " This is done by running some program (possibly xsetroot) in the script"
- 		     " specified in the Setup= option in kdmrc (usually Xsetup).") );
--	m_simpleConf = KSharedConfig::openConfig( config->group( "X-*-Greeter" ).readEntry( "BackgroundCfg", KDE_CONFDIR "/kdm/backgroundrc" ) );
-+	m_simpleConf = KSharedConfig::openConfig( config->group( "X-*-Greeter" ).readEntry( "BackgroundCfg", KDM_CONFDIR "/kdm/backgroundrc" ) );
+@@ -43,9 +43,9 @@
+ 		" If it is disabled, you have to look after the background yourself."
+ 		" This is done by running some program (possibly xsetroot) in the script"
+ 		" specified in the Setup= option in kdmrc (usually Xsetup).") );
+-	m_simpleConf = KSharedConfig::openConfig(
+-		config->group( "X-*-Greeter" ).readEntry(
+-			"BackgroundCfg", KDE_CONFDIR "/kdm/backgroundrc" ) );
++	m_simpleConf = KSharedConfig::openConfig( 
++	    config->group( "X-*-Greeter" ).readEntry( 
++		    "BackgroundCfg", KDM_CONFDIR "/kdm/backgroundrc" ) );
  	m_background = new BGDialog( this, m_simpleConf );
  
  	connect( m_background, SIGNAL(changed( bool )), SIGNAL(changed()) );
 --- a/kcontrol/kdm/main.cpp
 +++ b/kcontrol/kdm/main.cpp
-@@ -187,7 +187,7 @@
+@@ -187,8 +187,8 @@
+ 	for (tgmapci = tgmap.begin(); tgmapci != tgmap.end(); ++tgmapci)
  		kWarning() << "user(s) '" << tgmapci.value().join( "," )
  		<< "' have unknown GID " << tgmapci.key() << endl;
- 
--	config = new KConfig( QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig);
+-
+-	config = new KConfig( QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig );
++    
 +	config = new KConfig( QString::fromLatin1(KDM_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig);
  
  	QVBoxLayout *top = new QVBoxLayout( this );
-         top->setMargin(0);
+ 	top->setMargin( 0 );
 --- a/kdm/config.def
 +++ b/kdm/config.def
 @@ -29,7 +29,7 @@

Deleted: branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-07-07 14:25:58 UTC (rev 11375)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-07-07 14:54:26 UTC (rev 11376)
@@ -8,4 +8,4 @@
 17_ksysguard_disable_procmon_when_unsupported.diff
 20_use_dejavu_as_default_font.diff
 21_kdm_doesnt_use_kstandarddirs.diff
-97_fix_target_link_libraries.diff
+#97_fix_target_link_libraries.diff

More information about the pkg-kde-commits mailing list