[gnome-network] Ubuntu (new upstream) gnome-nettool 2.18.0-0ubuntu1
- From: Ubuntu Merge-o-Matic <mom ubuntu com>
- To: gnome-nettool packages qa debian org
- Subject: [gnome-network] Ubuntu (new upstream) gnome-nettool 2.18.0-0ubuntu1
- Date: Thu, 03 May 2007 00:13:41 -0000
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: Tue, 13 Mar 2007 11:58:15 +0100
Source: gnome-nettool
Binary: gnome-nettool
Architecture: source
Version: 2.18.0-0ubuntu1
Distribution: feisty
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss lists ubuntu com>
Changed-By: Daniel Holbach <daniel holbach ubuntu com>
Description:
gnome-nettool - network information tool for GNOME
Changes:
gnome-nettool (2.18.0-0ubuntu1) feisty; urgency=low
.
* New upstream release:
- Made gnome-nettool.desktop freedesktop compliant
- Translation updates.
* debian/control.in:
- changed Maintainer field.
* debian/patches/04_menu_change.patch:
- updated.
Files:
7c20b2f56f9e329f991850ac2cc50e75 1728 gnome optional gnome-nettool_2.18.0-0ubuntu1.dsc
cd10504f9c92fe452a436cf9d2569816 8726 gnome optional gnome-nettool_2.18.0-0ubuntu1.diff.gz
Original-Maintainer: Andrew Lau <netsnipe users sourceforge net>
diff -pruN 2.18.0-1/debian/changelog 2.18.0-0ubuntu1/debian/changelog
--- 2.18.0-1/debian/changelog 2007-05-02 14:25:52.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/changelog 2007-05-02 13:18:31.000000000 +0100
@@ -1,21 +1,52 @@
-gnome-nettool (2.18.0-1) experimental; urgency=low
+gnome-nettool (2.18.0-0ubuntu1) feisty; 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
-
- -- Marc 'HE' Brockschmidt <he debian org> Mon, 26 Mar 2007 23:08:04 +0200
-
-gnome-nettool (2.16.0-2) experimental; urgency=low
-
- * Add missing build-dependency on gnome-doc-utils; thanks Frank Lichtenheld;
- closes: #400832.
+ * New upstream release:
+ - Made gnome-nettool.desktop freedesktop compliant
+ - Translation updates.
+ * debian/control.in:
+ - changed Maintainer field.
+ * debian/patches/04_menu_change.patch:
+ - updated.
+
+ -- Daniel Holbach <daniel holbach ubuntu com> Tue, 13 Mar 2007 11:58:15 +0100
+
+gnome-nettool (2.17.4-0ubuntu3) feisty; urgency=low
+
+ * debian/patches/05_gksu_for_network_admin.patch:
+ - call network-admin with gksu (Ubuntu: #35476)
+
+ -- Sebastien Bacher <seb128 canonical com> Wed, 20 Dec 2006 13:19:01 +0100
+
+gnome-nettool (2.17.4-0ubuntu2) feisty; urgency=low
+
+ * debian/control.in:
+ - Build-Depends on gnome-doc-utils (>= 0.3.2)
+
+ -- Sebastien Bacher <seb128 canonical com> Tue, 19 Dec 2006 00:43:43 +0100
+
+gnome-nettool (2.17.4-0ubuntu1) feisty; urgency=low
+
+ * New upstream version:
+ - Improves the behavior on list
+ - Fixed compilation in OpenBSD
+ - Added support for OpenBSD
+ - Changed the sematic from packets loss to packet succeed
+ - Added bar-graph display for ping
+ * 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)
- -- Loic Minier <lool dooz org> Wed, 29 Nov 2006 08:33:52 +0100
+ -- Sebastien Bacher <seb128 canonical com> Mon, 18 Dec 2006 17:18:26 +0100
gnome-nettool (2.16.0-1) experimental; urgency=low
diff -pruN 2.18.0-1/debian/control 2.18.0-0ubuntu1/debian/control
--- 2.18.0-1/debian/control 2007-05-02 14:25:52.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/control 2007-05-02 13:18:31.000000000 +0100
@@ -1,15 +1,16 @@
Source: gnome-nettool
Section: gnome
Priority: optional
-Maintainer: Andrew Lau <netsnipe users sourceforge net>
-Build-Depends: autotools-dev, cdbs (>= 0.4.25), debhelper (>= 5), dh-buildinfo, gnome-pkg-tools (>= 0.10), intltool (>= 0.35.0), libgtk2.0-dev (>= 2.6), libglade2-dev (>= 2.0.0), libgconf2-dev (>= 1.1.11), libxml-parser-perl, gnome-doc-utils
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Clément Stenac <zorglub debian org>, Dafydd Harries <daf debian org>, Guilherme de S. Pastore <gpastore debian org>, Gustavo Franco <stratus debian org>, Gustavo Noronha Silva <kov debian org>, J.H.M. Dassen (Ray) <jdassen debian org>, Jordi Mallach <jordi debian org>, Jose Carlos Garcia Sogo <jsogo debian org>, Josselin Mouette <joss debian org>, Kilian Krause <kilian debian org>, Loic Minier <lool dooz org>, Marc 'HE' Brockschmidt <he debian org>, Marco Cabizza <marco87 gmail com>, Oystein Gisnas <oystein gisnas net>, OndÅ?ej Surý <ondrej debian org>, Ross Burton <ross debian org>, Sebastien Bacher <seb128 debian org>, Sjoerd Simons <sjoerd debian org>
+XSBC-Original-Maintainer: Andrew Lau <netsnipe users sourceforge net>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss lists ubuntu com>
+Build-Depends: autotools-dev, cdbs (>= 0.4.25), debhelper (>= 5), dh-buildinfo, gnome-pkg-tools, intltool (>= 0.35.0), libgtk2.0-dev (>= 2.6), libglade2-dev (>= 2.0.0), libgconf2-dev (>= 1.1.11), libxml-parser-perl, liblaunchpad-integration-dev, gnome-doc-utils (>= 0.3.2)
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Andrew Lau <netsnipe users sourceforge net>, Clément Stenac <zorglub debian org>, Dafydd Harries <daf debian org>, Guilherme de S. Pastore <gpastore debian org>, Gustavo Franco <stratus debian org>, Gustavo Noronha Silva <kov debian org>, J.H.M. Dassen (Ray) <jdassen debian org>, Jordi Mallach <jordi debian org>, Jose Carlos Garcia Sogo <jsogo debian org>, Josselin Mouette <joss debian org>, Kilian Krause <kilian debian org>, Loic Minier <lool dooz org>, Marc 'HE' Brockschmidt <he debian org>, Marco Cabizza <marco87 gmail com>, Oystein Gisnas <oystein gisnas net>, OndÅ?ej Surý <ondrej debian org>, Ross Burton <ross debian org>, Sebastien Bacher <seb128 debian org>, Sjoerd Simons <sjoerd debian org>
Standards-Version: 3.7.2
Package: gnome-nettool
Architecture: any
Replaces: gnome-network (<= 1.99.5)
-Depends: ${shlibs:Depends}, ${misc:Depends}, dnsutils, finger, net-tools, ping, tcptraceroute | traceroute, whois
+Depends: ${shlibs:Depends}, ${misc:Depends}, dnsutils, finger, net-tools, ping, iputils-tracepath, whois
Suggests: gnome-system-tools
Conflicts: gnome-network (<= 1.99.5)
Description: network information tool for GNOME
@@ -18,7 +19,7 @@ Description: network information tool fo
* ifconfig
* ping
* netstat
- * traceroute
+ * tracepath
* port scanning
* DNS lookup
* finger
diff -pruN 2.18.0-1/debian/control.in 2.18.0-0ubuntu1/debian/control.in
--- 2.18.0-1/debian/control.in 2007-05-02 14:25:52.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/control.in 2007-05-02 13:18:31.000000000 +0100
@@ -1,15 +1,16 @@
Source: gnome-nettool
Section: gnome
Priority: optional
-Maintainer: Andrew Lau <netsnipe users sourceforge net>
-Build-Depends: autotools-dev, cdbs (>= 0.4.25), debhelper (>= 5), dh-buildinfo, gnome-pkg-tools (>= 0.10), intltool (>= 0.35.0), libgtk2.0-dev (>= 2.6), libglade2-dev (>= 2.0.0), libgconf2-dev (>= 1.1.11), libxml-parser-perl, gnome-doc-utils
+XSBC-Original-Maintainer: Andrew Lau <netsnipe users sourceforge net>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss lists ubuntu com>
+Build-Depends: autotools-dev, cdbs (>= 0.4.25), debhelper (>= 5), dh-buildinfo, gnome-pkg-tools, intltool (>= 0.35.0), libgtk2.0-dev (>= 2.6), libglade2-dev (>= 2.0.0), libgconf2-dev (>= 1.1.11), libxml-parser-perl, liblaunchpad-integration-dev, gnome-doc-utils (>= 0.3.2)
Uploaders: @GNOME_TEAM@
Standards-Version: 3.7.2
Package: gnome-nettool
Architecture: any
Replaces: gnome-network (<= 1.99.5)
-Depends: ${shlibs:Depends}, ${misc:Depends}, dnsutils, finger, net-tools, ping, tcptraceroute | traceroute, whois
+Depends: ${shlibs:Depends}, ${misc:Depends}, dnsutils, finger, net-tools, ping, iputils-tracepath, whois
Suggests: gnome-system-tools
Conflicts: gnome-network (<= 1.99.5)
Description: network information tool for GNOME
@@ -18,7 +19,7 @@ Description: network information tool fo
* ifconfig
* ping
* netstat
- * traceroute
+ * tracepath
* port scanning
* DNS lookup
* finger
diff -pruN 2.18.0-1/debian/patches/01_use_tracepath.patch 2.18.0-0ubuntu1/debian/patches/01_use_tracepath.patch
--- 2.18.0-1/debian/patches/01_use_tracepath.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/patches/01_use_tracepath.patch 2007-05-02 13:18:31.000000000 +0100
@@ -0,0 +1,101 @@
+diff -Nur gnome-nettool-1.0.0.orig/src/traceroute.c gnome-nettool-1.0.0/src/traceroute.c
+--- gnome-nettool-1.0.0.orig/src/traceroute.c 2004-09-10 23:56:42.000000000 +0200
++++ gnome-nettool-1.0.0/src/traceroute.c 2004-12-22 20:02:11.037129360 +0100
+@@ -70,20 +70,15 @@
+ 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;
+@@ -92,8 +87,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);
+
+@@ -222,7 +216,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;
+@@ -230,7 +224,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
+@@ -240,14 +234,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*/);
+ }
+
+@@ -306,7 +300,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 gnome-nettool-1.0.0.orig/src/traceroute.h gnome-nettool-1.0.0/src/traceroute.h
+--- gnome-nettool-1.0.0.orig/src/traceroute.h 2004-05-10 14:19:21.000000000 +0200
++++ gnome-nettool-1.0.0/src/traceroute.h 2004-12-22 20:00:37.062415688 +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.18.0-1/debian/patches/02_lpi.patch 2.18.0-0ubuntu1/debian/patches/02_lpi.patch
--- 2.18.0-1/debian/patches/02_lpi.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/patches/02_lpi.patch 2007-05-02 13:18:31.000000000 +0100
@@ -0,0 +1,32 @@
+diff -Nur gnome-nettool-1.3.91.orig/configure.in gnome-nettool-1.3.91/configure.in
+--- gnome-nettool-1.3.91.orig/configure.in 2005-08-08 14:12:20.000000000 +0200
++++ gnome-nettool-1.3.91/configure.in 2005-08-08 18:43:37.000000000 +0200
+@@ -31,6 +31,7 @@
+
+ PKG_CHECK_MODULES(NETTOOL,
+ gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED)
+ AC_SUBST(NETTOOL_CFLAGS)
+diff -Nur gnome-nettool-1.3.91.orig/src/main.c gnome-nettool-1.3.91/src/main.c
+--- gnome-nettool-1.3.91.orig/src/main.c 2005-05-06 22:10:28.000000000 +0200
++++ gnome-nettool-1.3.91/src/main.c 2005-08-08 18:45:14.000000000 +0200
+@@ -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"
+@@ -217,6 +218,9 @@
+ 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");
+
+ g_signal_connect (G_OBJECT (menu_copy), "activate",
diff -pruN 2.18.0-1/debian/patches/03_autoconf.patch 2.18.0-0ubuntu1/debian/patches/03_autoconf.patch
--- 2.18.0-1/debian/patches/03_autoconf.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/patches/03_autoconf.patch 2007-05-02 13:18:31.000000000 +0100
@@ -0,0 +1,70 @@
+diff -Nur gnome-nettool-2.14.2/configure gnome-nettool-2.14.2.new/configure
+--- gnome-nettool-2.14.2/configure 2006-05-18 05:49:17.000000000 +0200
++++ gnome-nettool-2.14.2.new/configure 2006-05-19 01:40:36.000000000 +0200
+@@ -20313,15 +20313,18 @@
+ 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\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+ ac_status=$?
+ 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" 2>/dev/null`
+ else
+@@ -20337,15 +20340,18 @@
+ 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\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+ ac_status=$?
+ 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" 2>/dev/null`
+ else
+@@ -20367,10 +20373,12 @@
+ 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"`
+ 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"`
+ fi
+@@ -20378,6 +20386,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) were not met:
+
+@@ -20391,6 +20400,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) were not met:
+
diff -pruN 2.18.0-1/debian/patches/04_menu_change.patch 2.18.0-0ubuntu1/debian/patches/04_menu_change.patch
--- 2.18.0-1/debian/patches/04_menu_change.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/patches/04_menu_change.patch 2007-05-02 13:18:31.000000000 +0100
@@ -0,0 +1,36 @@
+diff -Nur gnome-nettool-2.18.0/src/gnome-nettool.desktop.in gnome-nettool-2.18.0.new/src/gnome-nettool.desktop.in
+--- gnome-nettool-2.18.0/src/gnome-nettool.desktop.in 2007-03-13 02:48:54.000000000 +0100
++++ gnome-nettool-2.18.0.new/src/gnome-nettool.desktop.in 2007-03-13 12:05:34.000000000 +0100
+@@ -1,12 +1,12 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ _Name=Network Tools
+-_Comment=Network Information 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 -Nur gnome-nettool-2.18.0/src/gnome-nettool.desktop.in.in gnome-nettool-2.18.0.new/src/gnome-nettool.desktop.in.in
+--- gnome-nettool-2.18.0/src/gnome-nettool.desktop.in.in 2007-03-13 02:18:37.000000000 +0100
++++ gnome-nettool-2.18.0.new/src/gnome-nettool.desktop.in.in 2007-03-13 12:05:48.000000000 +0100
+@@ -1,12 +1,12 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ _Name=Network Tools
+-_Comment=Network Information 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.18.0-1/debian/patches/05_gksu_for_network_admin.patch 2.18.0-0ubuntu1/debian/patches/05_gksu_for_network_admin.patch
--- 2.18.0-1/debian/patches/05_gksu_for_network_admin.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/patches/05_gksu_for_network_admin.patch 2007-05-02 13:18:31.000000000 +0100
@@ -0,0 +1,12 @@
+diff -Nur gnome-nettool-2.17.4/src/callbacks.c gnome-nettool-2.17.4.new/src/callbacks.c
+--- gnome-nettool-2.17.4/src/callbacks.c 2006-05-09 00:27:09.000000000 +0200
++++ gnome-nettool-2.17.4.new/src/callbacks.c 2006-12-20 13:18:50.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.18.0-1/debian/rules 2.18.0-0ubuntu1/debian/rules
--- 2.18.0-1/debian/rules 2007-05-02 14:25:52.000000000 +0100
+++ 2.18.0-0ubuntu1/debian/rules 2007-05-02 13:18:31.000000000 +0100
@@ -10,8 +10,6 @@ include /usr/share/cdbs/1/rules/simple-p
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/check-dist.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
# Compile options
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
[Date Prev][
Date Next] [Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
