diff -u netapplet-1.0.8/debian/changelog netapplet-1.0.8/debian/changelog --- netapplet-1.0.8/debian/changelog +++ netapplet-1.0.8/debian/changelog @@ -1,3 +1,13 @@ +netapplet (1.0.8-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Rebuild for libiw28 to libiw29 transition. + - debian/rules: + + Added dh_iconcache + - Changed Maintainer field as per spec + + -- Nicolas Valcárcel Fri, 11 Jul 2008 00:02:31 -0500 + netapplet (1.0.8-2) unstable; urgency=low * Added LSB formatted dependency on init script (Closes: #460911) @@ -6,6 +16,65 @@ -- Rudy Godoy Sun, 24 Feb 2008 12:42:52 -0500 +netapplet (1.0.8-1ubuntu3) gutsy; urgency=low + + * Rebuild for libiw28 to libiw29 transition. + * Munge Maintainer field as per spec. + + -- Steve Kowalik Tue, 19 Jun 2007 23:50:27 +1000 + +netapplet (1.0.8-1ubuntu2) dapper; urgency=low + + * debian/rules: + -> Added dh_iconcache + + -- Jeremie Corbier Wed, 10 May 2006 10:24:39 +0200 + +netapplet (1.0.8-1ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Stephan Hermann Wed, 28 Dec 2005 19:08:55 +0100 + +netapplet (1.0.8-1) unstable; urgency=low + + * New upstream release + * Fix references to iw_pr_ether (closes: #327075) + * Rebuilt with latest libiw (closes: #316212) + * Fix .desktop file (closes: #301693) + + -- Matthew Garrett Mon, 12 Dec 2005 18:56:53 +0000 + +netapplet (1.0.0-1ubuntu4) breezy; urgency=low + + * debian/netapplet.init: + - Fix typo that crashed the whole thing! + + -- Christian Bjälevik Mon, 5 Sep 2005 15:24:59 +0200 + +netapplet (1.0.0-1ubuntu3) breezy; urgency=low + + * debian/netapplet.init: + - Use LSB init-functions. + * debian/control: + - Bumped Standards-Version to 3.6.2. + + -- Christian Bjälevik Mon, 5 Sep 2005 14:00:56 +0200 + +netapplet (1.0.0-1ubuntu2) breezy; urgency=low + + * Rebuild with the new cairo version + + -- Sebastien Bacher Thu, 18 Aug 2005 17:22:22 +0000 + +netapplet (1.0.0-1ubuntu1) breezy; urgency=low + + * MoM Merge, syncing with actual Debian Upstream + * debian/rules: added -D_GNU_SOURCE to CFLAGS because of struct ifreq + * added a patch for new libiw + + -- Stephan Hermann Thu, 21 Jul 2005 16:17:22 +0200 + netapplet (1.0.8-1) unstable; urgency=low * New upstream release @@ -32,7 +101,7 @@ * Set the patch when spawning network-admin (Closes: #278655) -- Matthew Garrett Wed, 10 Nov 2004 15:10:50 +0100 - + netapplet (0.98.0-3) unstable; urgency=low * Update README.Debian to cover the creates option. Thanks to Thomas @@ -42,7 +111,7 @@ option to a logical interface name stanza, not a stanza of its own. -- Matthew Garrett Fri, 24 Sep 2004 15:56:25 +0100 - + netapplet (0.98.0-2) unstable; urgency=low * Change the long description to better reflect the purpose of netapplet @@ -55,7 +124,7 @@ process creates them. VPN setups are the obvious example for this. -- Matthew Garrett Tue, 23 Sep 2004 14:59:43 +0100 - + netapplet (0.98.0-1.1) unstable; urgency=low * Try to fix crashes on unknown devices diff -u netapplet-1.0.8/debian/control netapplet-1.0.8/debian/control --- netapplet-1.0.8/debian/control +++ netapplet-1.0.8/debian/control @@ -1,7 +1,8 @@ Source: netapplet Section: gnome Priority: optional -Maintainer: Rudy Godoy +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Rudy Godoy Build-Depends: debhelper (>= 4.0.0), intltool, libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgnome-keyring-dev, libiw-dev Standards-Version: 3.6.2 diff -u netapplet-1.0.8/debian/rules netapplet-1.0.8/debian/rules --- netapplet-1.0.8/debian/rules +++ netapplet-1.0.8/debian/rules @@ -13,7 +13,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g +CFLAGS = -Wall -g -D_GNU_SOURCE ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -80,6 +80,7 @@ dh_installexamples # dh_install # dh_installmenu +# dh_iconcache # dh_installdebconf # dh_installlogrotate # dh_installemacsen only in patch2: unchanged: --- netapplet-1.0.8.orig/debian/patches/01_newlibiw.patch +++ netapplet-1.0.8/debian/patches/01_newlibiw.patch @@ -0,0 +1,51 @@ +diff -ur netapplet-1.0.0/src/netapplet.c netapplet-1.0.0.patch/src/netapplet.c +--- netapplet-1.0.0/src/netapplet.c 2004-10-18 21:37:12.000000000 +0200 ++++ netapplet-1.0.0.patch/src/netapplet.c 2005-07-21 16:58:03.325746696 +0200 +@@ -5,7 +5,7 @@ + * + * Licensed under the GNU GPL v2. See COPYING + */ +- ++#define _GNU_SOURCE + #include + + #include +diff -ur netapplet-1.0.0/src/netdaemon.c netapplet-1.0.0.patch/src/netdaemon.c +--- netapplet-1.0.0/src/netdaemon.c 2004-09-20 22:49:06.000000000 +0200 ++++ netapplet-1.0.0.patch/src/netdaemon.c 2005-07-21 17:40:15.113856400 +0200 +@@ -5,7 +5,7 @@ + * + * Licensed under the GNU GPL v2. See COPYING. + */ +- ++#define _GNU_SOURCE + #include + + #include +@@ -19,7 +19,7 @@ + #include + #include + #include +- ++#include + #include + #include + +@@ -604,7 +604,7 @@ + char ap_addr[128]; + + memset (ap_addr, 0, 128); +- iw_pr_ether (ap_addr, wrq.u.ap_addr.sa_data); ++ iw_ether_ntop ( (const struct ether_addr *) wrq.u.ap_addr.sa_data, ap_addr); + + if (!is_valid_ap_address (ap_addr)) { + error = TRUE; +@@ -847,7 +847,7 @@ + char ap_addr[128]; + + memset (ap_addr, 0, 128); +- iw_pr_ether (ap_addr, wrq.u.ap_addr.sa_data); ++ iw_ether_ntop ( (const struct ether_addr *) wrq.u.ap_addr.sa_data, ap_addr); + + if (!is_valid_ap_address (ap_addr)) { + /* This is kind of ugly... */