--- gnome-netstatus-2.12.1.orig/debian/patches/03_interface_selection.patch
+++ gnome-netstatus-2.12.1/debian/patches/03_interface_selection.patch
@@ -0,0 +1,11 @@
+--- src/netstatus-iface.c.orig 2005-06-12 16:51:52.000000000 -0400
++++ src/netstatus-iface.c 2005-06-12 16:52:25.000000000 -0400
+@@ -1218,7 +1218,7 @@
+ struct ifreq *if_req = (struct ifreq *) p;
+ gboolean loopback = FALSE;
+
+- p += sizeof (if_req->ifr_name) + NETSTATUS_SA_LEN (&if_req->ifr_addr);
++ p += sizeof (struct ifreq);
+
+ if (ioctl (fd, SIOCGIFFLAGS, if_req) < 0)
+ {
--- gnome-netstatus-2.12.1.orig/debian/patches/02_applet_category.patch
+++ gnome-netstatus-2.12.1/debian/patches/02_applet_category.patch
@@ -0,0 +1,11 @@
+diff -Nur gnome-netstatus-2.11.92.orig/src/GNOME_NetstatusApplet_Factory.server.in.in gnome-netstatus-2.11.92/src/GNOME_NetstatusApplet_Factory.server.in.in
+--- gnome-netstatus-2.11.92.orig/src/GNOME_NetstatusApplet_Factory.server.in.in 2004-09-21 17:35:13.000000000 +0200
++++ gnome-netstatus-2.11.92/src/GNOME_NetstatusApplet_Factory.server.in.in 2005-08-27 00:04:08.000000000 +0200
+@@ -24,6 +24,7 @@
+
+
+
++
+
+
+
--- gnome-netstatus-2.12.1.orig/debian/patches/03-use_aspect_correct_icon_scaling.patch
+++ gnome-netstatus-2.12.1/debian/patches/03-use_aspect_correct_icon_scaling.patch
@@ -0,0 +1,12 @@
+diff -Nur gnome-netstatus-2.12.1/src/netstatus-icon.c gnome-netstatus-2.12.1.new/src/netstatus-icon.c
+--- gnome-netstatus-2.12.1/src/netstatus-icon.c 2007-02-13 10:39:19.000000000 +0100
++++ gnome-netstatus-2.12.1.new/src/netstatus-icon.c 2007-02-13 22:36:10.000000000 +0100
+@@ -575,7 +575,7 @@
+ icon->priv->scaled_signal_icons [i] = scale_pixbuf (icon->priv->rotated_signal_icons [i],
+ icon->priv->orientation,
+ size,
+- FALSE);
++ TRUE);
+ }
+
+ netstatus_icon_update_image (icon);
--- gnome-netstatus-2.12.1.orig/debian/patches/04_update-statistics.patch
+++ gnome-netstatus-2.12.1/debian/patches/04_update-statistics.patch
@@ -0,0 +1,13 @@
+--- gnome-netstatus-2.12.1.orig/src/netstatus-iface.c 2007-02-13 17:39:19.000000000 +0800
++++ gnome-netstatus-2.12.1/src/netstatus-iface.c 2007-08-05 22:52:54.000000000 +0800
+@@ -524,8 +524,8 @@
+ in_bytes, out_bytes,
+ iface->priv->stats.in_bytes, iface->priv->stats.out_bytes);
+
+- rx = in_packets > iface->priv->stats.in_packets;
+- tx = out_packets > iface->priv->stats.out_packets;
++ rx = in_bytes > iface->priv->stats.in_bytes;
++ tx = out_bytes > iface->priv->stats.out_bytes;
+
+ if (!tx && !rx)
+ state = NETSTATUS_STATE_IDLE;
--- gnome-netstatus-2.12.1.orig/debian/watch
+++ gnome-netstatus-2.12.1/debian/watch
@@ -0,0 +1,4 @@
+version=3
+http://download.gnome.org//sources/gnome-netstatus/([\d\.]+)[24680]/ \
+ gnome-netstatus-([\d\.]+)\.tar\.gz \
+ debian uupdate
--- gnome-netstatus-2.12.1.orig/debian/copyright
+++ gnome-netstatus-2.12.1/debian/copyright
@@ -0,0 +1,23 @@
+This package was debianized by James Curbo on
+Sun, 28 Mar 2004 03:20:39 -0600.
+
+It was downloaded from .
+
+Upstream Authors:
+
+Mark McLoughlin
+Erwann Chenede
+Calum Benson
+
+Copyright:
+
+Copyright (C) 2003 Sun Microsystems, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+A copy of the GPL is available on all Debian systems at
+/usr/share/common-licenses/GPL
+
--- gnome-netstatus-2.12.1.orig/debian/changelog
+++ gnome-netstatus-2.12.1/debian/changelog
@@ -0,0 +1,188 @@
+gnome-netstatus (2.12.1-2ubuntu2) intrepid; urgency=low
+
+ Drop all gksu network-admin patches, it uses policykit:
+ - debian/patches/01_network-admin_sudo.patch:
+ (thanks to seb128)
+
+ -- Mirco Müller (MacSlow) Mon, 23 Jun 2008 18:34:19 +0200
+
+gnome-netstatus (2.12.1-2ubuntu1) intrepid; urgency=low
+
+ * Merge with Debian:
+ - debian/patches/01_use-gksu.patch: Dropped.
+ + debian/patches/01_network-admin_sudo.patch:
+ Use gksu for network-admin.
+ + debian/patches/03-use_aspect_correct_icon_scaling.patch:
+ Use aspect correct icon scaling.
+ + debian/rules:Add -Wl,--as-needed to CFLAGS to get rid of
+ useless dependencies (amongst them libgnutls11).
+
+ -- Mirco Müller (MacSlow) Mon, 23 Jun 2008 15:24:30 +0200
+
+gnome-netstatus (2.12.1-2) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Correctly number interface_selection.patch.
+ * 04_update-statistics.patch: patch from "manphiz" to update
+ statistics after reconnection. Closes: #436125.
+
+ [ Deng Xiyue ]
+ * Update standard-version to 3.7.3.
+ * Wrap some control fields
+ * Copy Uploaders to control.in in case clean rule overwrites them.
+ * Update watch file syntax to match other GNOME packages.
+ * Use chrpath hack as workaround for amd64 rpath issue, and add chrpath
+ to build-depends.
+
+ [ Loic Minier ]
+ * Use @GNOME_TEAM@ in control.
+
+ -- Deng Xiyue Thu, 28 Feb 2008 23:59:58 +0800
+
+gnome-netstatus (2.12.1-1ubuntu1) gutsy; urgency=low
+
+ * Merge with Debian:
+ - debian/patches/01_use-gksu.patch: Dropped.
+ + debian/patches/01_network-admin_sudo.patch:
+ Use gksu for network-admin.
+ + debian/patches/03-use_aspect_correct_icon_scaling.patch:
+ Use aspect correct icon scaling.
+ + debian/rules:Add -Wl,--as-needed to CFLAGS to get rid of
+ useless dependencies (amongst them libgnutls11).
+
+ -- Christian Bjälevik Fri, 27 Apr 2007 18:28:12 +0200
+
+gnome-netstatus (2.12.1-1) unstable; urgency=high
+
+ [ Josselin Mouette ]
+ * interface_selection.patch: patch from upstream bugzilla to fix the
+ a bug in the interface selection interface (closes: #347340).
+
+ [ Loic Minier ]
+ * Add a get-orig-source target to retrieve the upstream tarball.
+ * New upstream stable release; fixes compiler warnings, translation updates.
+
+ -- Loic Minier Sun, 11 Mar 2007 17:08:20 +0100
+
+gnome-netstatus (2.12.0-5) unstable; urgency=low
+
+ * Rebuild for unstable.
+
+ -- Loic Minier Thu, 12 Jan 2006 10:50:18 +0100
+
+gnome-netstatus (2.12.0-3) experimental; urgency=high
+
+ * Don't overwrite DEB_CONFIGURE_EXTRA_FLAGS. [debian/rules]
+ * Really build-depend on gnome-doc-utils, doh! (Closes: #336442)
+ [debian/control, debian/control.in]
+
+ -- Loic Minier Sun, 30 Oct 2005 12:30:05 +0100
+
+gnome-netstatus (2.12.0-2) experimental; urgency=low
+
+ * Build-depend on gnome-doc-utils. [debian/control, debian/control.in]
+
+ -- Loic Minier Sat, 29 Oct 2005 12:17:20 +0200
+
+gnome-netstatus (2.12.0-1) experimental; urgency=low
+
+ * New upstream releases.
+ - Update watch file. [debian/watch]
+ - Drop obsolete relibtoolizing patch.
+ [debian/patches/00_relibtoolize.patch]
+ - Don't run scrollkeeper. [debian/rules]
+ * New patch from Ubuntu to set the "panel:category" in the bonobo server
+ file. [debian/patches/02_applet_category.patch]
+ * Mention applet name in description. (Closes: #283775)
+ [debian/control.in, debian/control]
+ * Bump up Standards-Version to 3.6.2. [debian/control.in, debian/control]
+ * Add CDBS' utils. [debian/rules]
+
+ -- Loic Minier Fri, 28 Oct 2005 22:07:07 +0200
+
+gnome-netstatus (2.10.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Jordi Mallach Mon, 13 Jun 2005 10:20:56 +0200
+
+gnome-netstatus (2.10.0-1) experimental; urgency=low
+
+ * GNOME team upload.
+ * New upstream release.
+ * debian/control.in:
+ - don't build-depend on libtool.
+ - add dependency on gksu.
+ * debian/rules: don't install the scrollkeeper files.
+ * debian/watch: updated.
+ * debian/patches/01_use_gksu.patch: modified version of the Ubuntu patch
+ to call network-admin as root.
+ * debian/patches/00_relibtoolize.patch: add again, using rules for this
+ is not so nice.
+
+ -- Jordi Mallach Mon, 9 May 2005 14:32:28 +0200
+
+gnome-netstatus (2.8.0-3) unstable; urgency=low
+
+ * GNOME team upload.
+ * Upload to unstable.
+
+ -- Jordi Mallach Mon, 22 Nov 2004 19:26:35 +0100
+
+gnome-netstatus (2.8.0-2) experimental; urgency=low
+
+ * [debian/patches/00_relibtoolize.patch] Removed (integrated into
+ debian/rules).
+
+ -- Jerry Haltom Sat, 9 Oct 2004 23:34:44 -0500
+
+gnome-netstatus (2.8.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * We still need the relibtoolize patch.
+
+ -- Marc 'HE' Brockschmidt Fri, 17 Sep 2004 22:28:32 +0200
+
+gnome-netstatus (2.7.90-1) experimental; urgency=low
+
+ * New upstream release.
+ * Acknowledge a number of previous NMUs. Thanks folks!
+ * Removed relibtoolize patch. Upstream has done it.
+
+ -- Jerry Haltom Sun, 8 Aug 2004 14:25:32 -0500
+
+gnome-netstatus (2.7.1-1) experimental; urgency=low
+
+ * GNOME Team upload.
+ * New (development) upstream release.
+ * debian/patches/01relibtoolize.patch:
+ - updated
+
+ -- Sebastien Bacher Thu, 1 Jul 2004 15:37:51 +0200
+
+gnome-netstatus (2.6.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Marc 'HE' Brockschmidt Fri, 18 Jun 2004 01:15:17 +0200
+
+gnome-netstatus (2.6.1-2) experimental; urgency=low
+
+ * GNOME team upload.
+ * debian/{control.in,changelog}: merge wasabi changes in.
+ * patches/01relibtoolize.patch: update to 2.6.1 version
+
+ -- Ondřej Surý Wed, 21 Apr 2004 10:49:28 +0200
+
+gnome-netstatus (2.6.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Ondřej Surý Tue, 20 Apr 2004 18:12:41 +0200
+
+gnome-netstatus (2.6.0-1) UNRELEASED; urgency=low
+
+ * Initial release.
+
+ -- Jerry Haltom Tue, 20 Apr 2004 23:33:51 -0500
+
--- gnome-netstatus-2.12.1.orig/debian/docs
+++ gnome-netstatus-2.12.1/debian/docs
@@ -0,0 +1,3 @@
+README
+TODO
+NEWS
--- gnome-netstatus-2.12.1.orig/debian/control
+++ gnome-netstatus-2.12.1/debian/control
@@ -0,0 +1,29 @@
+Source: gnome-netstatus
+Section: gnome
+Priority: optional
+XSBC-Original-Maintainer: Jerry Haltom
+Maintainer: Ubuntu Desktop Team
+Uploaders: Debian GNOME Maintainers , Jordi Mallach , Loic Minier
+Build-Depends: debhelper (>= 4.1.0),
+ libgnomeui-dev (>= 2.6.0),
+ libglade2-dev (>= 2.0.0),
+ libpanel-applet2-dev (>= 2.0.0),
+ libgtk2.0-dev (>= 2.4.0),
+ cdbs, gnome-pkg-tools,
+ libxml-parser-perl,
+ libgnome-keyring-dev,
+ scrollkeeper,
+ gnome-doc-utils,
+ chrpath
+Standards-Version: 3.7.3
+
+Package: gnome-netstatus-applet
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ gksu
+Description: Network status applet for GNOME 2
+ GNOME panel applet that monitors network interfaces. Network Monitor
+ provides indicators for ingoing and outgoing data, packets received
+ and transmitted, and information about the network interface itself
+ such as IP information and Ethernet address.
--- gnome-netstatus-2.12.1.orig/debian/compat
+++ gnome-netstatus-2.12.1/debian/compat
@@ -0,0 +1 @@
+4
--- gnome-netstatus-2.12.1.orig/debian/control.in
+++ gnome-netstatus-2.12.1/debian/control.in
@@ -0,0 +1,29 @@
+Source: gnome-netstatus
+Section: gnome
+Priority: optional
+XSBC-Original-Maintainer: Jerry Haltom
+Maintainer: Ubuntu Desktop Team
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 4.1.0),
+ libgnomeui-dev (>= 2.6.0),
+ libglade2-dev (>= 2.0.0),
+ libpanel-applet2-dev (>= 2.0.0),
+ libgtk2.0-dev (>= 2.4.0),
+ cdbs, gnome-pkg-tools,
+ libxml-parser-perl,
+ libgnome-keyring-dev,
+ scrollkeeper,
+ gnome-doc-utils,
+ chrpath
+Standards-Version: 3.7.3
+
+Package: gnome-netstatus-applet
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ gksu
+Description: Network status applet for GNOME 2
+ GNOME panel applet that monitors network interfaces. Network Monitor
+ provides indicators for ingoing and outgoing data, packets received
+ and transmitted, and information about the network interface itself
+ such as IP information and Ethernet address.
--- gnome-netstatus-2.12.1.orig/debian/rules
+++ gnome-netstatus-2.12.1/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DH_ALWAYS_EXCLUDE := CVS:.svn
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+CFLAGS+=-Wl,--as-needed
+
+clean::
+ rm -f src/netstatus.schemas src/GNOME_NetstatusApplet_Factory.server.in src/GNOME_NetstatusApplet_Factory.server
+
+binary-post-install/gnome-netstatus-applet::
+ rm -rf debian/gnome-netstatus-applet/var
+
+install/gnome-netstatus-applet::
+ chmod -x $(DEB_DESTDIR)/usr/share/gnome/help/gnome-netstatus/C/*.xml
+ chrpath -d $(DEB_DESTDIR)/usr/lib/gnome-netstatus/* # chrpath hack to get rid of amd64 rpath