Ubuntu (new upstream) gnome-nettool 2.22.0-1ubuntu1
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
Ubuntu (new upstream) gnome-nettool 2.22.0-1ubuntu1
by Ubuntu Merge-o-Matic
::
Rate this Message:
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: Wed, 28 May 2008 14:21:05 +0200 Source: gnome-nettool Binary: gnome-nettool Architecture: source Version: 2.22.0-1ubuntu1 Distribution: intrepid Urgency: medium Maintainer: Ubuntu Desktop Team <ubuntu-desktop@...> Changed-By: Sebastien Bacher <seb128@...> Description: gnome-nettool - network information tool for GNOME Closes: 269396 290684 319610 400832 Changes: gnome-nettool (2.22.0-1ubuntu1) intrepid; urgency=low . * Sync with Debian * debian/control.in: - Build-Depends on liblaunchpad-integration-dev - Depends on "iputils-tracepath" rather than "tcptraceroute | traceroute" - make the description mention tracepath rather than traceroute * debian/patches/01_use_tracepath.patch: - use tracepath rather than tcptraceroute * debian/patches/02_lpi.patch: - launchpad integration * debian/patches/03_autoconf.patch: - configure update * debian/patches/04_menu_change.patch: - change menu category (MenuRevisited spec) . gnome-nettool (2.22.0-1) unstable; urgency=low . * New upstream stable release. * debian/control.in: + Updated Standards-Version to 3.7.3, no additional changes needed. * debian/menu: + Fix section of the menu file. . gnome-nettool (2.20.0-1) unstable; urgency=low . [ Loic Minier ] * Set maintainer to Debian GNOME Maintainers. . [ Sebastian Dröge ] * New upstream release: + Fixes localization problems (Closes: #290684, #319610). . gnome-nettool (2.18.0-2) unstable; urgency=low . * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on cdbs >= 0.4.41. * Preprend -Wl,-z,defs before -Wl,--as-needed in LDFLAGS. * Upload to unstable; drop check-dist include. * Wrap build-deps and deps. . gnome-nettool (2.18.0-1) experimental; urgency=low . [ Loic Minier ] * Add a get-orig-source target to retrieve the upstream tarball. * Include the new check-dist Makefile to prevent accidental uploads to unstable; bump build-dep on gnome-pkg-tools to >= 0.10. . [ Marc 'HE' Brockschmidt ] * New upstream release; no API to break . gnome-nettool (2.16.0-2) experimental; urgency=low . * Add missing build-dependency on gnome-doc-utils; thanks Frank Lichtenheld; closes: #400832. . gnome-nettool (2.16.0-1) experimental; urgency=low . [ Loic Minier ] * Add a dep on whois, thanks Daniel Holbach. * Fix watch file. . [ Oystein Gisnas ] * New upstream release * Bump debhelper compat to 5, no changes required. [debian/compat] * Add build-dep on intltool. [debian/control.in] . [ Josselin Mouette ] * Pass --disable-scrollkeeper to the configure script. . gnome-nettool (2.14.2-1) unstable; urgency=low . * Update watch file. [debian/watch] * New upstream versions. * Bump up Standards-Versions to 3.7.2. [debian/control, debian/control.in] . gnome-nettool (1.4.1-1) unstable; urgency=low . * New upstream release (translation updates). * Add CDBS' utils. [debian/rules] * Clarify license versus copyright. [debian/copyright] . gnome-nettool (1.4.0-1) unstable; urgency=low . [ Andrew Lau ] * New upstream release 1.3.0. * Debian Standards-Version: 3.6.2 * [debian/rules]: - Don't overwrite $(DEB_CONFIGURE_SCRIPT_ENV) completely. Thanks: Josselin Mouette <joss@...> - Record compile-time dependency versions using dh_buildinfo . [ Loic Minier ] * New upstream release 1.4.0, misc changes below. * Misc changes below taken from and to resync partially with 1.4.0-0ubuntu1. * Update build-deps. [debian/control, debian/control.in] - Bump CDBS version to >= 0.4.25. - Drop libgnomeui-dev. - Add libglade2-dev and libgconf2-dev. . gnome-nettool (1.2.0-1) unstable; urgency=low . * New upstream release. - Further HIG compliance. - Updated translations. * [debian/rules]: - Deflate dependencies via ld's --as-needed option. . gnome-nettool (1.1.0-1) experimental; urgency=low . * New upstream development release for GNOME 2.10. - Requires GTK+2.6. . gnome-nettool (1.0.0-1) unstable; urgency=low . * New upstream release. - Patches merged: 00_nettool.patch * Move Debian menu item to from Apps/Net to Apps/System in line with current FreeDesktop.org menu category. . gnome-nettool (0.99.3-2) unstable; urgency=medium . * Traceroute output now non-blocking. + [debian/patches/00_nettool.patch] (closes: #269396) . gnome-nettool (0.99.3-1) unstable; urgency=medium . * New upstream release. - Fixed crash on exit. . gnome-nettool (0.99.2-1) unstable; urgency=low . * Initial release of the Debian GNU/Linux package. - Replaces gnome-network 1.99.5-2. Files: cb94f2abf12000cda08508890183b6e3 1596 gnome optional gnome-nettool_2.22.0-1ubuntu1.dsc 3556eaa46b47c6531195ae096365bcf3 8369 gnome optional gnome-nettool_2.22.0-1ubuntu1.diff.gz Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@...> diff -pruN 2.22.0-1/debian/changelog 2.22.0-1ubuntu1/debian/changelog --- 2.22.0-1/debian/changelog 2008-05-30 15:39:38.000000000 +0100 +++ 2.22.0-1ubuntu1/debian/changelog 2008-05-30 15:02:11.000000000 +0100 @@ -1,3 +1,21 @@ +gnome-nettool (2.22.0-1ubuntu1) intrepid; urgency=low + + * Sync with Debian + * debian/control.in: + - Build-Depends on liblaunchpad-integration-dev + - Depends on "iputils-tracepath" rather than "tcptraceroute | traceroute" + - make the description mention tracepath rather than traceroute + * debian/patches/01_use_tracepath.patch: + - use tracepath rather than tcptraceroute + * debian/patches/02_lpi.patch: + - launchpad integration + * debian/patches/03_autoconf.patch: + - configure update + * debian/patches/04_menu_change.patch: + - change menu category (MenuRevisited spec) + + -- Sebastien Bacher <seb128@...> Wed, 28 May 2008 14:21:05 +0200 + gnome-nettool (2.22.0-1) unstable; urgency=low * New upstream stable release. diff -pruN 2.22.0-1/debian/control 2.22.0-1ubuntu1/debian/control --- 2.22.0-1/debian/control 2008-05-30 15:39:38.000000000 +0100 +++ 2.22.0-1ubuntu1/debian/control 2008-05-30 15:02:11.000000000 +0100 @@ -1,7 +1,8 @@ Source: gnome-nettool Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@...> +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@...> +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@...> Build-Depends: autotools-dev, cdbs (>= 0.4.41), debhelper (>= 5), @@ -12,9 +13,10 @@ Build-Depends: autotools-dev, libglade2-dev (>= 2.0.0), libgconf2-dev (>= 1.1.11), libxml-parser-perl, + liblaunchpad-integration-dev, gnome-doc-utils -Uploaders: Andrew Lau <netsnipe@...>, Josselin Mouette <joss@...>, Loic Minier <lool@...>, Marc 'HE' Brockschmidt <he@...>, Sebastian Dröge <slomo@...> -Standards-Version: 3.7.3 +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@...>, Josselin Mouette <joss@...>, Loic Minier <lool@...>, Marc 'HE' Brockschmidt <he@...>, Sebastian Dröge <slomo@...> +Standards-Version: 3.7.2 Package: gnome-nettool Architecture: any @@ -25,7 +27,7 @@ Depends: ${shlibs:Depends}, finger, net-tools, ping, - tcptraceroute | traceroute, + iputils-tracepath, whois Suggests: gnome-system-tools Conflicts: gnome-network (<= 1.99.5) @@ -35,7 +37,7 @@ Description: network information tool fo * ifconfig * ping * netstat - * traceroute + * tracepath * port scanning * DNS lookup * finger diff -pruN 2.22.0-1/debian/control.in 2.22.0-1ubuntu1/debian/control.in --- 2.22.0-1/debian/control.in 2008-05-30 15:39:38.000000000 +0100 +++ 2.22.0-1ubuntu1/debian/control.in 2008-05-30 15:02:11.000000000 +0100 @@ -1,7 +1,8 @@ Source: gnome-nettool Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@...> +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@...> +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@...> Build-Depends: autotools-dev, cdbs (>= 0.4.41), debhelper (>= 5), @@ -12,9 +13,10 @@ Build-Depends: autotools-dev, libglade2-dev (>= 2.0.0), libgconf2-dev (>= 1.1.11), libxml-parser-perl, + liblaunchpad-integration-dev, gnome-doc-utils Uploaders: @GNOME_TEAM@ -Standards-Version: 3.7.3 +Standards-Version: 3.7.2 Package: gnome-nettool Architecture: any @@ -25,7 +27,7 @@ Depends: ${shlibs:Depends}, finger, net-tools, ping, - tcptraceroute | traceroute, + iputils-tracepath, whois Suggests: gnome-system-tools Conflicts: gnome-network (<= 1.99.5) @@ -35,7 +37,7 @@ Description: network information tool fo * ifconfig * ping * netstat - * traceroute + * tracepath * port scanning * DNS lookup * finger diff -pruN 2.22.0-1/debian/patches/01_use_tracepath.patch 2.22.0-1ubuntu1/debian/patches/01_use_tracepath.patch --- 2.22.0-1/debian/patches/01_use_tracepath.patch 1970-01-01 01:00:00.000000000 +0100 +++ 2.22.0-1ubuntu1/debian/patches/01_use_tracepath.patch 2008-05-30 15:02:11.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.22.0-1/debian/patches/02_lpi.patch 2.22.0-1ubuntu1/debian/patches/02_lpi.patch --- 2.22.0-1/debian/patches/02_lpi.patch 1970-01-01 01:00:00.000000000 +0100 +++ 2.22.0-1ubuntu1/debian/patches/02_lpi.patch 2008-05-30 15:02:11.000000000 +0100 @@ -0,0 +1,32 @@ +diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.20.0/configure.in gnome-nettool-2.20.0.new/configure.in +--- gnome-nettool-2.20.0/configure.in 2007-09-18 05:50:29.000000000 +0200 ++++ gnome-nettool-2.20.0.new/configure.in 2007-11-21 15:13:16.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 + gnome-doc-utils) +diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.20.0/src/main.c gnome-nettool-2.20.0.new/src/main.c +--- gnome-nettool-2.20.0/src/main.c 2007-09-14 22:35:50.000000000 +0200 ++++ gnome-nettool-2.20.0.new/src/main.c 2007-11-21 15:14:19.000000000 +0100 +@@ -25,6 +25,7 @@ + #include <string.h> + #include <glib/gi18n.h> + #include <glade/glade.h> ++#include <launchpad-integration.h> + + #include "callbacks.h" + #include "ping.h" +@@ -228,6 +229,9 @@ + g_signal_connect (G_OBJECT (menu_about), "activate", + G_CALLBACK (on_about_activate), + (gpointer) window); ++ ++ menu_about = glade_xml_get_widget (xml, "help1_menu"); ++ launchpad_integration_add_items (menu_about, -1, FALSE, TRUE); + + menu_copy = glade_xml_get_widget (xml, "m_copy"); + diff -pruN 2.22.0-1/debian/patches/03_autoconf.patch 2.22.0-1ubuntu1/debian/patches/03_autoconf.patch --- 2.22.0-1/debian/patches/03_autoconf.patch 1970-01-01 01:00:00.000000000 +0100 +++ 2.22.0-1ubuntu1/debian/patches/03_autoconf.patch 2008-05-30 15:02:11.000000000 +0100 @@ -0,0 +1,75 @@ +diff -Nur -x '*.orig' -x '*~' gnome-nettool-2.20.0/configure gnome-nettool-2.20.0.new/configure +--- gnome-nettool-2.20.0/configure 2007-09-18 06:44:55.000000000 +0200 ++++ gnome-nettool-2.20.0.new/configure 2007-11-21 15:15:19.000000000 +0100 +@@ -21191,10 +21191,12 @@ + else + if test -n "$PKG_CONFIG" && \ + { (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 + gnome-doc-utils\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + gnome-doc-utils") 2>&5 +@@ -21202,6 +21204,7 @@ + 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 + gnome-doc-utils" 2>/dev/null` +@@ -21218,10 +21221,12 @@ + else + if test -n "$PKG_CONFIG" && \ + { (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 + gnome-doc-utils\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + gnome-doc-utils") 2>&5 +@@ -21229,6 +21234,7 @@ + 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 + gnome-doc-utils" 2>/dev/null` +@@ -21251,11 +21257,13 @@ + 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 + gnome-doc-utils"` + 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 + gnome-doc-utils"` +@@ -21264,6 +21272,7 @@ + echo "$NETTOOL_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + gnome-doc-utils) were not met: +@@ -21278,6 +21287,7 @@ + See the pkg-config man page for more details. + " >&5 + echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + gnome-doc-utils) were not met: diff -pruN 2.22.0-1/debian/patches/04_menu_change.patch 2.22.0-1ubuntu1/debian/patches/04_menu_change.patch --- 2.22.0-1/debian/patches/04_menu_change.patch 1970-01-01 01:00:00.000000000 +0100 +++ 2.22.0-1ubuntu1/debian/patches/04_menu_change.patch 2008-05-30 15:02:11.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 _______________________________________________ gnome-network-list mailing list gnome-network-list@... http://mail.gnome.org/mailman/listinfo/gnome-network-list |
| Free embeddable forum powered by Nabble | Forum Help |
