rev 6705 - in trunk/packages/kdenetwork/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-07-07 00:27:49 +0000 (Sat, 07 Jul 2007)
New Revision: 6705

Added:
   trunk/packages/kdenetwork/debian/patches/15_kfreebsd_build.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/control
   trunk/packages/kdenetwork/debian/control.in
   trunk/packages/kdenetwork/debian/rules
Log:
fix build on more or less weird archs


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2007-07-06 23:28:14 UTC (rev 6704)
+++ trunk/packages/kdenetwork/debian/changelog	2007-07-07 00:27:49 UTC (rev 6705)
@@ -8,8 +8,11 @@
   * Pull patch from upstream to fix webcam issues (Closes: #414424)
   * Remove libnss-mdns from kdnssd-depends. (Closes: 412084)
   * Increase maximum count of lines in ksirc (Closes: 291968)
+  * Don't build kwifimanager on s390 - they don't have hardware.
+  * Don't build kwifimanager and kdnssd on !linux archs - doesn't built here.
+  * Patch to fix builds on kfreebsd archs. (Closes: 398909)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Jul 2007 23:13:17 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Jul 2007 02:10:57 +0200
 
 kdenetwork (4:3.5.7-1) unstable; urgency=low
 

Modified: trunk/packages/kdenetwork/debian/control
===================================================================
--- trunk/packages/kdenetwork/debian/control	2007-07-06 23:28:14 UTC (rev 6704)
+++ trunk/packages/kdenetwork/debian/control	2007-07-07 00:27:49 UTC (rev 6705)
@@ -3,13 +3,13 @@
 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>, Modestas Vainius <geromanas at mailas.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), 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], xmms-dev, libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: kdenetwork
 Section: kde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
 Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: kdenetwork-doc-html (>= ${Source-Version})
 Description: network-related apps from the official KDE release

Modified: trunk/packages/kdenetwork/debian/control.in
===================================================================
--- trunk/packages/kdenetwork/debian/control.in	2007-07-06 23:28:14 UTC (rev 6704)
+++ trunk/packages/kdenetwork/debian/control.in	2007-07-07 00:27:49 UTC (rev 6705)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-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), 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], xmms-dev, libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: kdenetwork
 Section: kde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
 Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: kdenetwork-doc-html (>= ${Source-Version})
 Description: network-related apps from the official KDE release

Added: trunk/packages/kdenetwork/debian/patches/15_kfreebsd_build.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/15_kfreebsd_build.diff	                        (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/15_kfreebsd_build.diff	2007-07-07 00:27:49 UTC (rev 6705)
@@ -0,0 +1,12 @@
+--- kde.orig/krfb/libvncserver/rfb.h
++++ kde.patched/krfb/libvncserver/rfb.h
+@@ -60,7 +60,7 @@
+ 
+ #include "rfbproto.h"
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GLIBC__)
+ #include <endian.h>
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+ #include <sys/types.h>
+

Modified: trunk/packages/kdenetwork/debian/rules
===================================================================
--- trunk/packages/kdenetwork/debian/rules	2007-07-06 23:28:14 UTC (rev 6704)
+++ trunk/packages/kdenetwork/debian/rules	2007-07-07 00:27:49 UTC (rev 6705)
@@ -1,10 +1,19 @@
 #!/usr/bin/make -f
 
+ifeq ($(DEB_HOST_ARCH),s390)
+DH_OPTIONS+= -Nkwifimanager
+endif
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+DH_OPTIONS+= -Nkwifimanager -Nkdnssd
+endif
+export DH_OPTIONS
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+
 DEB_CONFIGURE_EXTRA_FLAGS := --with-external-libgadu
 
 DEB_DH_STRIP_ARGS  := --dbg-package=kdenetwork-dbg