Bug#399059: Uninstallable on GNU/k*BSD

2006-11-17 Thread Konstantinos Koukopoulos
Package: kdebase
Version: 4:3.5.5a.dfsg.1-1
Severity: wishlist
Tags: patch

The latest kdebase package in unstable cannot be installed on GNU/kfreeBSD 
(and other non-linux debian systems) because it depends on the linux-only 
packages hal and pmount. I believe that kdebase should only recommend these 
packages, just as kdebase-kio-plugins does. Attached is a patch that corrects 
this.

Thanks,
Kostas Koukopoulos
--- kdebase-3.5.5/debian/control.orig	2006-11-17 16:32:49.0 +0200
+++ kdebase-3.5.5/debian/control	2006-11-17 16:33:10.0 +0200
@@ -11,8 +11,8 @@
 Package: kdebase
 Section: kde
 Architecture: all
-Depends: kappfinder (= ${Source-Version}), kate (= ${Source-Version}), kcontrol (= ${Source-Version}), kdebase-bin (= ${Source-Version}), kdebase-data (= ${Source-Version}), kdebase-kio-plugins (= ${Source-Version}), kdepasswd (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), ktip (= ${Source-Version}), kwin (= ${Source-Version}), libkonq4 (= ${Source-Version}), hal, pmount
-Recommends: kdm (= ${Source-Version})
+Depends: kappfinder (= ${Source-Version}), kate (= ${Source-Version}), kcontrol (= ${Source-Version}), kdebase-bin (= ${Source-Version}), kdebase-data (= ${Source-Version}), kdebase-kio-plugins (= ${Source-Version}), kdepasswd (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), ktip (= ${Source-Version}), kwin (= ${Source-Version}), libkonq4 (= ${Source-Version})
+Recommends: kdm (= ${Source-Version}), hal, pmount
 Suggests: kdebase-doc-html (= ${Source-Version})
 Description: base components from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical


Bug#398909: FTBFS on GNU/k*BSD

2006-11-16 Thread Konstantinos Koukopoulos
Package: kdenetwork
Version: 4:3.5.5-2
Severity: wishlist
Tags: patch kfreebsd

The attached patch fixes FTBFS on GNU/k*BSD.

Thank you,
Kostantinos Koukopoulos
diff -Naur kdenetwork-3.5.5.orig/debian/control kdenetwork-3.5.5/debian/control
--- kdenetwork-3.5.5.orig/debian/control2006-11-16 15:57:42.0 
+0200
+++ kdenetwork-3.5.5/debian/control 2006-11-16 16:33:54.0 +0200
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers debian-qt-kde@lists.debian.org
 Uploaders: Isaac Clerencia [EMAIL PROTECTED], Pierre Habouzit [EMAIL 
PROTECTED], Christopher Martin [EMAIL PROTECTED], Adeodato Simó [EMAIL 
PROTECTED], Riku Voipio [EMAIL PROTECTED], Luk Claes [EMAIL PROTECTED]
-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.5), 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.5), libgadu-dev, 
libgsmme-dev, libiw-dev ( 27+28pre8) [!hurd-i386 !kfreebsd-i386 
!kfreebsd-amd64], 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}) 
[i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x 
sh3 sh3eb sh4 sh4eb sparc], kget (= ${Source-Version}), knewsticker (= 
${Source-Version}), kopete (= ${Source-Version}), kpf (= ${Source-Version}), 
kppp (= ${Source-Version}) [i386 ia64 alpha amd64 arm hppa m32r m68k mips 
mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], krdc (= 
${Source-Version}), krfb (= ${Source-Version}), ksirc (= ${Source-Version}), 
kwifimanager (= ${Source-Version}) [i386 ia64 alpha amd64 arm hppa m32r m68k 
mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], 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
@@ -247,7 +247,7 @@
 
 Package: kwifimanager
 Section: net
-Architecture: any
+Architecture: i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc 
ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
 Depends: ${shlibs:Depends}, wireless-tools
 Suggests: khelpcenter
 Description: wireless lan manager for KDE
@@ -300,7 +300,7 @@
 
 Package: kdnssd
 Section: net
-Architecture: any
+Architecture: i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc 
ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
 Depends: ${shlibs:Depends}, libnss-mdns
 Recommends: avahi-daemon
 Suggests: avahi-autoipd | zeroconf
diff -Naur kdenetwork-3.5.5.orig/debian/patches/14_kfreebsd.diff 
kdenetwork-3.5.5/debian/patches/14_kfreebsd.diff
--- kdenetwork-3.5.5.orig/debian/patches/14_kfreebsd.diff   1970-01-01 
02:00:00.0 +0200
+++ kdenetwork-3.5.5/debian/patches/14_kfreebsd.diff2006-11-16 
16:08:56.0 +0200
@@ -0,0 +1,12 @@
+--- kde.orig/krfb/libvncserver/rfb.h   2005-05-23 14:07:26.0 +0200
 kde.patched/krfb/libvncserver/rfb.h2005-08-30 21:58:54.0 
+0200
+@@ -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
+