rev 15826 - trunk/packages/kdebase/debian

[Modestas Vainius]

Author: modax-guest
Date: 2009-08-30 08:59:30 +0000 (Sun, 30 Aug 2009)
New Revision: 15826

Added:
   trunk/packages/kdebase/debian/kinfocenter.install.linux
Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/kinfocenter.install
   trunk/packages/kdebase/debian/rules
Log:
* New upstream release.
* Update install files.
* Bump KDE build dependencies to KDE 4.3.1.
* Rewrite Linux only installation hack and use BUILD_OS rather than HOST_OS.

Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2009-08-30 07:53:54 UTC (rev 15825)
+++ trunk/packages/kdebase/debian/changelog	2009-08-30 08:59:30 UTC (rev 15826)
@@ -1,10 +1,15 @@
-kdebase (4:4.3.0-3) UNRELEASED; urgency=low
+kdebase (4:4.3.1-0r1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
   +++ Changes by Modestas Vainius:
 
   * Downgrade konqueror-nsplugins from kdebase-apps Depends to Recommends.
+  * Update install files.
+  * Bump KDE build dependencies to KDE 4.3.1.
+  * Rewrite Linux only installation hack and use BUILD_OS rather than HOST_OS.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Aug 2009 12:20:48 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Aug 2009 11:32:51 +0300
 
 kdebase (4:4.3.0-2) unstable; urgency=low
 

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2009-08-30 07:53:54 UTC (rev 15825)
+++ trunk/packages/kdebase/debian/control	2009-08-30 08:59:30 UTC (rev 15826)
@@ -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), libphonon-dev (>= 4:4.3.0), kdebase-workspace-dev (>= 4:4.3.0),
+ kdelibs5-dev (>= 4:4.3.1), libphonon-dev (>= 4:4.3.0), kdebase-workspace-dev (>= 4:4.3.1),
  libqimageblitz-dev (>= 1:0.0.4-2), libsmbclient-dev, libusb-dev, libxkbfile-dev,
  libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libstreamanalyzer-dev (>= 0.6.3),
  libxrender-dev, zlib1g-dev, libglu1-mesa-dev,

Modified: trunk/packages/kdebase/debian/kinfocenter.install
===================================================================
--- trunk/packages/kdebase/debian/kinfocenter.install	2009-08-30 07:53:54 UTC (rev 15825)
+++ trunk/packages/kdebase/debian/kinfocenter.install	2009-08-30 08:59:30 UTC (rev 15826)
@@ -9,6 +9,7 @@
 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
@@ -66,6 +67,7 @@
 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
@@ -80,6 +82,7 @@
 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

Added: trunk/packages/kdebase/debian/kinfocenter.install.linux
===================================================================
--- trunk/packages/kdebase/debian/kinfocenter.install.linux	                        (rev 0)
+++ trunk/packages/kdebase/debian/kinfocenter.install.linux	2009-08-30 08:59:30 UTC (rev 15826)
@@ -0,0 +1,3 @@
+usr/lib/kde4/kcm_view1394.so
+usr/share/kde4/apps/kcmview1394/oui.db
+usr/share/kde4/services/kcmview1394.desktop

Modified: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules	2009-08-30 07:53:54 UTC (rev 15825)
+++ trunk/packages/kdebase/debian/rules	2009-08-30 08:59:30 UTC (rev 15826)
@@ -6,11 +6,8 @@
 
 DEB_INSTALL_DOCS_ALL=
 
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-ifeq ($(DEB_HOST_ARCH_OS),linux)
+ifeq ($(DEB_BUILD_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
+	# Install common files
+	dh_install -p$(cdbs_curpkg) --ignore=debian/$(cdbs_curpkg).install.linux
 endif