--- gnome-netstatus-2.12.1.orig/debian/rules +++ gnome-netstatus-2.12.1/debian/rules @@ -0,0 +1,25 @@ +#!/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 + +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 --- gnome-netstatus-2.12.1.orig/debian/changelog +++ gnome-netstatus-2.12.1/debian/changelog @@ -0,0 +1,206 @@ +gnome-netstatus (2.12.1-0ubuntu3) feisty; urgency=low + + * Change from Debian + debian/patches/interface_selection.patch: "patch from upstream bugzilla + to fix the a bug in the interface selection interface (closes: #347340)." + (Ubuntu: #21234) + + -- Sebastien Bacher Tue, 3 Apr 2007 19:21:11 +0200 + +gnome-netstatus (2.12.1-0ubuntu2) feisty; urgency=low + + * debian/patches/03-use_aspect_correct_icon_scaling.patch : + - Fix the icone scale issue. Was dropped in the last update. + - Put it in a patch to avoid dropping it again. + + -- Florent Mertens Tue, 13 Feb 2007 22:41:13 +0100 + +gnome-netstatus (2.12.1-0ubuntu1) feisty; urgency=low + + * New upstream release: + - Fixes: Warning fixes, + - Doc Translators: bg, es, fr, nl pa, ru, sv. + - Translators: ar, bn_IN, bn, de, dz, es, , fi, fr, gl, he, hu, it, , ka, + lt, lv, mg, ml, mn, mr, ne, nn, or, pa, pl, pt_BR, ru, sl, sr, sv, th, + zh_CN, zh_HK. + + -- Daniel Holbach Tue, 13 Feb 2007 12:24:51 +0100 + +gnome-netstatus (2.12.0-5ubuntu8) feisty; urgency=low + + * Upload of the edgy-proposed version to feisty + + -- Sebastien Bacher Wed, 20 Dec 2006 11:27:48 +0100 + +gnome-netstatus (2.12.0-5ubuntu7~prop1) edgy-proposed; urgency=low + + * Add debian/patches/01_network-admin_sudo.patch: + - Call network-admin through gksu. + - This is necessary due to fixing system-tools-backends to only allow + access to root (bug LP#59946). + + -- Martin Pitt Tue, 5 Dec 2006 17:08:00 +0000 + +gnome-netstatus (2.12.0-5ubuntu6) edgy; urgency=low + + * debian/patches/01_use-gksu.patch: + - no need to run network-admin with sudo on edgy, + issue pointed by "mrwho" on GNOME #354536 + + -- Sebastien Bacher Wed, 11 Oct 2006 16:13:16 +0200 + +gnome-netstatus (2.12.0-5ubuntu5) edgy; urgency=low + + * Use aspect correct icon scaling (Closes: Malone: 57626) + Thanks to Frank Schoep + + -- Paul Sladen Thu, 05 Oct 2006 10:54:17 +0100 + +gnome-netstatus (2.12.0-5ubuntu4) dapper; urgency=low + + * No changes upload to use dh_iconcache. + + -- Daniel Holbach Fri, 28 Apr 2006 16:32:25 +0200 + +gnome-netstatus (2.12.0-5ubuntu3) dapper; urgency=low + + * debian/rules: Add -Wl,--as-needed to CFLAGS to get rid of useless + dependencies (amongst them libgnutls11). + + -- Martin Pitt Thu, 2 Mar 2006 15:54:12 +0100 + +gnome-netstatus (2.12.0-5ubuntu2) dapper; urgency=low + + * Rebuild to get gettext translation domain into .server file. + + -- Martin Pitt Thu, 23 Feb 2006 13:14:47 +0100 + +gnome-netstatus (2.12.0-5ubuntu1) dapper; urgency=low + + * Sync with Debian + * debian/patches/01_use-gksu.patch: + - use gksudo instead of gksu + + -- Sebastien Bacher Sat, 14 Jan 2006 17:22:42 +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/control +++ gnome-netstatus-2.12.1/debian/control @@ -0,0 +1,16 @@ +Source: gnome-netstatus +Section: gnome +Priority: optional +Maintainer: Jerry Haltom +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons +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 +Standards-Version: 3.6.2 + +Package: gnome-netstatus-applet +Architecture: any +Depends: ${shlibs:Depends}, ${misc: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/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/watch +++ gnome-netstatus-2.12.1/debian/watch @@ -0,0 +1,4 @@ +version=2 +ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.12/ \ + gnome-netstatus-(.*)\.tar\.gz \ + debian uupdate --- 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.in +++ gnome-netstatus-2.12.1/debian/control.in @@ -0,0 +1,16 @@ +Source: gnome-netstatus +Section: gnome +Priority: optional +Maintainer: Jerry Haltom +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 +Standards-Version: 3.6.2 + +Package: gnome-netstatus-applet +Architecture: any +Depends: ${shlibs:Depends}, ${misc: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/patches/interface_selection.patch +++ gnome-netstatus-2.12.1/debian/patches/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/01_network-admin_sudo.patch +++ gnome-netstatus-2.12.1/debian/patches/01_network-admin_sudo.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-netstatus-2.12.0/src/netstatus-dialog.c gnome-netstatus-2.12.0.new/src/netstatus-dialog.c +--- gnome-netstatus-2.12.0/src/netstatus-dialog.c 2004-07-05 17:04:56.000000000 +0000 ++++ gnome-netstatus-2.12.0.new/src/netstatus-dialog.c 2006-12-05 17:07:46.000000000 +0000 +@@ -38,7 +38,7 @@ + #define NETWORK_CONFIG_TOOL_KEY NETWORK_CONFIG_TOOL_DIR "/config_tool" + + static const char *network_config_tools[] = { +- "network-admin --configure %i", ++ "gksu -- network-admin --configure %i", + "redhat-config-network", + "system-control-network" + }; --- 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);