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

Modestas Vainius modax-guest at alioth.debian.org
Wed Dec 17 12:08:26 UTC 2008


Author: modax-guest
Date: 2008-12-17 12:08:25 +0000 (Wed, 17 Dec 2008)
New Revision: 12957

Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4.2/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
   branches/kde4.2/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
   branches/kde4.2/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
   branches/kde4.2/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff
Log:
New snapshot, refresh patches, update install files

Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-12-17 12:08:00 UTC (rev 12956)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-12-17 12:08:25 UTC (rev 12957)
@@ -1,4 +1,4 @@
-kdebase-workspace (4:4.1.85+svn897319-0r1) UNRELEASED; urgency=low
+kdebase-workspace (4:4.1.85+svn897913-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -52,7 +52,7 @@
   * 23_do_not_depend_on_bindings.diff: do no depend on python-kde4 at build
     time (circular build dependency).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Dec 2008 20:05:02 +0000
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Dec 2008 13:15:53 +0200
 
 kdebase-workspace (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-12-17 12:08:00 UTC (rev 12956)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-12-17 12:08:25 UTC (rev 12957)
@@ -107,7 +107,6 @@
 usr/share/autostart/krunner.desktop
 usr/share/autostart/kwrited-autostart.desktop
 usr/share/autostart/plasma.desktop
-usr/share/kde4/apps/desktoptheme/default/metadata.desktop
 usr/share/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop
 usr/share/kde4/services/ScreenSavers/kblank.desktop
 usr/share/kde4/services/ScreenSavers/krandom.desktop

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-12-17 12:08:00 UTC (rev 12956)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-12-17 12:08:25 UTC (rev 12957)
@@ -120,45 +120,6 @@
 usr/share/kde4/apps/color-schemes/Oxygen.colors
 usr/share/kde4/apps/color-schemes/Steel.colors
 usr/share/kde4/apps/color-schemes/WontonSoup.colors
-usr/share/kde4/apps/desktoptheme/default/colors
-usr/share/kde4/apps/desktoptheme/default/dialogs/background.svgz
-usr/share/kde4/apps/desktoptheme/default/dialogs/kickoff.svgz
-usr/share/kde4/apps/desktoptheme/default/dialogs/krunner.svgz
-usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.source.svgz
-usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.svgz
-usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/background.svgz
-usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/krunner.svgz
-usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svgz
-usr/share/kde4/apps/desktoptheme/default/opaque/widgets/extender-background.svgz
-usr/share/kde4/apps/desktoptheme/default/opaque/widgets/panel-background.svgz
-usr/share/kde4/apps/desktoptheme/default/opaque/widgets/tooltip.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/analog_meter.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/arrows.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/background.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/bar_meter_horizontal.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/bar_meter_vertical.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/branding.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/busywidget.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/button.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/calendar.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/clock.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/configuration-icons.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/containment-controls.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/dragger.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/extender-background.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/extender-dragger.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/frame.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/glowbar.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/monitor.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/pager.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/panel-background.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/plot-background.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/scrollbar.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/systemtray.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/tasks.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/tooltip.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/translucentbackground.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/viewitem.svgz
 usr/share/kde4/apps/kaccess/kaccess.notifyrc
 usr/share/kde4/apps/kcminput/cursor_large_black.pcf.gz
 usr/share/kde4/apps/kcminput/cursor_large_white.pcf.gz
@@ -292,6 +253,15 @@
 usr/share/kde4/config/plasma-themes.knsrc
 usr/share/kde4/config/wallpaper.knsrc
 usr/share/kde4/services/fonts.protocol
+usr/share/wallpapers/Air/contents/images/1024x768.jpg
+usr/share/wallpapers/Air/contents/images/1280x1024.jpg
+usr/share/wallpapers/Air/contents/images/1280x800.jpg
+usr/share/wallpapers/Air/contents/images/1440x900.jpg
+usr/share/wallpapers/Air/contents/images/1600x1200.jpg
+usr/share/wallpapers/Air/contents/images/1920x1080.jpg
+usr/share/wallpapers/Air/contents/images/1920x1200.jpg
+usr/share/wallpapers/Air/contents/screenshot.png
+usr/share/wallpapers/Air/metadata.desktop
 usr/share/wallpapers/Blue_Curl/contents/images/1024x768.jpg
 usr/share/wallpapers/Blue_Curl/contents/images/1280x1024.jpg
 usr/share/wallpapers/Blue_Curl/contents/images/1280x800.jpg

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2008-12-17 12:08:00 UTC (rev 12956)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2008-12-17 12:08:25 UTC (rev 12957)
@@ -1,6 +1,6 @@
 --- a/kcontrol/kdm/kdm-dlg.cpp
 +++ b/kcontrol/kdm/kdm-dlg.cpp
-@@ -282,7 +282,7 @@
+@@ -281,7 +281,7 @@
  
  	// Read the greeting string
  	greetstr_lined->setText( configGrp.readEntry( "GreetString",
@@ -9,7 +9,7 @@
  
  	// Regular logo or clock
  	QString logoArea = configGrp.readEntry( "LogoArea", "Logo" );
-@@ -310,7 +310,7 @@
+@@ -309,7 +309,7 @@
  
  void KDMDialogWidget::defaults()
  {

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-12-17 12:08:00 UTC (rev 12956)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-12-17 12:08:25 UTC (rev 12957)
@@ -31,7 +31,7 @@
  	connect( m_background, SIGNAL(changed( bool )), SIGNAL(changed()) );
 --- a/kcontrol/kdm/main.cpp
 +++ b/kcontrol/kdm/main.cpp
-@@ -187,8 +187,8 @@
+@@ -186,8 +186,8 @@
  	for (tgmapci = tgmap.constBegin(); tgmapci != tgmap.constEnd(); ++tgmapci)
  		kWarning() << "user(s) '" << tgmapci.value().join( "," )
  		<< "' have unknown GID " << tgmapci.key() << endl;
@@ -66,7 +66,7 @@
  
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -2766,6 +2766,7 @@
+@@ -2768,6 +2768,7 @@
  
  
  static const char *oldkdes[] = {
@@ -74,7 +74,7 @@
  	KDE_CONFDIR,
  	"/opt/kde4/share/config",
  	"/usr/local/kde4/share/config",
-@@ -2774,6 +2775,7 @@
+@@ -2776,6 +2777,7 @@
  	"/usr/local/kde/share/config",
  	"/usr/local/share/config",
  	"/usr/share/config",
@@ -82,7 +82,7 @@
  
  	"/opt/kde3/share/config",
  	"/usr/local/kde3/share/config",
-@@ -2817,7 +2819,7 @@
+@@ -2819,7 +2821,7 @@
  "    Note that you possibly need to use --no-old-kde to make this take effect.\n"
  "  --old-kde /path/to/old/kde-config-dir\n"
  "    Where to look for the kdmrc of a previously installed kdm.\n"

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2008-12-17 12:08:00 UTC (rev 12956)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2008-12-17 12:08:25 UTC (rev 12957)
@@ -1,12 +1,12 @@
 We renamed ktrash to ktrash4. See bug #494427.
 --- a/plasma/applets/trash/trash.cpp
 +++ b/plasma/applets/trash/trash.cpp
-@@ -201,7 +201,7 @@
-         // we can simply call ktrash.
-         //KonqOperations::emptyTrash(&m_menu);
-         KProcess process;
--        process << KStandardDirs::findExe("ktrash") << "--empty";
-+        process << KStandardDirs::findExe("ktrash4") << "--empty";
-         process.execute();
- 
+@@ -215,7 +215,7 @@
+         m_emptyProcess = new KProcess(this);
+         connect(m_emptyProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
+                 this, SLOT(emptyFinished(int,QProcess::ExitStatus)));
+-        (*m_emptyProcess) << KStandardDirs::findExe("ktrash") << "--empty";
++        (*m_emptyProcess) << KStandardDirs::findExe("ktrash4") << "--empty";
+         m_emptyProcess->start();
      }
+ }

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2008-12-17 12:08:00 UTC (rev 12956)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2008-12-17 12:08:25 UTC (rev 12957)
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -46,9 +46,9 @@
+@@ -52,9 +52,9 @@
  
  macro_optional_find_package(PyKDE4)
  set(PythonSupport_FOUND FALSE)




More information about the pkg-kde-commits mailing list