[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7-68-gd4b4b3e

Pino Toscano pino-guest at alioth.debian.org
Tue Feb 1 23:45:02 UTC 2011


The following commit has been merged in the master branch:
commit d4b4b3e3dbffb9734c0c2ff8a4c414b19c5ef3eb
Author: Pino Toscano <pino at kde.org>
Date:   Wed Feb 2 00:44:51 2011 +0100

    use wildcard architectures
---
 debian/changelog |    3 +++
 debian/control   |   10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 172bce4..ef029d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -103,6 +103,9 @@ kdebase-workspace (4:4.6.0-0r1) UNRELEASED; urgency=low
     - libdmtx-dev
   * Make kdebase-workspace-bin recommend upower on Linux archs,
     for power management.
+  * Use wildcard architectures:
+    - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
+    - kfreebsd-i386 kfreebsd-amd64 -> kfreebsd-any
 
   [ Modestas Vainius ]
   * Remove README.Debian introduced in 4.4.5-6, no longer applicable.
diff --git a/debian/control b/debian/control
index 300b83e..f01a265 100644
--- a/debian/control
+++ b/debian/control
@@ -17,15 +17,15 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.0),
  python-support (>= 0.6), python-dev,
  shared-desktop-ontologies,
  libpam0g-dev,
- libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- network-manager-dev (>= 0.7.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libnm-util-dev (>= 0.7) [linux-any],
+ network-manager-dev (>= 0.7.0) [linux-any],
+ libraw1394-dev [linux-any],
  libusb-dev, libpci-dev,
  libakonadi-dev (>= 1.1.95), libboost-dev,
  libgps-dev (>= 2.90),
  libck-connector-dev, libdbus-1-dev,
- libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
+ libsensors4-dev [linux-any],
+ libdevstat-dev [kfreebsd-any],
  libxkbfile-dev, libxrandr-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev,
  libxfixes-dev, libxft-dev, libxtst-dev, libxss-dev, libsm-dev, libxinerama-dev, libxi-dev,
  libpng-dev, libjpeg62-dev, libxcursor-dev,

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list