rev 15726 - trunk/packages/kdebase-workspace/debian

Pino Toscano pino-guest at alioth.debian.org
Fri Aug 21 22:25:41 UTC 2009 

Author: pino-guest
Date: 2009-08-21 22:25:41 +0000 (Fri, 21 Aug 2009)
New Revision: 15726

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/control
   trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   trunk/packages/kdebase-workspace/debian/rules
Log:
exclude linux-only dependencies for non-linux archs, and install linux-only files using a custom rule in rules (to avoid an arch-specific .install file)
based on a patch by Petr Salinger, this is the debian-side support for kfreebsd. (related to bug #542591)


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-08-21 22:13:09 UTC (rev 15725)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-08-21 22:25:41 UTC (rev 15726)
@@ -5,8 +5,14 @@
   * Make plasma-dataengines-workspace recommend ksysguardd,
     as it is needed for the system monitor data engine.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Aug 2009 14:16:48 +0300
+  +++ Changes by Pino Toscano:
 
+  * Mark the Linux-only dependencies as such (excluding them for kfreebsd-* and
+    hurd-i386), and install the relative compiled stuff on linux only using a
+    install rule in rules. Based on a patch by Petr Salinger, thanks!
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Aug 2009 00:23:25 +0200
+
 kdebase-workspace (4:4.3.0-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control	2009-08-21 22:13:09 UTC (rev 15725)
+++ trunk/packages/kdebase-workspace/debian/control	2009-08-21 22:25:41 UTC (rev 15726)
@@ -7,8 +7,13 @@
  kdelibs5-dev (>= 4:4.3.0), kdepimlibs5-dev (>= 4:4.3.0), libboost-dev,
  python-support (>= 0.6), python-dev,
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libck-connector-dev, libdbus-1-dev, libnm-util-dev (>= 0.7), network-manager-dev (>= 0.7.0),
- libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), libraw1394-dev, libsensors-dev,
+ libck-connector-dev, libdbus-1-dev,
+ libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ network-manager-dev (>= 0.7.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), 
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 
+ libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
  libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3), libusb-dev, libxkbfile-dev,
  libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxklavier12-dev,
  libxrandr-dev, libxrender-dev, libxxf86misc-dev, libxi-dev,

Modified: trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-08-21 22:13:09 UTC (rev 15725)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-08-21 22:25:41 UTC (rev 15726)
@@ -28,9 +28,6 @@
 usr/bin/polkit-kde-authorization
 usr/bin/safestartkde
 usr/bin/solid-action-desktop-gen
-usr/bin/solid-bluetooth
-usr/bin/solid-network
-usr/bin/solid-powermanagement
 usr/bin/startkde
 usr/lib/kconf_update_bin/krdb_clearlibrarypath
 usr/lib/kconf_update_bin/plasma-add-shortcut-to-menu
@@ -46,7 +43,6 @@
 usr/lib/kde4/kcm_fontinst.so
 usr/lib/kde4/kcm_hotkeys.so
 usr/lib/kde4/kcm_input.so
-usr/lib/kde4/kcm_joystick.so
 usr/lib/kde4/kcm_keyboard.so
 usr/lib/kde4/kcm_keyboard_layout.so
 usr/lib/kde4/kcm_keys.so
@@ -63,7 +59,6 @@
 usr/lib/kde4/kcm_xinerama.so
 usr/lib/kde4/kded_kephal.so
 usr/lib/kde4/kded_khotkeys.so
-usr/lib/kde4/kded_networkstatus.so
 usr/lib/kde4/kded_notificationitemwatcher.so
 usr/lib/kde4/kded_powerdevil.so
 usr/lib/kde4/kfontviewpart.so
@@ -89,10 +84,7 @@
 usr/lib/kde4/libexec/test_kcm_xinerama
 usr/lib/kde4/plasma_wallpaper_color.so
 usr/lib/kde4/plasma_wallpaper_image.so
-usr/lib/kde4/solid_bluez.so
 usr/lib/kde4/solid_fakenet.so
-usr/lib/kde4/solid_hal_power.so
-usr/lib/kde4/solid_networkmanager07.so
 usr/lib/kde4/solid_wicd.so
 usr/lib/libkdeinit4_kaccess.so
 usr/lib/libkdeinit4_kcminit.so
@@ -126,7 +118,6 @@
 usr/share/kde4/services/energy.desktop
 usr/share/kde4/services/fontinst.desktop
 usr/share/kde4/services/fontthumbnail.desktop
-usr/share/kde4/services/joystick.desktop
 usr/share/kde4/services/kaccess.desktop
 usr/share/kde4/services/kcm_keyboard.desktop
 usr/share/kde4/services/kcm_pkk_authorization.desktop
@@ -136,7 +127,6 @@
 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/networkstatus.desktop
 usr/share/kde4/services/kded/notificationitemwatcher.desktop
 usr/share/kde4/services/kded/powerdevil.desktop
 usr/share/kde4/services/keyboard.desktop
@@ -164,15 +154,9 @@
 usr/share/kde4/services/screensaver.desktop
 usr/share/kde4/services/settings-input-actions.desktop
 usr/share/kde4/services/solid-actions.desktop
-usr/share/kde4/services/solidbackends/solid_bluez.desktop
 usr/share/kde4/services/solidbackends/solid_fakenet.desktop
-usr/share/kde4/services/solidbackends/solid_hal_power.desktop
-usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
 usr/share/kde4/services/solidbackends/solid_wicd.desktop
 usr/share/kde4/services/standard_actions.desktop
 usr/share/kde4/services/xinerama.desktop
 usr/share/kde4/servicetypes/screensaver.desktop
-usr/share/kde4/servicetypes/solidbluetoothmanager.desktop
-usr/share/kde4/servicetypes/solidnetworkmanager.desktop
-usr/share/kde4/servicetypes/solidpowermanager.desktop
 usr/share/man/man1/plasmaengineexplorer.1

Modified: trunk/packages/kdebase-workspace/debian/rules
===================================================================
--- trunk/packages/kdebase-workspace/debian/rules	2009-08-21 22:13:09 UTC (rev 15725)
+++ trunk/packages/kdebase-workspace/debian/rules	2009-08-21 22:25:41 UTC (rev 15726)
@@ -5,6 +5,8 @@
 #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
 
@@ -21,3 +23,23 @@
 
 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
+endif

More information about the pkg-kde-commits mailing list