This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.8
Date: Sat, 17 Dec 2011 22:58:50 -0700
Source: gnome-nettool
Binary: gnome-nettool
Architecture: source
Version: 3.0.0-0ubuntu4
Distribution: precise
Urgency: low
Maintainer: Ubuntu Desktop Team <ubuntu-desk...@lists.ubuntu.com>
Changed-By: Matthew Fischer <matthew.fisc...@canonical.com>
Description:
gnome-nettool - network information tool for GNOME
Launchpad-Bugs-Fixed: 661753
Changes:
gnome-nettool (3.0.0-0ubuntu4) precise; urgency=low
.
* debian/patches/03_use_tracepath.patch:
- Modify the patch to re-title the column headers (LP: #661753)
Checksums-Sha1:
c77b99ee7d13c26df0972d726aa1e0096357704e 1745 gnome-nettool_3.0.0-0ubuntu4.dsc
1f71e28e2295f8b64abeeebd026281aaa4ad3b40 12349
gnome-nettool_3.0.0-0ubuntu4.debian.tar.gz
Checksums-Sha256:
1740c4ea12bd403a9aa5f2b38ab9b4928df0b6f16268fd8d7102fd700bb9e93e 1745
gnome-nettool_3.0.0-0ubuntu4.dsc
e97263cb2f2432a0f44790b048e3b424e7011fa18216bb908f9dd31d704a7c14 12349
gnome-nettool_3.0.0-0ubuntu4.debian.tar.gz
Files:
e9c5a70805e305ec0882ce4af013b1cd 1745 gnome optional
gnome-nettool_3.0.0-0ubuntu4.dsc
5db97b24a709e506b89bf97442ca60a5 12349 gnome optional
gnome-nettool_3.0.0-0ubuntu4.debian.tar.gz
Original-Maintainer: Debian GNOME Maintainers
<pkg-gnome-maintain...@lists.alioth.debian.org>
diff -pruN 3.0.0-0ubuntu3/debian/changelog 3.0.0-0ubuntu4/debian/changelog
--- 3.0.0-0ubuntu3/debian/changelog 2011-12-03 00:40:21.000000000 +0000
+++ 3.0.0-0ubuntu4/debian/changelog 2012-01-19 15:08:29.000000000 +0000
@@ -1,3 +1,10 @@
+gnome-nettool (3.0.0-0ubuntu4) precise; urgency=low
+
+ * debian/patches/03_use_tracepath.patch:
+ - Modify the patch to re-title the column headers (LP: #661753)
+
+ -- Matthew Fischer <matthew.fisc...@canonical.com> Sat, 17 Dec 2011 22:58:50
-0700
+
gnome-nettool (3.0.0-0ubuntu3) precise; urgency=low
* No-change rebuild to drop spurious libsfgcc1 dependency on armhf.
diff -pruN 3.0.0-0ubuntu3/debian/gnome-nettool.debhelper.log
3.0.0-0ubuntu4/debian/gnome-nettool.debhelper.log
--- 3.0.0-0ubuntu3/debian/gnome-nettool.debhelper.log 2011-05-17
08:41:04.000000000 +0000
+++ 3.0.0-0ubuntu4/debian/gnome-nettool.debhelper.log 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-dh_autoreconf_clean
diff -pruN 3.0.0-0ubuntu3/debian/patches/03_use_tracepath.patch
3.0.0-0ubuntu4/debian/patches/03_use_tracepath.patch
--- 3.0.0-0ubuntu3/debian/patches/03_use_tracepath.patch 2011-05-17
08:41:02.000000000 +0000
+++ 3.0.0-0ubuntu4/debian/patches/03_use_tracepath.patch 2012-01-19
15:08:29.000000000 +0000
@@ -1,9 +1,13 @@
Description: Use tracepath instead of tcptraceroute or traceroute
-Author: ?
+Author: Matthew Fischer <matthew.fisc...@canonical.com>
+Origin: <unknown>
+Bug-Ubuntu: https://launchpad.net/bugs/661753
+Forwarded: not-needed
-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
+Index: gnome-nettool-3.0.0/src/traceroute.c
+===================================================================
+--- gnome-nettool-3.0.0.orig/src/traceroute.c 2011-12-17 23:01:32.101296812
-0700
++++ gnome-nettool-3.0.0/src/traceroute.c 2011-12-17 23:05:16.761290244
-0700
@@ -71,20 +71,16 @@
switch (netinfo_get_ip_version (netinfo))
{
@@ -31,17 +35,16 @@ diff -Nur -x '*.orig' -x '*~' gnome-nett
break;
default:
program = NULL;
-@@ -93,8 +89,7 @@
-
+@@ -94,7 +90,7 @@
if (program != NULL) {
command =
-- g_strdup_printf ("%s %s %s %s", program, program_name,
+ g_strdup_printf ("%s %s %s %s", program, program_name,
- TCPTRACEROUTE_OPTIONS, host);
-+ g_strdup_printf ("%s %s %s", program, program_name, host);
++ TRACEPATH_OPTIONS, host);
netinfo->command_line = g_strsplit (command, " ", -1);
-@@ -217,7 +212,7 @@
+@@ -217,7 +213,7 @@
count = sscanf (line, TRACE_FORMAT,
&(data)->hop_count, data->hostname, data->ip,
@@ -50,7 +53,7 @@ diff -Nur -x '*.orig' -x '*~' gnome-nett
if (count == TRACE_NUM_ARGS) {
return count;
-@@ -225,7 +220,7 @@
+@@ -225,7 +221,7 @@
if (count == TRACE_NUM_ERR) {
g_sprintf (data->rtt1, "*");
@@ -59,7 +62,7 @@ diff -Nur -x '*.orig' -x '*~' gnome-nett
return TRACE_NUM_ARGS;
}
/* The last line is different, because it has a
-@@ -235,14 +230,14 @@
+@@ -235,14 +231,14 @@
count = sscanf (line, TRACE_FORMAT_OPEN,
&(data)->hop_count, data->hostname, data->ip,
@@ -76,19 +79,54 @@ diff -Nur -x '*.orig' -x '*~' gnome-nett
data->rtt3*/);
}
-@@ -301,7 +296,7 @@
+@@ -262,7 +258,7 @@
+ /* Number of sequence of each hop in a traceroute output */
+ column =
+ gtk_tree_view_column_new_with_attributes
+- (_("Hop"), renderer, "text", TRACE_HOP, NULL);
++ (_("TTL"), renderer, "text", TRACE_HOP, NULL);
+ g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
+ gtk_tree_view_append_column (widget, column);
+
+@@ -289,7 +285,7 @@
+ when was received its reply (1st sample) */
+ column =
gtk_tree_view_column_new_with_attributes
- (_("Time 2"), renderer, "text", TRACE_RTT2, NULL);
+- (_("Time 1"), renderer, "text", TRACE_RTT1, NULL);
++ (_("Time"), renderer, "text", TRACE_RTT1, NULL);
+ g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
+ gtk_tree_view_append_column (widget, column);
+
+@@ -299,9 +295,9 @@
+ when was received its reply (2nd sample) */
+ column =
+ gtk_tree_view_column_new_with_attributes
+- (_("Time 2"), renderer, "text", TRACE_RTT2, NULL);
++ (_(""), 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 @@
+@@ -322,10 +318,9 @@
+ g_return_if_fail (netinfo != NULL);
+
+ /* The traceroute output in text format:
+- Hop count, Hostname, IP, Round Trip Time 1 (Time1),
+- Round Trip Time 2 (Time2),
++ TTL, Hostname, IP, Time, Misc info (see tracepath manpage for more
info)
+ It's a tabular output, and these belongs to the column titles */
+- result = g_string_new (_("Hop\tHostname\tIP\tTime 1\tTime 2\n"));
++ result = g_string_new (_("TTL\tHostname\tIP\tTime\tMisc\n"));
+
+ content = util_tree_model_to_string (GTK_TREE_VIEW (netinfo->output));
+
+Index: gnome-nettool-3.0.0/src/traceroute.h
+===================================================================
+--- gnome-nettool-3.0.0.orig/src/traceroute.h 2011-12-17 23:01:32.085296812
-0700
++++ gnome-nettool-3.0.0/src/traceroute.h 2011-12-17 23:05:04.497290604
-0700
+@@ -23,16 +23,18 @@
#include "nettool.h"
@@ -103,3 +141,9 @@ diff -Nur -x '*.orig' -x '*~' gnome-nett
#define TRACE_NUM_ERR 3
/* Try 40 hops maximum and send only 1 packet */
+ #define TCPTRACEROUTE_OPTIONS "-q 2 -m 40"
++/* Add ip info */
++#define TRACEPATH_OPTIONS "-b"
+
+ typedef struct _traceroute_data traceroute_data;
+ typedef struct _trace_source_data trace_source_data;
diff -pruN 3.0.0-0ubuntu3/src/traceroute.c 3.0.0-0ubuntu4/src/traceroute.c
--- 3.0.0-0ubuntu3/src/traceroute.c 2012-01-19 20:10:50.000000000 +0000
+++ 3.0.0-0ubuntu4/src/traceroute.c 2012-01-19 20:10:49.000000000 +0000
@@ -89,7 +89,8 @@ traceroute_do (Netinfo * netinfo)
if (program != NULL) {
command =
- g_strdup_printf ("%s %s %s", program, program_name, host);
+ g_strdup_printf ("%s %s %s %s", program, program_name,
+ TRACEPATH_OPTIONS, host);
netinfo->command_line = g_strsplit (command, " ", -1);
@@ -257,7 +258,7 @@ traceroute_create_model (GtkTreeView *wi
/* Number of sequence of each hop in a traceroute output */
column =
gtk_tree_view_column_new_with_attributes
- (_("Hop"), renderer, "text", TRACE_HOP, NULL);
+ (_("TTL"), renderer, "text", TRACE_HOP, NULL);
g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
gtk_tree_view_append_column (widget, column);
@@ -284,7 +285,7 @@ traceroute_create_model (GtkTreeView *wi
when was received its reply (1st sample) */
column =
gtk_tree_view_column_new_with_attributes
- (_("Time 1"), renderer, "text", TRACE_RTT1, NULL);
+ (_("Time"), renderer, "text", TRACE_RTT1, NULL);
g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
gtk_tree_view_append_column (widget, column);
@@ -294,7 +295,7 @@ traceroute_create_model (GtkTreeView *wi
when was received its reply (2nd sample) */
column =
gtk_tree_view_column_new_with_attributes
- (_("Time 2"), renderer, "text", TRACE_RTT2, NULL);
+ (_(""), renderer, "text", TRACE_RTT2, NULL);
g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
//gtk_tree_view_append_column (widget, column);
@@ -317,10 +318,9 @@ traceroute_copy_to_clipboard (Netinfo *
g_return_if_fail (netinfo != NULL);
/* The traceroute output in text format:
- Hop count, Hostname, IP, Round Trip Time 1 (Time1),
- Round Trip Time 2 (Time2),
+ TTL, Hostname, IP, Time, Misc info (see tracepath manpage for more
info)
It's a tabular output, and these belongs to the column titles */
- result = g_string_new (_("Hop\tHostname\tIP\tTime 1\tTime 2\n"));
+ result = g_string_new (_("TTL\tHostname\tIP\tTime\tMisc\n"));
content = util_tree_model_to_string (GTK_TREE_VIEW (netinfo->output));
diff -pruN 3.0.0-0ubuntu3/src/traceroute.h 3.0.0-0ubuntu4/src/traceroute.h
--- 3.0.0-0ubuntu3/src/traceroute.h 2012-01-19 20:10:50.000000000 +0000
+++ 3.0.0-0ubuntu4/src/traceroute.h 2012-01-19 20:10:49.000000000 +0000
@@ -33,6 +33,8 @@
/* Try 40 hops maximum and send only 1 packet */
#define TCPTRACEROUTE_OPTIONS "-q 2 -m 40"
+/* Add ip info */
+#define TRACEPATH_OPTIONS "-b"
typedef struct _traceroute_data traceroute_data;
typedef struct _trace_source_data trace_source_data;
_______________________________________________
gnome-network-list mailing list
gnome-network-list@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-network-list
