rev 13167 - branches/kde4.2/packages/kdelibs/debian

Modestas Vainius modax-guest at alioth.debian.org
Mon Jan 5 21:48:15 UTC 2009 

Author: modax-guest
Date: 2009-01-05 21:48:15 +0000 (Mon, 05 Jan 2009)
New Revision: 13167

Removed:
   branches/kde4.2/packages/kdelibs/debian/libplasma-dev.install
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/control
   branches/kde4.2/packages/kdelibs/debian/installgen
   branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install
Log:
Merge libplasma-dev to kdelibs5-dev

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-05 21:45:42 UTC (rev 13166)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-05 21:48:15 UTC (rev 13167)
@@ -31,11 +31,10 @@
   * Add new packages for Plasma. They were based on the respective Plasma
     packages from kdebase-workspace.
     - libplasma3 - contains Plasma library and plugins. Make kdelibs5-dbg
-      recommend it.
-    - libplasma-dev - contains Plasma development files. Build depend on
-      libqt4-opengl-dev and make libplasma-dev depend on libqt4-opengl-dev
-      since GLApplet uses its header.
-    - Bump plasma ABI to plasma-abi-4.2-2.
+      recommend it;
+    - add Plasma headers to kdelibs5-dev, make it provide libplasma-dev and
+      recommend libqt4-opengl-dev needed to build GLapplet stuff;
+    - Bump plasma ABI to plasma-abi-4.2-6;
     - kdelibs5-data replaces kdebase-workspace-data and libplasma2 from KDE 4.1
   * Update install and installgen files.
   * Make kdelibs5 recommend kdebase-runtime >= 4:4.1.80 because some

Modified: branches/kde4.2/packages/kdelibs/debian/control
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/control	2009-01-05 21:45:42 UTC (rev 13166)
+++ branches/kde4.2/packages/kdelibs/debian/control	2009-01-05 21:48:15 UTC (rev 13167)
@@ -49,8 +49,10 @@
 Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), cmake (>= 2.6.2-3~), automoc (>= 1.0~svn850570),
  ${sameVersionDep:libqt4-dev}, ${sameVersionDep:libsoprano-dev}, ${sameVersionDep:libphonon-dev}
 #Suggests: kdelibs5-doc (= ${source:Version})
+Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}
 Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.80-1)
 Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439)
+Provides: libplasma-dev
 Description: development files for the KDE 4 core libraries
  This package contains development files for building KDE 4 applications and
  other software that uses the KDE 4 libraries.
@@ -92,25 +94,6 @@
  This package contains the KDE 4 Plasma library and plugins. It is part of the
  KDE 4 libraries module.
 
-Package: libplasma-dev
-Section: libdevel
-Architecture: any
-Priority: optional
-Depends: libplasma3 (= ${binary:Version}), kdelibs5-dev (= ${binary:Version}),
- ${sameVersionDep:libqt4-opengl-dev:libplasma3}
-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. It is part of the KDE 4
- libraries module.
-
 Package: kdelibs5-dbg
 Section: libdevel
 Architecture: any

Modified: branches/kde4.2/packages/kdelibs/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/installgen	2009-01-05 21:45:42 UTC (rev 13166)
+++ branches/kde4.2/packages/kdelibs/debian/installgen	2009-01-05 21:48:15 UTC (rev 13167)
@@ -1,9 +1,3 @@
-[libplasma-dev]
-dst:usr/lib/libplasma\.so$ link:libplasma\.so[\d.]+$
-dst:/apps/cmake/modules/FindPlasma
-dst:/include/plasma
-dst:/include/KDE/Plasma
-
 [libplasma3]
 dst:usr/lib/libplasma\.so[\d.]+$
 

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install	2009-01-05 21:45:42 UTC (rev 13166)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install	2009-01-05 21:48:15 UTC (rev 13167)
@@ -726,6 +726,67 @@
 usr/include/KDE/Nepomuk/Variant
 usr/include/KDE/OrgKdeKDirNotifyInterface
 usr/include/KDE/OrgKdeKLauncherInterface
+usr/include/KDE/Plasma/AbstractRunner
+usr/include/KDE/Plasma/AnimationDriver
+usr/include/KDE/Plasma/Animator
+usr/include/KDE/Plasma/Applet
+usr/include/KDE/Plasma/AppletScript
+usr/include/KDE/Plasma/BusyWidget
+usr/include/KDE/Plasma/CheckBox
+usr/include/KDE/Plasma/ComboBox
+usr/include/KDE/Plasma/ConfigLoader
+usr/include/KDE/Plasma/Containment
+usr/include/KDE/Plasma/Context
+usr/include/KDE/Plasma/Corona
+usr/include/KDE/Plasma/DataContainer
+usr/include/KDE/Plasma/DataEngine
+usr/include/KDE/Plasma/DataEngineManager
+usr/include/KDE/Plasma/DataEngineScript
+usr/include/KDE/Plasma/Delegate
+usr/include/KDE/Plasma/Dialog
+usr/include/KDE/Plasma/Extender
+usr/include/KDE/Plasma/ExtenderItem
+usr/include/KDE/Plasma/FlashingLabel
+usr/include/KDE/Plasma/Frame
+usr/include/KDE/Plasma/FrameSvg
+usr/include/KDE/Plasma/GLApplet
+usr/include/KDE/Plasma/GroupBox
+usr/include/KDE/Plasma/IconWidget
+usr/include/KDE/Plasma/Label
+usr/include/KDE/Plasma/LineEdit
+usr/include/KDE/Plasma/Meter
+usr/include/KDE/Plasma/Package
+usr/include/KDE/Plasma/PackageMetadata
+usr/include/KDE/Plasma/PackageStructure
+usr/include/KDE/Plasma/PaintUtils
+usr/include/KDE/Plasma/Plasma
+usr/include/KDE/Plasma/PopupApplet
+usr/include/KDE/Plasma/PushButton
+usr/include/KDE/Plasma/QueryMatch
+usr/include/KDE/Plasma/RadioButton
+usr/include/KDE/Plasma/RunnerContext
+usr/include/KDE/Plasma/RunnerManager
+usr/include/KDE/Plasma/RunnerScript
+usr/include/KDE/Plasma/ScriptEngine
+usr/include/KDE/Plasma/ScrollBar
+usr/include/KDE/Plasma/Service
+usr/include/KDE/Plasma/ServiceJob
+usr/include/KDE/Plasma/SignalPlotter
+usr/include/KDE/Plasma/Slider
+usr/include/KDE/Plasma/Svg
+usr/include/KDE/Plasma/SvgWidget
+usr/include/KDE/Plasma/TabBar
+usr/include/KDE/Plasma/TextEdit
+usr/include/KDE/Plasma/Theme
+usr/include/KDE/Plasma/ToolButton
+usr/include/KDE/Plasma/ToolTipContent
+usr/include/KDE/Plasma/ToolTipManager
+usr/include/KDE/Plasma/TreeView
+usr/include/KDE/Plasma/UiLoader
+usr/include/KDE/Plasma/Version
+usr/include/KDE/Plasma/View
+usr/include/KDE/Plasma/Wallpaper
+usr/include/KDE/Plasma/WebView
 usr/include/KDE/PtyProcess
 usr/include/KDE/Solid/AcAdapter
 usr/include/KDE/Solid/AudioInterface
@@ -1405,6 +1466,68 @@
 usr/include/netwm.h
 usr/include/netwm_def.h
 usr/include/passdlg.h
+usr/include/plasma/abstractrunner.h
+usr/include/plasma/animationdriver.h
+usr/include/plasma/animator.h
+usr/include/plasma/applet.h
+usr/include/plasma/configloader.h
+usr/include/plasma/containment.h
+usr/include/plasma/context.h
+usr/include/plasma/corona.h
+usr/include/plasma/datacontainer.h
+usr/include/plasma/dataengine.h
+usr/include/plasma/dataenginemanager.h
+usr/include/plasma/delegate.h
+usr/include/plasma/dialog.h
+usr/include/plasma/extender.h
+usr/include/plasma/extenderitem.h
+usr/include/plasma/framesvg.h
+usr/include/plasma/glapplet.h
+usr/include/plasma/package.h
+usr/include/plasma/packagemetadata.h
+usr/include/plasma/packagestructure.h
+usr/include/plasma/paintutils.h
+usr/include/plasma/plasma.h
+usr/include/plasma/plasma_export.h
+usr/include/plasma/popupapplet.h
+usr/include/plasma/querymatch.h
+usr/include/plasma/runnercontext.h
+usr/include/plasma/runnermanager.h
+usr/include/plasma/scripting/appletscript.h
+usr/include/plasma/scripting/dataenginescript.h
+usr/include/plasma/scripting/runnerscript.h
+usr/include/plasma/scripting/scriptengine.h
+usr/include/plasma/scripting/uiloader.h
+usr/include/plasma/service.h
+usr/include/plasma/servicejob.h
+usr/include/plasma/svg.h
+usr/include/plasma/theme.h
+usr/include/plasma/tooltipcontent.h
+usr/include/plasma/tooltipmanager.h
+usr/include/plasma/version.h
+usr/include/plasma/view.h
+usr/include/plasma/wallpaper.h
+usr/include/plasma/widgets/busywidget.h
+usr/include/plasma/widgets/checkbox.h
+usr/include/plasma/widgets/combobox.h
+usr/include/plasma/widgets/flashinglabel.h
+usr/include/plasma/widgets/frame.h
+usr/include/plasma/widgets/groupbox.h
+usr/include/plasma/widgets/iconwidget.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/scrollbar.h
+usr/include/plasma/widgets/signalplotter.h
+usr/include/plasma/widgets/slider.h
+usr/include/plasma/widgets/svgwidget.h
+usr/include/plasma/widgets/tabbar.h
+usr/include/plasma/widgets/textedit.h
+usr/include/plasma/widgets/toolbutton.h
+usr/include/plasma/widgets/treeview.h
+usr/include/plasma/widgets/webview.h
 usr/include/predicateproperties.h
 usr/include/qtest_kde.h
 usr/include/skipdlg.h
@@ -1481,6 +1604,7 @@
 usr/lib/libkunittest.so
 usr/lib/libkutils.so
 usr/lib/libnepomuk.so
+usr/lib/libplasma.so
 usr/lib/libsolid.so
 usr/lib/libthreadweaver.so
 usr/share/dbus-1/interfaces/org.freedesktop.PowerManagement.Inhibit.xml
@@ -1564,6 +1688,7 @@
 usr/share/kde4/apps/cmake/modules/FindOpenSSL.cmake
 usr/share/kde4/apps/cmake/modules/FindPCRE.cmake
 usr/share/kde4/apps/cmake/modules/FindPhonon.cmake
+usr/share/kde4/apps/cmake/modules/FindPlasma.cmake
 usr/share/kde4/apps/cmake/modules/FindPopplerQt4.cmake
 usr/share/kde4/apps/cmake/modules/FindPostgreSQL.cmake
 usr/share/kde4/apps/cmake/modules/FindPyKDE4.cmake

Deleted: branches/kde4.2/packages/kdelibs/debian/libplasma-dev.install

More information about the pkg-kde-commits mailing list