rev 7085 - trunk/packages/kdenetwork/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2007-08-13 09:17:49 +0000 (Mon, 13 Aug 2007)
New Revision: 7085

Modified:
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/control
   trunk/packages/kdenetwork/debian/rules
Log:
fix building on all archs.
Remove xmms


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2007-08-13 08:25:38 UTC (rev 7084)
+++ trunk/packages/kdenetwork/debian/changelog	2007-08-13 09:17:49 UTC (rev 7085)
@@ -1,3 +1,14 @@
+kdenetwork (4:3.5.7-4) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * We actually need to set DEB_HOST_ARCH_OS and DEB_HOST_ARCH before using
+    them. Make packages built correctly on archs where sudo is used instead of
+    fakeroot.
+  * Remove traces of xmms - it seems to be slowly removed in debian.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 13 Aug 2007 11:14:03 +0200
+
 kdenetwork (4:3.5.7-3) unstable; urgency=low
 
   +++ Changes by Sarah Hobbs:

Modified: trunk/packages/kdenetwork/debian/control
===================================================================
--- trunk/packages/kdenetwork/debian/control	2007-08-13 08:25:38 UTC (rev 7084)
+++ trunk/packages/kdenetwork/debian/control	2007-08-13 09:17:49 UTC (rev 7085)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Adeodato Simó <dato at net.com.org.es>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Modestas Vainius <geromanas at mailas.com>, Sarah Hobbs <hobbsee at ubuntu.com>, Sune Vuorela <debian at pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.7), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], xmms-dev, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.7), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: kdenetwork
@@ -140,7 +140,7 @@
  .
  Kopete includes the "Now Listening" plug-in that can report what music you
  are currently listening to, in a number of different players, including
- xmms, noatun, kscd, juk, kaffeine and amarok.
+ noatun, kscd, juk, kaffeine and amarok.
  .
  Support for more IM protocols can be added through a plugin system.
  .

Modified: trunk/packages/kdenetwork/debian/rules
===================================================================
--- trunk/packages/kdenetwork/debian/rules	2007-08-13 08:25:38 UTC (rev 7084)
+++ trunk/packages/kdenetwork/debian/rules	2007-08-13 09:17:49 UTC (rev 7085)
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 ifeq ($(DEB_HOST_ARCH),s390)
 DONT_BUILD+= kwifimanager
 endif