rev 15819 - in trunk/packages/kdebase-workspace/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sat Aug 29 17:55:33 UTC 2009
Author: modax-guest
Date: 2009-08-29 17:55:33 +0000 (Sat, 29 Aug 2009)
New Revision: 15819
Added:
trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install.linux
trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install.linux
Removed:
trunk/packages/kdebase-workspace/debian/patches/01_r1004104_oxygen_air.diff
trunk/packages/kdebase-workspace/debian/patches/02_kfreebsd_updates.diff
trunk/packages/kdebase-workspace/debian/patches/27_ruby_scriptengine_typo
Modified:
trunk/packages/kdebase-workspace/debian/changelog
trunk/packages/kdebase-workspace/debian/control
trunk/packages/kdebase-workspace/debian/installgen
trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
trunk/packages/kdebase-workspace/debian/kdm.install
trunk/packages/kdebase-workspace/debian/not-installed
trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff
trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
trunk/packages/kdebase-workspace/debian/patches/series
trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install
trunk/packages/kdebase-workspace/debian/rules
Log:
* Bump KDE build dependencies to 4.3.1.
* Drop 01_r1004104_oxygen_air.diff patch, taken from upstream.
* Drop 02_kfreebsd_updates.diff patch, merged upstream.
* Drop 27_ruby_scriptengine_typo patch, merged upstream.
* Update install files.
* Install Linux specific files on Linux only.
Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/changelog 2009-08-29 17:55:33 UTC (rev 15819)
@@ -1,19 +1,23 @@
-kdebase-workspace (4:4.3.1-1) UNRELEASED; urgency=low
+kdebase-workspace (4:4.3.1-0r1) UNRELEASED; urgency=low
* New upstream release.
- +++ Changes by Pino Toscano:
-
- * Install also the Linux-only data files of kdebase-workspace-data using a
- install rule in rules (as a followup for bug #542591).
-
+++ Changes by Fathi Boudra:
* Add libutempter-dev build dependency. It allows to build kwrited as a kded
module.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 27 Aug 2009 09:56:59 +0200
+ +++ Changes by Modestas Vainius:
+ * Bump KDE build dependencies to 4.3.1.
+ * Drop 01_r1004104_oxygen_air.diff patch, taken from upstream.
+ * Drop 02_kfreebsd_updates.diff patch, merged upstream.
+ * Drop 27_ruby_scriptengine_typo patch, merged upstream.
+ * Update install files.
+ * Install Linux specific files on Linux only.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 29 Aug 2009 19:08:29 +0300
+
kdebase-workspace (4:4.3.0-3) unstable; urgency=low
+++ Changes by George Kiagiadakis:
Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/control 2009-08-29 17:55:33 UTC (rev 15819)
@@ -4,7 +4,7 @@
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2),
- kdelibs5-dev (>= 4:4.3.0), kdepimlibs5-dev (>= 4:4.3.0), libboost-dev,
+ kdelibs5-dev (>= 4:4.3.1), kdepimlibs5-dev (>= 4:4.3.1), libboost-dev,
python-support (>= 0.6), python-dev,
libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libck-connector-dev, libdbus-1-dev,
Modified: trunk/packages/kdebase-workspace/debian/installgen
===================================================================
--- trunk/packages/kdebase-workspace/debian/installgen 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/installgen 2009-08-29 17:55:33 UTC (rev 15819)
@@ -1,28 +1,81 @@
[kdebase-workspace-dev]
-# missing on purpose
+#missing on purpose
missing dst:usr/lib/libkwinnvidiahack.so$
missing dst:usr/lib/lib.*private\.so$ link:
+# no soversion
+missing dst:usr/include/systemsettingsview/
dst:usr/include
-dst:usr/lib/.*\.so$ link:usr/lib/.*\.so[.\d]+$
+dst:usr/lib/.*\.so$link:usr/lib/.*\.so[.\d]+$
dst:/cmake/
dst:dbus-\d+/interfaces
dst:plugins/designer
[libkdecorations4]
-dst:usr/lib/libkdecorations\.so\.
+dst:usr/lib/libkdecorations\.so\.4
[libkwineffects1]
-dst:usr/lib/libkwineffects\.so\.
+dst:usr/lib/libkwineffects\.so\.1
+[libkephal4]
+dst:usr/lib/libkephal\.so\.4
+
+[libkfontinst4]
+dst:usr/lib/libkfontinst\.so\.4
+
+[libkscreensaver5]
+dst:usr/lib/libkscreensaver\.so\.5
+
+[libksgrd4]
+dst:usr/lib/libksgrd\.so\.4
+
+[libkworkspace4]
+dst:usr/lib/libkworkspace\.so\.4
+
+[liblsofui4]
+dst:usr/lib/liblsofui\.so\.4
+
+[libnepomukquery4]
+dst:usr/lib/libnepomukquery\.so\.4
+
+[libnepomukqueryclient4]
+dst:usr/lib/libnepomukqueryclient\.so\.4
+
+[libplasma-applet-system-monitor4]
+dst:usr/lib/libplasma-applet-system-monitor\.so\.4
+
+[libplasmaclock4]
+dst:usr/lib/libplasmaclock\.so\.4
+
+[libplasma-geolocation-interface4]
+dst:usr/lib/libplasma-geolocation-interface\.so\.4
+
+[libprocesscore4]
+dst:usr/lib/libprocesscore\.so\.4
+
+[libprocessui4]
+dst:usr/lib/libprocessui\.so\.4
+
+[libsolidcontrol4]
+dst:usr/lib/libsolidcontrol\.so\.4
+
+[libsolidcontrolifaces4]
+dst:usr/lib/libsolidcontrolifaces\.so\.4
+
+[libtaskmanager4]
+dst:usr/lib/libtaskmanager\.so\.4
+
+[libweather-ion4]
+dst:usr/lib/libweather_ion\.so\.4
+
[kde-window-manager]
from:/kwin/
dst:kwin
[kdm]
-# Used by other kcms.
+#Used by other kcms.
skip from:/kcontrol/kdm/ dst:monitor.png$
-# greeters from libs/kdm go to kdebase-workspace-bin
+#greeters from libs/kdm go to kdebase-workspace-bin
skip from:/libs/kdm/
from:/kdm/
dst:kdm
@@ -32,13 +85,13 @@
dst:klipper
[ksysguardd]
-# to kdebase-workspace-data
+#to kdebase-workspace-data
skip dst:icons/.*/ksysguardd\.
from:/ksysguardd/
dst:ksysguardd
[ksysguard]
-# Do not install ksysguard libraries here
+#Do not install ksysguard libraries here
skip dst:usr/lib/lib.*\.so\.
from:/ksysguard/
@@ -47,12 +100,8 @@
dst:usr/share/kde4/services/(colors|fonts|style)\.desktop$
from:/systemsettings/
-[kdebase-workspace-libs4+5]
-skip dst:usr/lib/libkdeinit4_
-skip dst:usr/lib/lib.*private\.so
-dst:usr/lib/lib[^/]+\.so\.
-
[plasma-dataengines-workspace]
+missing dst:usr/lib/lib[^/]+\.so$ link:
from:/plasma/dataengines/
[plasma-widgets-workspace]
@@ -60,8 +109,8 @@
from:/plasma/animators/
from:/plasma/containments/
-[plasma-scriptengine-javascript]
-from:/plasma/scriptengines/javascript/
+[plasma-scriptengine-webkit]
+from:/plasma/scriptengines/webkit/
[plasma-scriptengine-ruby]
from:/plasma/scriptengines/ruby/
@@ -80,7 +129,7 @@
dst:usr/bin
mime:application/x-executable
mime:application/x-sharedlib
-# Install *.desktop files to -bin
+#Install *.desktop files to -bin
skip dst:usr/share/wallpapers/
dst:\.desktop$
Modified: trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install 2009-08-29 17:55:33 UTC (rev 15819)
@@ -18,7 +18,6 @@
usr/bin/ksplashx_scale
usr/bin/kstartupconfig4
usr/bin/ksystraycmd
-usr/bin/kwrited
usr/bin/kxkb
usr/bin/plasma-desktop
usr/bin/plasma-overlay
@@ -59,6 +58,7 @@
usr/lib/kde4/kcm_xinerama.so
usr/lib/kde4/kded_kephal.so
usr/lib/kde4/kded_khotkeys.so
+usr/lib/kde4/kded_kwrited.so
usr/lib/kde4/kded_notificationitemwatcher.so
usr/lib/kde4/kded_powerdevil.so
usr/lib/kde4/kfontviewpart.so
@@ -103,7 +103,6 @@
usr/share/applications/kde4/kmenuedit.desktop
usr/share/applications/kde4/krandrtray.desktop
usr/share/autostart/krunner.desktop
-usr/share/autostart/kwrited-autostart.desktop
usr/share/autostart/plasma-desktop.desktop
usr/share/kde4/apps/kcmsolidactions/solid-action-template.desktop
usr/share/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop
@@ -127,6 +126,7 @@
usr/share/kde4/services/kcmsmserver.desktop
usr/share/kde4/services/kded/kephal.desktop
usr/share/kde4/services/kded/khotkeys.desktop
+usr/share/kde4/services/kded/kwrited.desktop
usr/share/kde4/services/kded/notificationitemwatcher.desktop
usr/share/kde4/services/kded/powerdevil.desktop
usr/share/kde4/services/keyboard.desktop
Added: trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install.linux
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install.linux (rev 0)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install.linux 2009-08-29 17:55:33 UTC (rev 15819)
@@ -0,0 +1,16 @@
+usr/bin/solid-bluetooth
+usr/bin/solid-network
+usr/bin/solid-powermanagement
+usr/lib/kde4/kcm_joystick.so
+usr/lib/kde4/kded_networkstatus.so
+usr/lib/kde4/solid_bluez.so
+usr/lib/kde4/solid_hal_power.so
+usr/lib/kde4/solid_networkmanager07.so
+usr/share/kde4/services/joystick.desktop
+usr/share/kde4/services/kded/networkstatus.desktop
+usr/share/kde4/services/solidbackends/solid_bluez.desktop
+usr/share/kde4/services/solidbackends/solid_hal_power.desktop
+usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
+usr/share/kde4/servicetypes/solidbluetoothmanager.desktop
+usr/share/kde4/servicetypes/solidnetworkmanager.desktop
+usr/share/kde4/servicetypes/solidpowermanager.desktop
Added: trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install.linux
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install.linux (rev 0)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-data.install.linux 2009-08-29 17:55:33 UTC (rev 15819)
@@ -0,0 +1,8 @@
+usr/share/doc/kde4/HTML/en/kcontrol/joystick/common
+usr/share/doc/kde4/HTML/en/kcontrol/joystick/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/joystick/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/joystick/joystick-calibration.png
+usr/share/doc/kde4/HTML/en/kcontrol/joystick/joystick-main.png
+usr/share/icons/oxygen/22x22/apps/networkmanager.png
+usr/share/icons/oxygen/32x32/apps/networkmanager.png
+usr/share/icons/oxygen/64x64/apps/networkmanager.png
Modified: trunk/packages/kdebase-workspace/debian/kdm.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.install 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/kdm.install 2009-08-29 17:55:33 UTC (rev 15819)
@@ -1,5 +1,4 @@
-etc/kde4/kdm/backgroundrc
-etc/kde4/kdm/kdmrc
+../local/kdm.options etc/kde4/kdm/
etc/kde4/kdm/README
etc/kde4/kdm/Xaccess
etc/kde4/kdm/Xreset
@@ -7,7 +6,8 @@
etc/kde4/kdm/Xsetup
etc/kde4/kdm/Xstartup
etc/kde4/kdm/Xwilling
-../local/kdm.options etc/kde4/kdm/
+etc/kde4/kdm/backgroundrc
+etc/kde4/kdm/kdmrc
usr/bin/genkdmconf
usr/bin/kdm
usr/bin/kdmctl
@@ -20,8 +20,8 @@
usr/share/doc/kde4/HTML/en/kdm/index.docbook
usr/share/doc/kde4/HTML/en/kdm/kdmrc-ref.docbook
usr/share/doc/kde4/HTML/en/kdm/theme-ref.docbook
+usr/share/kde4/apps/doc/kdm/README
usr/share/kde4/apps/doc/kdm/greeter.dtd
-usr/share/kde4/apps/doc/kdm/README
usr/share/kde4/apps/kcontrol/pics/anchor.png
usr/share/kde4/apps/kdm/patterns/fish.desktop
usr/share/kde4/apps/kdm/patterns/fish.png
@@ -47,8 +47,8 @@
usr/share/kde4/apps/kdm/programs/xglobe.desktop
usr/share/kde4/apps/kdm/programs/xplanet.desktop
usr/share/kde4/apps/kdm/sessions/9wm.desktop
+usr/share/kde4/apps/kdm/sessions/aewm++.desktop
usr/share/kde4/apps/kdm/sessions/aewm.desktop
-usr/share/kde4/apps/kdm/sessions/aewm++.desktop
usr/share/kde4/apps/kdm/sessions/afterstep.desktop
usr/share/kde4/apps/kdm/sessions/amaterus.desktop
usr/share/kde4/apps/kdm/sessions/amiwm.desktop
@@ -62,14 +62,14 @@
usr/share/kde4/apps/kdm/sessions/evilwm.desktop
usr/share/kde4/apps/kdm/sessions/fluxbox.desktop
usr/share/kde4/apps/kdm/sessions/flwm.desktop
+usr/share/kde4/apps/kdm/sessions/fvwm.desktop
usr/share/kde4/apps/kdm/sessions/fvwm95.desktop
-usr/share/kde4/apps/kdm/sessions/fvwm.desktop
usr/share/kde4/apps/kdm/sessions/gnome.desktop
usr/share/kde4/apps/kdm/sessions/golem.desktop
usr/share/kde4/apps/kdm/sessions/icewm.desktop
usr/share/kde4/apps/kdm/sessions/ion.desktop
+usr/share/kde4/apps/kdm/sessions/kde-safe.desktop
usr/share/kde4/apps/kdm/sessions/kde.desktop
-usr/share/kde4/apps/kdm/sessions/kde-safe.desktop
usr/share/kde4/apps/kdm/sessions/larswm.desktop
usr/share/kde4/apps/kdm/sessions/lwm.desktop
usr/share/kde4/apps/kdm/sessions/matchbox.desktop
@@ -92,19 +92,19 @@
usr/share/kde4/apps/kdm/sessions/waimea.desktop
usr/share/kde4/apps/kdm/sessions/wm2.desktop
usr/share/kde4/apps/kdm/sessions/wmaker.desktop
+usr/share/kde4/apps/kdm/sessions/xfce.desktop
usr/share/kde4/apps/kdm/sessions/xfce4.desktop
-usr/share/kde4/apps/kdm/sessions/xfce.desktop
+usr/share/kde4/apps/kdm/themes/circles/KdmGreeterTheme.desktop
usr/share/kde4/apps/kdm/themes/circles/background.svg
usr/share/kde4/apps/kdm/themes/circles/circles.xml
usr/share/kde4/apps/kdm/themes/circles/flower.png
usr/share/kde4/apps/kdm/themes/circles/help.png
-usr/share/kde4/apps/kdm/themes/circles/KdmGreeterTheme.desktop
usr/share/kde4/apps/kdm/themes/circles/options.png
usr/share/kde4/apps/kdm/themes/circles/screenshot.png
usr/share/kde4/apps/kdm/themes/oxygen-air/1280x800.jpg
+usr/share/kde4/apps/kdm/themes/oxygen-air/KdmGreeterTheme.desktop
usr/share/kde4/apps/kdm/themes/oxygen-air/caps.png
usr/share/kde4/apps/kdm/themes/oxygen-air/icon-kde.png
-usr/share/kde4/apps/kdm/themes/oxygen-air/KdmGreeterTheme.desktop
usr/share/kde4/apps/kdm/themes/oxygen-air/oxygen-air.xml
usr/share/kde4/apps/kdm/themes/oxygen-air/pw-entry-li.png
usr/share/kde4/apps/kdm/themes/oxygen-air/pw-entry.png
@@ -116,9 +116,9 @@
usr/share/kde4/apps/kdm/themes/oxygen-air/user-entry-li.png
usr/share/kde4/apps/kdm/themes/oxygen-air/user-entry.png
usr/share/kde4/apps/kdm/themes/oxygen-air/win-login.png
+usr/share/kde4/apps/kdm/themes/oxygen/KdmGreeterTheme.desktop
usr/share/kde4/apps/kdm/themes/oxygen/background.svg
usr/share/kde4/apps/kdm/themes/oxygen/branding-icon.png
-usr/share/kde4/apps/kdm/themes/oxygen/KdmGreeterTheme.desktop
usr/share/kde4/apps/kdm/themes/oxygen/oxygen-box.svg
usr/share/kde4/apps/kdm/themes/oxygen/oxygen.svg
usr/share/kde4/apps/kdm/themes/oxygen/oxygen.xml
Modified: trunk/packages/kdebase-workspace/debian/not-installed
===================================================================
--- trunk/packages/kdebase-workspace/debian/not-installed 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/not-installed 2009-08-29 17:55:33 UTC (rev 15819)
@@ -767,3 +767,6 @@
# this is installed for upgrade purposes for people that build from sources
./usr/share/autostart/plasma.desktop
+
+# Manual page gets compressed
+./usr/share/man/man1/plasmaengineexplorer.1
\ No newline at end of file
Modified: trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/patches/25_task.h_forward_decl_netwininfo.diff 2009-08-29 17:55:33 UTC (rev 15819)
@@ -39,7 +39,7 @@
#include <QX11Info>
--- a/plasma/applets/tasks/abstracttaskitem.cpp
+++ b/plasma/applets/tasks/abstracttaskitem.cpp
-@@ -46,6 +46,7 @@
+@@ -48,6 +48,7 @@
#include <taskmanager/task.h>
#include <taskmanager/taskmanager.h>
#include <taskmanager/taskgroup.h>
Modified: trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff 2009-08-29 17:55:33 UTC (rev 15819)
@@ -1,6 +1,6 @@
--- a/libs/kworkspace/CMakeLists.txt
+++ b/libs/kworkspace/CMakeLists.txt
-@@ -27,6 +27,7 @@
+@@ -24,6 +24,7 @@
kde4_add_library(kworkspace ${LIB_MODE} ${kworkspace_LIB_SRCS})
target_link_libraries(kworkspace ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} )
Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/patches/series 2009-08-29 17:55:33 UTC (rev 15819)
@@ -1,5 +1,3 @@
-01_r1004104_oxygen_air.diff
-02_kfreebsd_updates.diff
06_kdm_does_not_wreak_havoc.diff
07_kdmrc_defaults.diff
08_genkdmconf.diff
@@ -16,5 +14,4 @@
25_task.h_forward_decl_netwininfo.diff
#56_solid_changes_kdebluetooth.diff
26_run_kaboom_when_starting_kde.diff
-27_ruby_scriptengine_typo
97_fix_target_link_libraries.diff
Modified: trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/plasma-widgets-workspace.install 2009-08-29 17:55:33 UTC (rev 15819)
@@ -1,3 +1,7 @@
+#usr/share/kde4/apps/plasma/plasmoids/ggl_photos/config.txt
+#usr/share/kde4/apps/plasma/plasmoids/ggl_rss/config.txt
+#usr/share/kde4/services/plasma-applet-ggl-photos.desktop
+#usr/share/kde4/services/plasma-applet-ggl-rss.desktop
usr/lib/kde4/plasma_animator_default.so
usr/lib/kde4/plasma_applet_activitybar.so
usr/lib/kde4/plasma_applet_battery.so
@@ -31,8 +35,6 @@
usr/share/kde4/apps/desktoptheme/default/calendar/mini-calendar.svgz
usr/share/kde4/apps/desktoptheme/default/system-monitor/hdd_panel.svgz
usr/share/kde4/apps/desktoptheme/default/widgets/battery-oxygen.svgz
-#usr/share/kde4/apps/plasma/plasmoids/ggl_photos/config.txt
-#usr/share/kde4/apps/plasma/plasmoids/ggl_rss/config.txt
usr/share/kde4/apps/solid/actions/test-predicate-openinwindow.desktop
usr/share/kde4/services/plasma-animator-default.desktop
usr/share/kde4/services/plasma-applet-activitybar.desktop
@@ -40,8 +42,6 @@
usr/share/kde4/services/plasma-applet-calendar.desktop
usr/share/kde4/services/plasma-applet-devicenotifier.desktop
usr/share/kde4/services/plasma-applet-digitalclock.desktop
-#usr/share/kde4/services/plasma-applet-ggl-photos.desktop
-#usr/share/kde4/services/plasma-applet-ggl-rss.desktop
usr/share/kde4/services/plasma-applet-icon.desktop
usr/share/kde4/services/plasma-applet-launcher.desktop
usr/share/kde4/services/plasma-applet-lockout.desktop
Modified: trunk/packages/kdebase-workspace/debian/rules
===================================================================
--- trunk/packages/kdebase-workspace/debian/rules 2009-08-29 16:31:18 UTC (rev 15818)
+++ trunk/packages/kdebase-workspace/debian/rules 2009-08-29 17:55:33 UTC (rev 15819)
@@ -5,51 +5,22 @@
#DEB_CMAKE_EXTRA_FLAGS += \
# -DINSTALL_PRINTER_APPLET=TRUE
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
DEB_CMAKE_EXTRA_FLAGS += -DKDE4_KDM_PAM_SERVICE=kdm
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-
DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-bin := -- -xksysguard
DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-dev := -- -xkdebase-runtime
+
$(foreach p,$(filter lib%, $(DEB_ARCH_PACKAGES)),$(eval DEB_DH_SHLIBDEPS_ARGS_$(p) := -- -xkdebase-runtime))
-
-DEB_FIXPERMS_EXCLUDE := usr/bin/kwrited
-
binary-install/kdm::
install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np
binary-install/plasma-scriptengine-python::
dh_pysupport -p$(cdbs_curpkg) /usr/share/kde4/apps/plasma_scriptengine_python
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-install/kdebase-workspace-bin::
- dh_install -pkdebase-workspace-bin usr/bin/solid-bluetooth
- dh_install -pkdebase-workspace-bin usr/bin/solid-network
- dh_install -pkdebase-workspace-bin usr/bin/solid-powermanagement
- dh_install -pkdebase-workspace-bin usr/lib/kde4/kcm_joystick.so
- dh_install -pkdebase-workspace-bin usr/lib/kde4/kded_networkstatus.so
- dh_install -pkdebase-workspace-bin usr/lib/kde4/solid_bluez.so
- dh_install -pkdebase-workspace-bin usr/lib/kde4/solid_hal_power.so
- dh_install -pkdebase-workspace-bin usr/lib/kde4/solid_networkmanager07.so
- dh_install -pkdebase-workspace-bin usr/share/kde4/services/joystick.desktop
- dh_install -pkdebase-workspace-bin usr/share/kde4/services/kded/networkstatus.desktop
- dh_install -pkdebase-workspace-bin usr/share/kde4/services/solidbackends/solid_bluez.desktop
- dh_install -pkdebase-workspace-bin usr/share/kde4/services/solidbackends/solid_hal_power.desktop
- dh_install -pkdebase-workspace-bin usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
- dh_install -pkdebase-workspace-bin usr/share/kde4/servicetypes/solidbluetoothmanager.desktop
- dh_install -pkdebase-workspace-bin usr/share/kde4/servicetypes/solidnetworkmanager.desktop
- dh_install -pkdebase-workspace-bin usr/share/kde4/servicetypes/solidpowermanager.desktop
-
-install/kdebase-workspace-data::
- dh_install -pkdebase-workspace-data usr/share/doc/kde4/HTML/en/kcontrol/joystick/common
- dh_install -pkdebase-workspace-data usr/share/doc/kde4/HTML/en/kcontrol/joystick/index.cache.bz2
- dh_install -pkdebase-workspace-data usr/share/doc/kde4/HTML/en/kcontrol/joystick/index.docbook
- dh_install -pkdebase-workspace-data usr/share/doc/kde4/HTML/en/kcontrol/joystick/joystick-calibration.png
- dh_install -pkdebase-workspace-data usr/share/doc/kde4/HTML/en/kcontrol/joystick/joystick-main.png
- dh_install -pkdebase-workspace-data usr/share/icons/oxygen/22x22/apps/networkmanager.png
- dh_install -pkdebase-workspace-data usr/share/icons/oxygen/32x32/apps/networkmanager.png
- dh_install -pkdebase-workspace-data usr/share/icons/oxygen/64x64/apps/networkmanager.png
+ifeq ($(DEB_BUILD_ARCH_OS),linux)
+install/kdebase-workspace-bin install/kdebase-workspace-data::
+ # Install common files
+ dh_install -p$(cdbs_curpkg) --ignore=debian/$(cdbs_curpkg).install.linux
endif
More information about the pkg-kde-commits
mailing list