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

Armin Berres trigger-guest at alioth.debian.org
Tue May 13 10:51:38 UTC 2008


Author: trigger-guest
Date: 2008-05-13 10:51:38 +0000 (Tue, 13 May 2008)
New Revision: 10581

Modified:
   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-data.install
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
where was my brain yesterday evening?

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-05-13 10:31:12 UTC (rev 10580)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-05-13 10:51:38 UTC (rev 10581)
@@ -51,6 +51,7 @@
 Package: kdebase-workspace-libs4+5
 Section: libs
 Architecture: any
+Depends: ${shlibs:Depends}
 Replaces: ksysguard (<= 4:4.0.72-1), kdebase-workspace-bin (<= 4:4.0.72-1)
 Description: libraries provided by the KDE 4 base workspace module
  This package contains miscellaneous libraries needed for a basic KDE 4 desktop

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-05-13 10:31:12 UTC (rev 10580)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-05-13 10:51:38 UTC (rev 10581)
@@ -77,7 +77,6 @@
 usr/lib/kde4/solid_fakebluetooth.so
 usr/lib/kde4/solid_fakenet.so
 usr/lib/kde4/solid_hal_power.so
-usr/lib/kde4/solid_networkmanager.so
 usr/lib/libkdeinit4_kaccess.so
 usr/lib/libkdeinit4_kcminit.so
 usr/lib/libkdeinit4_kcminit_startup.so

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-05-13 10:31:12 UTC (rev 10580)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-05-13 10:51:38 UTC (rev 10581)
@@ -66,18 +66,15 @@
 usr/share/icons/oxygen/16x16/mimetypes/fonts-package.png
 usr/share/icons/oxygen/22x22/apps/kcmkwm.png
 usr/share/icons/oxygen/22x22/apps/kfontview.png
-usr/share/icons/oxygen/22x22/apps/networkmanager.png
 usr/share/icons/oxygen/22x22/mimetypes/fonts-package.png
 usr/share/icons/oxygen/32x32/apps/kcmkwm.png
 usr/share/icons/oxygen/32x32/apps/kfontview.png
-usr/share/icons/oxygen/32x32/apps/networkmanager.png
 usr/share/icons/oxygen/32x32/mimetypes/fonts-package.png
 usr/share/icons/oxygen/48x48/apps/kcmkwm.png
 usr/share/icons/oxygen/48x48/apps/kfontview.png
 usr/share/icons/oxygen/48x48/mimetypes/fonts-package.png
 usr/share/icons/oxygen/64x64/apps/kcmkwm.png
 usr/share/icons/oxygen/64x64/apps/kfontview.png
-usr/share/icons/oxygen/64x64/apps/networkmanager.png
 usr/share/icons/oxygen/64x64/mimetypes/fonts-package.png
 usr/share/icons/oxygen/scalable/apps/kcmkwm.svgz
 usr/share/icons/oxygen/scalable/apps/kfontview.svgz
@@ -319,7 +316,6 @@
 usr/share/kde4/services/solidbackends/solid_fakebluetooth.desktop
 usr/share/kde4/services/solidbackends/solid_fakenet.desktop
 usr/share/kde4/services/solidbackends/solid_hal_power.desktop
-usr/share/kde4/services/solidbackends/solid_networkmanager.desktop
 usr/share/kde4/services/style.desktop
 usr/share/kde4/servicetypes/plasma-animator.desktop
 usr/share/kde4/servicetypes/plasma-applet.desktop

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-dev.install	2008-05-13 10:31:12 UTC (rev 10580)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-dev.install	2008-05-13 10:51:38 UTC (rev 10581)
@@ -28,30 +28,24 @@
 usr/include/kworkspace/kdisplaymanager.h
 usr/include/kworkspace/kwindowlistmenu.h
 usr/include/kworkspace/kworkspace.h
-usr/include/solid/control/authentication.h
 usr/include/solid/control/bluetoothinputdevice.h
 usr/include/solid/control/bluetoothinterface.h
 usr/include/solid/control/bluetoothmanager.h
 usr/include/solid/control/bluetoothremotedevice.h
 usr/include/solid/control/bluetoothsecurity.h
-usr/include/solid/control/ifaces/authentication.h
 usr/include/solid/control/ifaces/bluetoothinputdevice.h
 usr/include/solid/control/ifaces/bluetoothinterface.h
 usr/include/solid/control/ifaces/bluetoothmanager.h
 usr/include/solid/control/ifaces/bluetoothremotedevice.h
-usr/include/solid/control/ifaces/network.h
 usr/include/solid/control/ifaces/networkinterface.h
 usr/include/solid/control/ifaces/networkmanager.h
 usr/include/solid/control/ifaces/powermanager.h
-usr/include/solid/control/ifaces/wirelessnetwork.h
-usr/include/solid/control/network.h
 usr/include/solid/control/networking.h
 usr/include/solid/control/networkinterface.h
 usr/include/solid/control/networkmanager.h
 usr/include/solid/control/powermanager.h
 usr/include/solid/control/singletondefs.h
 usr/include/solid/control/solid_control_export.h
-usr/include/solid/control/wirelessnetwork.h
 usr/include/taskmanager/startup.h
 usr/include/taskmanager/task.h
 usr/include/taskmanager/taskmanager.h

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-13 10:31:12 UTC (rev 10580)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-05-13 10:51:38 UTC (rev 10581)
@@ -104,17 +104,6 @@
  
  set_target_properties(solidcontrol PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS solidcontrol ${INSTALL_TARGETS_DEFAULT_ARGS} )
---- a/libs/solid/control/backends/fakenet/CMakeLists.txt
-+++ b/libs/solid/control/backends/fakenet/CMakeLists.txt
-@@ -17,7 +17,7 @@
- kde4_add_plugin(solid_fakenet module.cpp ${solid_fakenet_PART_SRCS})
- 
- 
--target_link_libraries(solid_fakenet solidcontrolifaces ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} )
-+target_link_libraries(solid_fakenet solidcontrolifaces ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
- 
- install(TARGETS solid_fakenet DESTINATION ${PLUGIN_INSTALL_DIR}  )
- 
 --- a/libs/taskmanager/CMakeLists.txt
 +++ b/libs/taskmanager/CMakeLists.txt
 @@ -7,7 +7,7 @@




More information about the pkg-kde-commits mailing list