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

Modestas Vainius modax-guest at alioth.debian.org
Mon May 19 10:21:34 UTC 2008


Author: modax-guest
Date: 2008-05-19 10:21:33 +0000 (Mon, 19 May 2008)
New Revision: 10644

Added:
   branches/kde4/packages/kdebase-workspace/debian/libplasma2.install
   branches/kde4/packages/kdebase-workspace/debian/libplasma2.lintian
Removed:
   branches/kde4/packages/kdebase-workspace/debian/libplasma1.install
   branches/kde4/packages/kdebase-workspace/debian/libplasma1.lintian
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.lintian
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
New snapshot: soname bump, improved plasma descriptions, some files moved around

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-05-19 08:00:13 UTC (rev 10643)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-05-19 10:21:33 UTC (rev 10644)
@@ -1,10 +1,32 @@
-kdebase-workspace (4:4.0.74-2) UNRELEASED; urgency=low
+kdebase-workspace (4:4.0.74+svn809700-1~pre1) UNRELEASED; urgency=low
 
-  * Add libxcursor-dev build dependency. Update target link libraries fix.
-    (Closes: #481724)
+  * New upstream development snapshot:
+    - The latest upstream commit is r809700 by pino
+    - Date: Mon, 19 May 2008 09:49:13 -0000
+  * Corrections to *.install files:
+    - kdebase-workspace-data.install: 1 file(s) removed;
+    - libplasma-dev.install: 1 file(s) removed;
 
- -- Fathi Boudra <fabo at debian.org>  Mon, 19 May 2008 09:56:32 +0200
+  +++ Changes Modestas Vainius:
 
+  * Update install files (libplasma devel files).
+  * libplasma bumped soname to 2. Rename libplasma1 package to libplasma2.
+    It conflicts and replaces libplasma1 due to plugins and data files.
+  * Take oportunity and move plasma kdeinit stuff to kdebase-workspace-bin
+    where it really belongs. Also move a few desktop files to
+    kdebase-workspace-data too. As a result, add conflicts to
+    kdebase-workspace-{bin,data} against obsolete libplasma1 package.
+  * Make libplasma2 depend  >= (instread of =) on kdebase-workspace-data this
+    way restoring binNMU compatibility.
+  * Make libplasma-dev depend on the same kdelibs5-dev version as libplasma2
+    depends on kdelibs5.
+
+  +++ Changes by Fathi Boudra:
+
+  * Add libxcursor-dev build dependency. (Closes: #481724)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 19 May 2008 13:09:30 +0300
+
 kdebase-workspace (4:4.0.74-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-05-19 08:00:13 UTC (rev 10643)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-05-19 10:21:33 UTC (rev 10644)
@@ -41,7 +41,7 @@
  x11-utils, x11-xserver-utils
 Suggests: x11-xkb-utils
 Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip
-Conflicts: kcontrol
+Conflicts: kcontrol, libplasma1
 Description: core binaries for the KDE 4 base workspace module
  This package contains miscellaneous programs needed for a basic KDE 4 desktop
  installation.
@@ -63,7 +63,7 @@
 Section: kde
 Architecture: all
 Conflicts: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
- kmenuedit, ktip
+ kmenuedit, ktip, libplasma1
 Replaces: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
  kmenuedit, ktip
 Description: shared data files for the KDE 4 base workspace module
@@ -196,20 +196,38 @@
  This package contains debugging files used to investigate problems with
  binaries included in the KDE 4 base workspace module.
 
-Package: libplasma1
+Package: libplasma2
 Section: libs
 Architecture: any
 Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-workspace-data (= ${source:Version})
-Conflicts: extragear-plasma
+Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-workspace-data (>= ${source:Version})
+Replaces: libplasma1
+Conflicts: libplasma1
 Description: library for the KDE 4 Plasma desktop
- This package contains the KDE 4 Plasma library and plugins.
+ Plasma is one of the key technologies of KDE 4 (also known as the "Pillars
+ of KDE"), and one of the most visible to users. It is the component that
+ is "in charge" of the desktop interface; the desktop, panel (often referred
+ simply as the task bar), and related elements. Plasma aims to change the
+ traditional concepts of the "Desktop", incorporating semantic application
+ elements, and bringing cooperating technologies to the user's fingertips in
+ a way that is visually appealing while easing work flow.
+ .
+ This package contains the KDE 4 Plasma library and plugins. It is part of the
+ KDE 4 base workspace module.
 
 Package: libplasma-dev
 Section: libdevel
 Architecture: any
 Priority: optional
-Depends: libplasma1 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.73+svn806390)
+Depends: libplasma2 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:libplasma2-Depends-kdelibs5}
 Description: development files for the KDE 4 Plasma desktop
+ Plasma is one of the key technologies of KDE 4 (also known as the "Pillars
+ of KDE"), and one of the most visible to users. It is the component that
+ is "in charge" of the desktop interface; the desktop, panel (often referred
+ simply as the task bar), and related elements. Plasma aims to change the
+ traditional concepts of the "Desktop", incorporating semantic application
+ elements, and bringing cooperating technologies to the user's fingertips in
+ a way that is visually appealing while easing work flow.
+ .
  This package contains headers and other development files needed to build
  software that uses the KDE 4 Plasma library.

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-05-19 08:00:13 UTC (rev 10643)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-05-19 10:21:33 UTC (rev 10644)
@@ -87,4 +87,5 @@
 usr/lib/libkdeinit4_krunner.so
 usr/lib/libkdeinit4_ksmserver.so
 usr/lib/libkdeinit4_kxkb.so
+usr/lib/libkdeinit4_plasma.so
 usr/lib/strigi/strigita_font.so

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.lintian
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.lintian	2008-05-19 08:00:13 UTC (rev 10643)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.lintian	2008-05-19 10:21:33 UTC (rev 10644)
@@ -7,5 +7,4 @@
 kdebase-workspace-bin: shlib-missing-in-control-file libkdeinit4_khotkeys.so for usr/lib/libkdeinit4_khotkeys.so
 kdebase-workspace-bin: shlib-missing-in-control-file libkdeinit4_kaccess.so for usr/lib/libkdeinit4_kaccess.so
 kdebase-workspace-bin: shlib-missing-in-control-file libkdeinit4_kcontroledit.so for usr/lib/libkdeinit4_kcontroledit.so
-kdebase-workspace-bin: package-name-doesnt-match-sonames libkdeinit4-kaccess libkdeinit4-kcminit libkdeinit4-kcminit_startup libkdeinit4-kcontroledit libkdeinit4-khotkeys libkdeinit4-kmenuedit libkdeinit4-krunner libkdeinit4-ksmserver libkdeinit4-kxkb libkfontinst4 libkfontinstui4 libkscreensaver5 libkworkspace4 libsolidcontrol4 libsolidcontrolifaces4 libtaskmanager4 libweather-ion4
-
+kdebase-workspace-bin: package-name-doesnt-match-sonames libkdeinit4-kaccess libkdeinit4-kcminit libkdeinit4-kcminit_startup libkdeinit4-kcontroledit libkdeinit4-khotkeys libkdeinit4-kmenuedit libkdeinit4-krunner libkdeinit4-ksmserver libkdeinit4-kxkb libkfontinst4 libkfontinstui4 libkscreensaver5 libkworkspace4 libsolidcontrol4 libsolidcontrolifaces4 libtaskmanager4 libweather-ion4 libplasma2: shlib-missing-in-control-file libkdeinit4_plasma.so libkdeinit4_plasma.so

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-05-19 08:00:13 UTC (rev 10643)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-05-19 10:21:33 UTC (rev 10644)
@@ -106,7 +106,6 @@
 usr/share/kde4/apps/desktoptheme/default/widgets/clock.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/connection-established.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/containment-controls.svg
-usr/share/kde4/apps/desktoptheme/default/widgets/iconbutton.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/panel-background.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/plot-background.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/toolbox-button.svg
@@ -311,7 +310,9 @@
 usr/share/kde4/services/plasma-runner-sessions.desktop
 usr/share/kde4/services/plasma-runner-shell.desktop
 usr/share/kde4/services/plasma-runner-webshortcuts.desktop
+usr/share/kde4/services/plasma-runner-xesam.desktop
 usr/share/kde4/services/plasma-scriptengine-qscript.desktop
+usr/share/kde4/services/plasma-scriptengine-qscriptrunner.desktop
 usr/share/kde4/services/plasma-tasks-default.desktop
 usr/share/kde4/services/randr.desktop
 usr/share/kde4/services/screensaver.desktop

Modified: branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install	2008-05-19 08:00:13 UTC (rev 10643)
+++ branches/kde4/packages/kdebase-workspace/debian/libplasma-dev.install	2008-05-19 10:21:33 UTC (rev 10644)
@@ -24,12 +24,19 @@
 usr/include/KDE/Plasma/Scripting/DataEngineScript
 usr/include/KDE/Plasma/Scripting/RunnerScript
 usr/include/KDE/Plasma/Scripting/ScriptEngine
+usr/include/KDE/Plasma/Service
+usr/include/KDE/Plasma/ServiceJob
 usr/include/KDE/Plasma/Svg
 usr/include/KDE/Plasma/Theme
 usr/include/KDE/Plasma/UiLoader
 usr/include/KDE/Plasma/View
 usr/include/KDE/Plasma/Weather/Formulas
 usr/include/KDE/Plasma/Weather/Ion
+usr/include/KDE/Plasma/Widgets/Label
+usr/include/KDE/Plasma/Widgets/LineEdit
+usr/include/KDE/Plasma/Widgets/PushButton
+usr/include/KDE/Plasma/Widgets/RadioButton
+usr/include/KDE/Plasma/Widgets/WebContent
 usr/include/clockapplet.h
 usr/include/plasma/abstractrunner.h
 usr/include/plasma/animationdriver.h
@@ -58,7 +65,8 @@
 usr/include/plasma/scripting/dataenginescript.h
 usr/include/plasma/scripting/runnerscript.h
 usr/include/plasma/scripting/scriptengine.h
-usr/include/plasma/shadowitem_p.h
+usr/include/plasma/service.h
+usr/include/plasma/servicejob.h
 usr/include/plasma/svg.h
 usr/include/plasma/theme.h
 usr/include/plasma/uiloader.h
@@ -66,9 +74,14 @@
 usr/include/plasma/weather/formulas.h
 usr/include/plasma/weather/ion.h
 usr/include/plasma/weather/ion_export.h
+usr/include/plasma/widgets/checkbox.h
 usr/include/plasma/widgets/flash.h
 usr/include/plasma/widgets/icon.h
+usr/include/plasma/widgets/label.h
+usr/include/plasma/widgets/lineedit.h
 usr/include/plasma/widgets/meter.h
+usr/include/plasma/widgets/pushbutton.h
+usr/include/plasma/widgets/radiobutton.h
 usr/include/plasma/widgets/signalplotter.h
 usr/include/plasma/widgets/webcontent.h
 usr/include/plasmaclock_export.h

Deleted: branches/kde4/packages/kdebase-workspace/debian/libplasma1.install

Deleted: branches/kde4/packages/kdebase-workspace/debian/libplasma1.lintian

Copied: branches/kde4/packages/kdebase-workspace/debian/libplasma2.install (from rev 10642, branches/kde4/packages/kdebase-workspace/debian/libplasma1.install)
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/libplasma2.install	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/libplasma2.install	2008-05-19 10:21:33 UTC (rev 10644)
@@ -0,0 +1,33 @@
+usr/bin/plasmapkg
+usr/lib/kde4/krunner_xesam.so
+usr/lib/kde4/plasma_animator_default.so
+usr/lib/kde4/plasma_applet_battery.so
+usr/lib/kde4/plasma_applet_clock.so
+usr/lib/kde4/plasma_applet_devicenotifier.so
+usr/lib/kde4/plasma_applet_dig_clock.so
+usr/lib/kde4/plasma_applet_icon.so
+usr/lib/kde4/plasma_applet_launcher.so
+usr/lib/kde4/plasma_applet_lockout.so
+usr/lib/kde4/plasma_applet_pager.so
+usr/lib/kde4/plasma_applet_simplelauncher.so
+usr/lib/kde4/plasma_applet_systemtray.so
+usr/lib/kde4/plasma_applet_tasks.so
+usr/lib/kde4/plasma_applet_trash.so
+usr/lib/kde4/plasma_containment_desktop.so
+usr/lib/kde4/plasma_containment_panel.so
+usr/lib/kde4/plasma_engine_dict.so
+usr/lib/kde4/plasma_engine_filebrowser.so
+usr/lib/kde4/plasma_engine_hotplug.so
+usr/lib/kde4/plasma_engine_mouse.so
+usr/lib/kde4/plasma_engine_places.so
+usr/lib/kde4/plasma_engine_powermanagement.so
+usr/lib/kde4/plasma_engine_soliddevice.so
+usr/lib/kde4/plasma_engine_tasks.so
+usr/lib/kde4/plasma_engine_time.so
+usr/lib/kde4/plasma_engine_weather.so
+usr/lib/kde4/plasma_runner_scriptengine_qscript.so
+usr/lib/kde4/plasma_scriptengine_qscript.so
+usr/lib/libplasma.so.2
+usr/lib/libplasma.so.2.0.0
+usr/lib/libplasmaclock.so.4
+usr/lib/libplasmaclock.so.4.1.0

Copied: branches/kde4/packages/kdebase-workspace/debian/libplasma2.lintian (from rev 10642, branches/kde4/packages/kdebase-workspace/debian/libplasma1.lintian)
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/libplasma2.lintian	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/libplasma2.lintian	2008-05-19 10:21:33 UTC (rev 10644)
@@ -0,0 +1,2 @@
+libplasma1: shlib-missing-in-control-file libkdeinit4_plasma.so for usr/lib/libkdeinit4_plasma.so
+

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-05-19 08:00:13 UTC (rev 10643)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-05-19 10:21:33 UTC (rev 10644)
@@ -513,25 +513,11 @@
  kde4_add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS})
 --- a/libs/plasma/CMakeLists.txt
 +++ b/libs/plasma/CMakeLists.txt
-@@ -78,7 +78,7 @@
+@@ -87,6 +87,7 @@
  
- kde4_add_library(plasma SHARED ${plasma_LIB_SRCS})
+ target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}
+                              ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
++                             ${KDE4_SOLID_LIBS} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY}
+                              ${KDE4_THREADWEAVER_LIBRARIES})
  
--target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}
-+target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY}
- ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES})
- 
  if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
---- a/krunner/CMakeLists.txt
-+++ b/krunner/CMakeLists.txt
-@@ -40,6 +40,10 @@
-   target_link_libraries(kdeinit_krunner ${X11_Xss_LIB})
- endif(X11_Xss_LIB)
- 
-+if(X11_Xcursor_FOUND)
-+  target_link_libraries(kdeinit_krunner ${X11_Xcursor_LIB})
-+endif(X11_Xcursor_FOUND)
-+
- add_subdirectory( lock )
- 
- install(TARGETS kdeinit_krunner ${INSTALL_TARGETS_DEFAULT_ARGS} )




More information about the pkg-kde-commits mailing list