[Pkg-kde-commits] rev 1239 - in trunk/packages/kdenetwork/debian: . patches

Adeodato Simó adeodato@costa.debian.org
Fri, 01 Jul 2005 19:35:58 +0000


Author: adeodato
Date: 2005-07-01 19:35:57 +0000 (Fri, 01 Jul 2005)
New Revision: 1239

Added:
   trunk/packages/kdenetwork/debian/patches/14_fix_compilation_with_libiw28.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/control
Log:
More kdenetwork 3.3.2-6. From debian/changelog:

    Also, libiw28 renames iw_pr_ether() to iw_saether_ntop(), so added a patch
    from upstream SVN to cope with the change. Bump build-dependency on libiw-dev
    to (>> 27+28pre8), more for documentation purposes than for real need.



Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2005-07-01 18:41:04 UTC (rev 1238)
+++ trunk/packages/kdenetwork/debian/changelog	2005-07-01 19:35:57 UTC (rev 1239)
@@ -3,7 +3,8 @@
   +++ Changes by Adeodato Simó:
 
   * Do not depend on the disappeared libjack0.80.0-0. Achieve so by updating
-    the libtool used to build, so that it prunes unnecessary dependencies.
+    the libtool used to build, so that it prunes unnecessary dependencies. The
+    Depends lines are incredibly shorter now.
 
   * The above libtool update removes the kwifimanager dependency on libmad0,
     so closes: #311712 ("does not have a versioned dependency on libmad0").
@@ -12,8 +13,12 @@
     on the disappeared libiw27 will get updated to libiw28. Closes: #315892,
     thanks to Noèl Köthe for the heads-up.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 01 Jul 2005 20:32:30 +0200
+    Also, libiw28 renames iw_pr_ether() to iw_saether_ntop(), so added a patch
+    from upstream SVN to cope with the change. Bump build-dependency on libiw-dev
+    to (>> 27+28pre8), more for documentation purposes than for real need.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 01 Jul 2005 21:34:40 +0200
+
 kdenetwork (4:3.3.2-5) unstable; urgency=high
 
   * High-urgency upload for sarge targetted RC bugfix.

Modified: trunk/packages/kdenetwork/debian/control
===================================================================
--- trunk/packages/kdenetwork/debian/control	2005-07-01 18:41:04 UTC (rev 1238)
+++ trunk/packages/kdenetwork/debian/control	2005-07-01 19:35:57 UTC (rev 1239)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Christopher L Cheney <ccheney@debian.org>, Riku Voipio <riku.voipio@iki.fi>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>, Isaac Clerencia <isaac@debian.org>
-Build-Depends: debhelper (>> 4.2.0), docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libgadu-dev, libiw-dev, libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev
+Build-Depends: debhelper (>> 4.2.0), docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev
 Standards-Version: 3.6.1
 
 Package: kdenetwork

Added: trunk/packages/kdenetwork/debian/patches/14_fix_compilation_with_libiw28.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/14_fix_compilation_with_libiw28.diff	2005-07-01 18:41:04 UTC (rev 1238)
+++ trunk/packages/kdenetwork/debian/patches/14_fix_compilation_with_libiw28.diff	2005-07-01 19:35:57 UTC (rev 1239)
@@ -0,0 +1,11 @@
+--- kdenetwork/wifi/interface_wireless_wirelessextensions.cpp	2005/06/23 07:27:41	428114
++++ kdenetwork/wifi/interface_wireless_wirelessextensions.cpp	2005/06/23 11:00:42	428162
+@@ -423,7 +423,7 @@
+   essid = (WIFI_CONFIG(info,essid_on) ? WIFI_CONFIG(info,essid) : "any");
+   char
+     ap_addr[256];
+-  iw_pr_ether (ap_addr, (const unsigned char *) info.ap_addr.sa_data);
++  iw_ether_ntop ( (const ether_addr *) info.ap_addr.sa_data, ap_addr);
+   if (access_point_address != ap_addr)
+     emitStatusChanged = true;
+   access_point_address = ap_addr;