GNOME.org
 

[gnome-network] Ubuntu (new upstream) gnome-nettool 2.26.2-1ubuntu1

This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes.  It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
Format: 1.7
Date: Thu, 25 Jun 2009 11:33:48 +1000
Source: gnome-nettool
Binary: gnome-nettool
Architecture: source
Version: 2.26.2-1ubuntu1
Distribution: karmic
Urgency: low
Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
Changed-By: Robert Ancell <robert ancell canonical com>
Description: 
 gnome-nettool - network information tool for GNOME
Launchpad-Bugs-Fixed: 391897
Changes: 
 gnome-nettool (2.26.2-1ubuntu1) karmic; urgency=low
 .
   * Merge from Debian unstable (LP: #391897) remaining changes:
     - debian/control.in:
     - debian/control:
       - updated Maintainer field
       - added liblaunchpad-integration-dev to Build-Depends
       - depends on "iputils-tracepath" rather than "tcptraceroute | traceroute"
       - make the description mention tracepath rather than traceroute
     - debian/patches:
       - 01_use_tracepath.patch: updated.
       - 02_lpi.patch: updated.
       - 03_autoconf.patch: updated.
       - 04_menu_change.patch: updated.
       - 05_gksu_for_network_admin.patch: updated.
     - debian/watch: Watch for unstable versions
 .
 gnome-nettool (2.26.2-1) unstable; urgency=low
 .
   [ Luca Bruno ]
   * New upstream release.
   * debian/control.in:
     - Updated Standards-Version to 3.8.1, no additional changes needed.
     - Use the new projects.gnome.org in Homepage.
     - Add libgtop-dev Build-Depend.
   * debian/copyright:
     - Specify GPL version 2 of the license.
     - Add more upstream authors.
 .
   [ Josselin Mouette ]
   * New upstream release.
   * Require iputils-ping by default.
Files: 
 90aaa029339e111f81ad83dd4c8f1c11 1656 gnome optional gnome-nettool_2.26.2-1ubuntu1.dsc
 04fb7f441ec399370ec797da0b68f142 10169 gnome optional gnome-nettool_2.26.2-1ubuntu1.diff.gz
Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>

diff -pruN 2.26.2-1/debian/changelog 2.26.2-1ubuntu1/debian/changelog
--- 2.26.2-1/debian/changelog	2009-06-25 07:21:27.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/changelog	2009-06-25 07:19:35.000000000 +0100
@@ -1,3 +1,22 @@
+gnome-nettool (2.26.2-1ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable (LP: #391897) remaining changes:
+    - debian/control.in:
+    - debian/control:
+      - updated Maintainer field
+      - added liblaunchpad-integration-dev to Build-Depends
+      - depends on "iputils-tracepath" rather than "tcptraceroute | traceroute"
+      - make the description mention tracepath rather than traceroute
+    - debian/patches:
+      - 01_use_tracepath.patch: updated.
+      - 02_lpi.patch: updated.
+      - 03_autoconf.patch: updated.
+      - 04_menu_change.patch: updated.
+      - 05_gksu_for_network_admin.patch: updated.
+    - debian/watch: Watch for unstable versions
+
+ -- Robert Ancell <robert ancell canonical com>  Thu, 25 Jun 2009 11:33:48 +1000
+
 gnome-nettool (2.26.2-1) unstable; urgency=low
 
   [ Luca Bruno ]
@@ -16,6 +35,69 @@ gnome-nettool (2.26.2-1) unstable; urgen
 
  -- Josselin Mouette <joss debian org>  Wed, 24 Jun 2009 19:11:18 +0200
 
+gnome-nettool (2.26.2-0ubuntu1) karmic; urgency=low
+
+  * New upstream version (LP: #388238)
+    - #583286: Compilation fixes for DragonFly BSD (Thomas Klausner)
+  * debian/control.in:
+  * debian/control:
+    - Added VCS link
+  * debian/patches/03_autoconf.patch:
+    - Updated
+
+ -- Robert Ancell <robert ancell canonical com>  Wed, 17 Jun 2009 12:49:15 +1000
+
+gnome-nettool (2.26.1-0ubuntu2) karmic; urgency=low
+
+  * Drop unnecessary dependency on finger (LP: #354866).
+
+ -- Alessio Treglia <quadrispro ubuntu com>  Sat, 18 Apr 2009 03:23:36 +0200
+
+gnome-nettool (2.26.1-0ubuntu1) jaunty; urgency=low
+
+  * New upstream version (LP: #353491)
+     - Fix glibtop initialization order in order to
+       make it work on BSD (Joe Marcus Clarke)
+     - Removed warnings from the Glade UI (Diego Escalante)
+     - Remove deprecated gtk/gdk functions (Andre Klapper)
+     - Improved accesability (Germán Póo-Caamaño)
+     - Fixed support for unlimited pings (Germán Póo-Caamaño)
+     - Gnome Nettool now is 1024x600 friendly (Germán Póo-Caamaño)
+     - Added basic NetBSD support (Thomas Klausner)
+     - Added menu for the documentation (Germán Póo-Caamaño)
+     - Restored the behaviour of 'Edit/Copy' as default in
+       Gnome.  Added 'Copy as text report' to copy all the values
+       in a tab window (Germán Póo-Caamaño)
+     - Removed Linux-dependency on NIC Information through the
+       use of ligbtop instead of ioctl calls and reading from
+       /proc/net (Germán Póo-Caamaño)
+     - Updated About dialog (Alejandro Andrés)
+     - Use pinky instead of finger to reduce one dependency in
+       Linux systems (Germán Póo-Caamaño)
+     - Removed deprecated symbols from glib (Maxim Ermilov)
+     - Fixed unlocalized string in copyright (Claude Paroz)
+     - Fixed unlocalized string in port scan (Takao Fujiwara)
+     - Improved documentation metadata for library.gnome.org
+       (Germán Póo-Caamaño)
+     - Clean up Gtk+ includes (Maxim Ermilov)
+     - Updated translations
+  * debian/patches
+    - update 02_lpi.patch to apply cleanly
+
+ -- Andreas Moog <andreas moog warperbbs de>  Thu, 02 Apr 2009 01:52:30 +0200
+
+gnome-nettool (2.25.3-0ubuntu1) jaunty; urgency=low
+
+  * New upstream version (LP: #315566)
+  * debian/control.in:
+    - add libgtop2-dev in Build-Depends
+  * debian/patches/02_lpi.patch:
+    - updated
+  * debian/patches/03_autoconf.patch:
+    - updated
+
+ -- Baptiste Mille-Mathias <baptiste millemathias gmail com>  Thu, 08 Jan 2009 21:11:25 +0100
+
 gnome-nettool (2.22.1-1) unstable; urgency=low
 
   [ Loic Minier ]
@@ -30,6 +112,14 @@ gnome-nettool (2.22.1-1) unstable; urgen
 
  -- Josselin Mouette <joss debian org>  Sun, 04 Jan 2009 11:17:51 +0100
 
+gnome-nettool (2.22.1-0ubuntu1) intrepid; urgency=low
+
+  * New upstream version
+  * debian/patches/03_autoconf.patch:
+    - new version update
+
+ -- Sebastien Bacher <seb128 ubuntu com>  Wed, 24 Sep 2008 18:21:16 +0200
+
 gnome-nettool (2.22.0-1) unstable; urgency=low
 
   * New upstream stable release.
@@ -40,6 +130,32 @@ gnome-nettool (2.22.0-1) unstable; urgen
 
  -- Sebastian Dröge <slomo debian org>  Fri, 14 Mar 2008 12:46:50 +0100
 
+gnome-nettool (2.22.0-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    - #470264: Added icon for size 24x24 
+    - #451925: Replace SIOCGMIIPHY definitions by including linux/sockios.h
+    - #508610: Translated DNS lookup type 
+
+ -- Sebastien Bacher <seb128 canonical com>  Tue, 11 Mar 2008 12:33:15 +0100
+
+gnome-nettool (2.20.0-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #164345) remaining changes:
+    - debian/control, debian/control.in:
+      - updated Maintainer field
+      - added liblaunchpad-integration-dev to Build-Depends
+      - depends on "iputils-tracepath" rather than "tcptraceroute | traceroute"
+      - make the description mention tracepath rather than traceroute
+    - debian/patches:
+      - 01_use_tracepath.patch: updated.
+      - 02_lpi.patch: updated.
+      - 03_autoconf.patch: updated.
+      - 04_menu_change.patch: updated.
+      - 05_gksu_for_network_admin.patch: updated.
+  
+ -- Mario Bonino <mariobonino ubuntu-it org>  Wed, 21 Nov 2007 14:53:49 +0100
+
 gnome-nettool (2.20.0-1) unstable; urgency=low
 
   [ Loic Minier ]
diff -pruN 2.26.2-1/debian/control 2.26.2-1ubuntu1/debian/control
--- 2.26.2-1/debian/control	2009-06-25 07:21:27.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/control	2009-06-25 07:19:35.000000000 +0100
@@ -1,7 +1,8 @@
 Source: gnome-nettool
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 5),
@@ -12,8 +13,10 @@ Build-Depends: autotools-dev,
                libglade2-dev (>= 2.0.0),
                libgconf2-dev (>= 1.1.11),
                libgtop2-dev,
+               liblaunchpad-integration-dev,		
                gnome-doc-utils
-Uploaders: Josselin Mouette <joss debian org>, Loic Minier <lool dooz org>, Marc 'HE' Brockschmidt <he debian org>, Sebastian Dröge <slomo debian org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Josselin Mouette <joss debian org>, Sebastian Dröge <slomo debian org>
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-nettool/ubuntu
 Standards-Version: 3.8.2
 Homepage: http://projects.gnome.org/gnome-network/
 
@@ -25,7 +28,7 @@ Depends: ${shlibs:Depends},
          dnsutils,
          net-tools,
          iputils-ping | ping,
-         tcptraceroute | traceroute,
+         iputils-tracepath,
          whois
 Suggests: gnome-system-tools
 Conflicts: gnome-network (<= 1.99.5)
@@ -35,7 +38,7 @@ Description: network information tool fo
     * ifconfig
     * ping
     * netstat
-    * traceroute
+    * tracepath
     * port scanning
     * DNS lookup
     * finger
diff -pruN 2.26.2-1/debian/control.in 2.26.2-1ubuntu1/debian/control.in
--- 2.26.2-1/debian/control.in	2009-06-25 07:21:27.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/control.in	2009-06-25 07:19:35.000000000 +0100
@@ -1,7 +1,8 @@
 Source: gnome-nettool
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 5),
@@ -12,8 +13,10 @@ Build-Depends: autotools-dev,
                libglade2-dev (>= 2.0.0),
                libgconf2-dev (>= 1.1.11),
                libgtop2-dev,
+               liblaunchpad-integration-dev,		
                gnome-doc-utils
 Uploaders: @GNOME_TEAM@
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-nettool/ubuntu
 Standards-Version: 3.8.2
 Homepage: http://projects.gnome.org/gnome-network/
 
@@ -25,7 +28,7 @@ Depends: ${shlibs:Depends},
          dnsutils,
          net-tools,
          iputils-ping | ping,
-         tcptraceroute | traceroute,
+         iputils-tracepath,
          whois
 Suggests: gnome-system-tools
 Conflicts: gnome-network (<= 1.99.5)
@@ -35,7 +38,7 @@ Description: network information tool fo
     * ifconfig
     * ping
     * netstat
-    * traceroute
+    * tracepath
     * port scanning
     * DNS lookup
     * finger
diff -pruN 2.26.2-1/debian/patches/01_use_tracepath.patch 2.26.2-1ubuntu1/debian/patches/01_use_tracepath.patch
--- 2.26.2-1/debian/patches/01_use_tracepath.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/patches/01_use_tracepath.patch	2009-06-25 07:19:35.000000000 +0100
@@ -0,0 +1,102 @@
+diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.20.0/src/traceroute.c gnome-nettool-2.20.0.new/src/traceroute.c
+--- gnome-nettool-2.20.0/src/traceroute.c	2007-09-14 22:35:51.000000000 +0200
++++ gnome-nettool-2.20.0.new/src/traceroute.c	2007-11-21 15:10:11.000000000 +0100
+@@ -71,20 +71,16 @@
+ 	switch (netinfo_get_ip_version (netinfo))
+ 	{
+ 	case IPV4:
+-		program = util_find_program_in_path ("tcptraceroute", NULL);
++
+ #ifdef DEBUG
+-		g_print ("tcptraceroute: %s\n", program);
++		g_print ("tracepath: %s\n", program);
+ #endif /* DEBUG */
+-		if (program != NULL) {
+-			program_name = g_strdup ("tcptraceroute");
+-		} else {
+-			program = util_find_program_dialog ("traceroute", parent);
+-			program_name = g_strdup ("traceroute");
+-		}
++		program = util_find_program_dialog ("tracepath", parent);
++		program_name = g_strdup ("tracepath");
+ 		break;
+ 	case IPV6:
+-		program = util_find_program_in_path ("traceroute6", NULL);
+-		program_name = g_strdup ("traceroute6");
++		program = util_find_program_in_path ("tracepath6", NULL);
++		program_name = g_strdup ("tracepath6");
+ 		break;
+ 	default:
+ 		program = NULL;
+@@ -93,8 +89,7 @@
+ 
+ 	if (program != NULL) {
+ 		command =
+-                  g_strdup_printf ("%s %s %s %s", program, program_name,
+-                                   TCPTRACEROUTE_OPTIONS, host);
++                  g_strdup_printf ("%s %s %s", program, program_name, host);
+ 	
+ 		netinfo->command_line = g_strsplit (command, " ", -1);
+ 	
+@@ -217,7 +212,7 @@
+ 	
+ 	count = sscanf (line, TRACE_FORMAT,
+ 			&(data)->hop_count, data->hostname, data->ip,
+-			data->rtt1, data->rtt2/*, data->rtt3*/);
++			data->rtt1/*, data->rtt2, data->rtt3*/);
+ 	
+ 	if (count == TRACE_NUM_ARGS) {
+ 		return count;
+@@ -225,7 +220,7 @@
+ 
+ 	if (count == TRACE_NUM_ERR) {
+ 		g_sprintf (data->rtt1, "*");
+-		g_sprintf (data->rtt2, "*");
++		//g_sprintf (data->rtt2, "*");
+ 		return TRACE_NUM_ARGS;
+ 	}
+ 	/* The last line is different, because it has a 
+@@ -235,14 +230,14 @@
+ 
+ 	count = sscanf (line, TRACE_FORMAT_OPEN,
+ 			&(data)->hop_count, data->hostname, data->ip,
+-			data->rtt1, data->rtt2/*, data->rtt3*/);
++			data->rtt1/*, data->rtt2, data->rtt3*/);
+ 
+ 	if (count == TRACE_NUM_ARGS) {
+ 		return count;
+ 	} else {
+ 		count = sscanf (line, TRACE_FORMAT_CLOSE,
+ 				&(data)->hop_count, data->hostname,
+-				data->ip, data->rtt1, data->rtt2 /*,
++				data->ip, data->rtt1/*, data->rtt2,
+ 				data->rtt3*/);
+ 	}
+ 
+@@ -301,7 +296,7 @@
+ 	    gtk_tree_view_column_new_with_attributes
+ 	    (_("Time 2"), renderer, "text", TRACE_RTT2, NULL);
+ 	g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
+-	gtk_tree_view_append_column (widget, column);
++	//gtk_tree_view_append_column (widget, column);
+ 
+ 	model = GTK_TREE_MODEL (gtk_list_store_new
+ 				(TRACE_NUM_COLUMNS,
+diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.20.0/src/traceroute.h gnome-nettool-2.20.0.new/src/traceroute.h
+--- gnome-nettool-2.20.0/src/traceroute.h	2007-09-14 22:35:51.000000000 +0200
++++ gnome-nettool-2.20.0.new/src/traceroute.h	2007-11-21 15:11:06.000000000 +0100
+@@ -23,12 +23,12 @@
+ 
+ #include "nettool.h"
+ 
+-#define TRACE_FORMAT "%d %s %s %s ms %s ms"
++#define TRACE_FORMAT "%d: %s %s %sms"
+ #define TRACE_FORMAT_CLOSE "%d %s %s [closed] %s ms %s ms"
+ #define TRACE_FORMAT_OPEN "%d %s %s [open] %s ms %s ms"
+ #define TRACE_SELECT_DEVICE "Selected device %s address %s port %d for outgoing packets"
+ #define TRACE_TRACE_PATH "Tracing the path to %s (146.83.195.14) on TCP port 80 %d hops max"
+-#define TRACE_NUM_ARGS 5
++#define TRACE_NUM_ARGS 4
+ #define TRACE_NUM_ERR  3
+ 
+ /* Try 40 hops maximum and send only 1 packet */
diff -pruN 2.26.2-1/debian/patches/02_lpi.patch 2.26.2-1ubuntu1/debian/patches/02_lpi.patch
--- 2.26.2-1/debian/patches/02_lpi.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/patches/02_lpi.patch	2009-06-25 07:19:35.000000000 +0100
@@ -0,0 +1,40 @@
+diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.25.3/configure.in gnome-nettool-2.25.3.new/configure.in
+--- gnome-nettool-2.25.3/configure.in	2008-12-15 20:00:24.000000000 +0100
++++ gnome-nettool-2.25.3.new/configure.in	2009-01-09 18:18:18.000000000 +0100
+@@ -34,6 +34,7 @@
+ 
+ PKG_CHECK_MODULES(NETTOOL, 
+ 		  gtk+-2.0       >= $GTK_REQUIRED 
++		  launchpad-integration              
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED 
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
+diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.25.3/src/main.c gnome-nettool-2.25.3.new/src/main.c
+--- gnome-nettool-2.25.3/src/main.c	2008-12-15 20:00:24.000000000 +0100
++++ gnome-nettool-2.25.3.new/src/main.c	2009-01-09 18:21:34.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include <glade/glade.h>
++#include <launchpad-integration.h>
+ 
+ #include <glibtop.h>
+ 
+@@ -55,6 +56,7 @@
+ {
+ 	GtkWidget *window;
+ 	GtkWidget *menu_beep;
++	GtkWidget *menu_about;
+ 	GladeXML *xml;
+ 	GtkWidget *notebook;
+ 	GtkWidget *statusbar;
+@@ -222,6 +224,9 @@
+ 	g_signal_connect (G_OBJECT (menu_beep), "activate",
+ 			  G_CALLBACK (on_beep_activate),
+ 			  (gpointer) pinger); 
++
++	menu_about = glade_xml_get_widget (xml, "help1_menu");
++	launchpad_integration_add_items (menu_about, -1, FALSE, TRUE);
+ 	
+ 	glade_xml_signal_autoconnect (xml);
+ 	g_object_unref (G_OBJECT (xml));
diff -pruN 2.26.2-1/debian/patches/03_autoconf.patch 2.26.2-1ubuntu1/debian/patches/03_autoconf.patch
--- 2.26.2-1/debian/patches/03_autoconf.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/patches/03_autoconf.patch	2009-06-25 07:19:35.000000000 +0100
@@ -0,0 +1,81 @@
+diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.26.2/configure gnome-nettool-2.26.2.new/configure
+--- gnome-nettool-2.26.2/configure	2009-05-20 11:01:12.000000000 +1000
++++ gnome-nettool-2.26.2.new/configure	2009-06-17 12:52:23.000000000 +1000
+@@ -13270,12 +13270,14 @@
+     else
+         if test -n "$PKG_CONFIG" && \
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0       >= \$GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= \$LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= \$GCONF_REQUIRED
+ 		  gmodule-export-2.0
+ 		  gnome-doc-utils
+ 		  libgtop-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-2.0       >= $GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
+@@ -13285,6 +13287,7 @@
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_NETTOOL_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0       >= $GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
+@@ -13303,12 +13306,14 @@
+     else
+         if test -n "$PKG_CONFIG" && \
+     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0       >= \$GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= \$LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= \$GCONF_REQUIRED
+ 		  gmodule-export-2.0
+ 		  gnome-doc-utils
+ 		  libgtop-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-2.0       >= $GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
+@@ -13318,6 +13323,7 @@
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_NETTOOL_LIBS=`$PKG_CONFIG --libs "gtk+-2.0       >= $GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
+@@ -13342,6 +13348,7 @@
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+ 	        NETTOOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0       >= $GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
+@@ -13349,6 +13356,7 @@
+ 		  libgtop-2.0"`
+         else
+ 	        NETTOOL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0       >= $GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
+@@ -13359,6 +13367,7 @@
+ 	echo "$NETTOOL_PKG_ERRORS" >&5
+ 
+ 	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0       >= $GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
+@@ -13375,6 +13384,7 @@
+ See the pkg-config man page for more details.
+ " >&5
+ $as_echo "$as_me: error: Package requirements (gtk+-2.0       >= $GTK_REQUIRED
++		  launchpad-integration
+ 		  libglade-2.0   >= $LIBGLADE_REQUIRED
+ 		  gconf-2.0      >= $GCONF_REQUIRED
+ 		  gmodule-export-2.0
diff -pruN 2.26.2-1/debian/patches/04_menu_change.patch 2.26.2-1ubuntu1/debian/patches/04_menu_change.patch
--- 2.26.2-1/debian/patches/04_menu_change.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/patches/04_menu_change.patch	2009-06-25 07:19:35.000000000 +0100
@@ -0,0 +1,17 @@
+diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.20.0/src/gnome-nettool.desktop.in.in gnome-nettool-2.20.0.new/src/gnome-nettool.desktop.in.in
+--- gnome-nettool-2.20.0/src/gnome-nettool.desktop.in.in	2007-09-14 22:35:50.000000000 +0200
++++ gnome-nettool-2.20.0.new/src/gnome-nettool.desktop.in.in	2007-11-21 15:17:51.000000000 +0100
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=Network Tools
+ _Comment=View information about your network
+ Exec=gnome-nettool
+ Icon=gnome-nettool
+ Terminal=false
+ Type=Application
+-Categories=System;Utility;GNOME;GTK;
++Categories=System;Settings;GNOME;GTK;
+ StartupNotify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-nettool
diff -pruN 2.26.2-1/debian/patches/05_gksu_for_network_admin.patch 2.26.2-1ubuntu1/debian/patches/05_gksu_for_network_admin.patch
--- 2.26.2-1/debian/patches/05_gksu_for_network_admin.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/patches/05_gksu_for_network_admin.patch	2009-06-25 07:19:35.000000000 +0100
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.20.0/src/callbacks.c gnome-nettool-2.20.0.new/src/callbacks.c
+--- gnome-nettool-2.20.0/src/callbacks.c	2007-09-14 22:35:50.000000000 +0200
++++ gnome-nettool-2.20.0.new/src/callbacks.c	2007-11-21 15:19:21.000000000 +0100
+@@ -143,7 +143,7 @@
+ 	if (gtk_combo_box_get_active_iter (combo, &iter)) {
+ 		gtk_tree_model_get (model, &iter, 2, &nic, -1);
+ 
+-		command_line = g_string_new (info->network_tool_path);
++		command_line = g_string_new ("gksu -- network-admin");
+ 		g_string_append (command_line, " --configure ");
+ 		g_string_append (command_line, nic);
+ 
diff -pruN 2.26.2-1/debian/watch 2.26.2-1ubuntu1/debian/watch
--- 2.26.2-1/debian/watch	2009-06-25 07:21:27.000000000 +0100
+++ 2.26.2-1ubuntu1/debian/watch	2009-06-25 07:19:35.000000000 +0100
@@ -1,4 +1,4 @@
 version=2
-http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/([\d\.]+)[02468]/ \
+http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/([\d\.]+)/ \
 	gnome-nettool-(.*)\.tar\.gz \
 	debian uupdate
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]