rev 15705 - trunk/packages/kdebase/debian

[Pino Toscano]

Author: pino-guest
Date: 2009-08-20 13:52:30 +0000 (Thu, 20 Aug 2009)
New Revision: 15705

Removed:
   trunk/packages/kdebase/debian/kinfocenter.install.kfreebsd
Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kinfocenter.install
   trunk/packages/kdebase/debian/rules
Log:
simplify the installation of linux-specific files of kinfocenter (like the ones installed for libraw1394):
instead of having a separate file with the installed files for kfreebsd, install them via additional rule in rules;
other than removing the maintenance of a (long) .install file, makes it working also for hurd


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2009-08-20 09:43:29 UTC (rev 15704)
+++ trunk/packages/kdebase/debian/changelog	2009-08-20 13:52:30 UTC (rev 15705)
@@ -4,8 +4,14 @@
 
   * Bump shlibs each new upstream version.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Aug 2009 21:52:54 +0300
+  +++ Changes by Pino Toscano:
 
+  * Remove the separate kinfocenter.install.kfreebsd and instead install
+    Linux-specific stuff using rules. This way there is a .install file less
+    to maintain, and it works on hurd-i3876 as well.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Aug 2009 15:11:35 +0200
+
 kdebase (4:4.3.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdebase/debian/kinfocenter.install
===================================================================
--- trunk/packages/kdebase/debian/kinfocenter.install	2009-08-20 09:43:29 UTC (rev 15704)
+++ trunk/packages/kdebase/debian/kinfocenter.install	2009-08-20 13:52:30 UTC (rev 15705)
@@ -9,7 +9,6 @@
 usr/lib/kde4/kcm_samba.so
 usr/lib/kde4/kcm_solidproc.so
 usr/lib/kde4/kcm_usb.so
-usr/lib/kde4/kcm_view1394.so
 usr/lib/libkdeinit4_kinfocenter.so
 usr/share/applications/kde4/kinfocenter.desktop
 usr/share/doc/kde4/HTML/en/kinfocenter/common
@@ -67,7 +66,6 @@
 usr/share/doc/kde4/HTML/en/kinfocenter/xserver/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kinfocenter/xserver/index.docbook
 usr/share/kde4/apps/kcmusb/usb.ids
-usr/share/kde4/apps/kcmview1394/oui.db
 usr/share/kde4/apps/kinfocenter/about/kinfocenter.css
 usr/share/kde4/apps/kinfocenter/about/main.html
 usr/share/kde4/apps/kinfocenter/about/top-right-kinfocenter.png
@@ -82,7 +80,6 @@
 usr/share/kde4/services/kcm_pci.desktop
 usr/share/kde4/services/kcmsolidproc.desktop
 usr/share/kde4/services/kcmusb.desktop
-usr/share/kde4/services/kcmview1394.desktop
 usr/share/kde4/services/nic.desktop
 usr/share/kde4/services/opengl.desktop
 usr/share/kde4/services/scsi.desktop

Modified: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules	2009-08-20 09:43:29 UTC (rev 15704)
+++ trunk/packages/kdebase/debian/rules	2009-08-20 13:52:30 UTC (rev 15705)
@@ -5,3 +5,12 @@
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 
 DEB_INSTALL_DOCS_ALL=
+
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+install/kinfocenter::
+	dh_install -pkinfocenter usr/lib/kde4/kcm_view1394.so
+	dh_install -pkinfocenter usr/share/kde4/apps/kcmview1394/oui.db
+	dh_install -pkinfocenter usr/share/kde4/services/kcmview1394.desktop
+endif