[SCM] KDE Network module packaging branch, master, updated. debian/4.4.5-2-22-g0dd0dc5

Pino Toscano pino-guest at alioth.debian.org
Fri Mar 4 16:34:04 UTC 2011


The following commit has been merged in the master branch:
commit 0dd0dc5f5542d262f2541bed7547da738a6ca039
Author: Pino Toscano <pino at kde.org>
Date:   Fri Mar 4 17:33:54 2011 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 5b29d66..330f8d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ kdenetwork (4:4.6.1-0r0) UNRELEASED; urgency=low
   * Add build dependencies:
     - libkonq5-dev
     - kdebase-workspace-dev
+   * Use wildcard architectures:
+     - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
+     - list of linux architectures -> linux-any
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 01 Sep 2010 18:14:10 +0300
 
diff --git a/debian/control b/debian/control
index 6496af5..ae1ba16 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
  libsqlite3-dev, libqimageblitz-dev (>= 1:0.0.4),
  libgmp3-dev, libotr2-dev, libboost-dev,
  libavahi-compat-libdnssd-dev, libmeanwhile-dev, libmsn-dev (>= 4.1), libkwebkit-dev,
- libortp-dev, libspeex-dev, libasound2-dev (>= 1.0.14a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libortp-dev, libspeex-dev, libasound2-dev (>= 1.0.14a) [linux-any],
  libstreamanalyzer-dev, libgadu-dev, libmediastreamer-dev, libtelepathy-qt4-dev,
- libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libv4l-dev [linux-any],
  shared-desktop-ontologies, libgpgme11-dev, libexpat-dev, libgif-dev,
  libktorrent-dev, libkonq5-dev, kdebase-workspace-dev
 Build-Conflicts: libmediastreamer-dev (= 3.3.0-1) [amd64]
@@ -111,7 +111,7 @@ Description: development files for the Kopete instant messaging and chat applica
 
 Package: kppp
 Section: net
-Architecture: armel powerpcspe lpia i386 ia64 alpha amd64 armeb arm avr32 hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64
+Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ppp
 Suggests: khelpcenter4
 Description: modem dialer for KDE

-- 
KDE Network module packaging



More information about the pkg-kde-commits mailing list