[gnome-network] r27602 - in /desktop/experimental/gnome-nettool: ./ debian/ debian/patches/

From: jeansch-guest users alioth debian org
To: gnome-nettool packages qa debian org, pkg-gnome-commits lists alioth debian org
Subject: [gnome-network] r27602 - in /desktop/experimental/gnome-nettool: ./ debian/ debian/patches/
Date: Fri, 15 Apr 2011 18:41:27 -0000
Author: jeansch-guest
Date: Fri Apr 15 18:41:22 2011
New Revision: 27602

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27602
Log:
* New upstream release.
  + debian/control.in
    - Update build-dependencies, especially for Gnome 3
    - Updated Standards-Version
  + debian/patches
    - Removed network-manager (fixed upstream)
    - Refreshed 01_ping_icmp_req.patch
    - Added UI fix patch 02_fix_ui.patch
    - Added interface display patch 03_fix_ifaces.patch

Added:
    desktop/experimental/gnome-nettool/
      - copied from r27497, desktop/unstable/gnome-nettool/
    desktop/experimental/gnome-nettool/debian/patches/01_ping_icmp_req.patch
    desktop/experimental/gnome-nettool/debian/patches/02_fix_ui.patch
    desktop/experimental/gnome-nettool/debian/patches/03_fix_ifaces.patch
Removed:
    desktop/experimental/gnome-nettool/debian/patches/01_network-manager.patch
    desktop/experimental/gnome-nettool/debian/patches/02_ping_icmp_req.patch
Modified:
    desktop/experimental/gnome-nettool/debian/changelog
    desktop/experimental/gnome-nettool/debian/control
    desktop/experimental/gnome-nettool/debian/control.in
    desktop/experimental/gnome-nettool/debian/patches/series

Modified: desktop/experimental/gnome-nettool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-nettool/debian/changelog?rev=27602&op=diff
==============================================================================
--- desktop/experimental/gnome-nettool/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-nettool/debian/changelog [utf-8] Fri Apr 15 18:41:22 2011
@@ -1,3 +1,17 @@
+gnome-nettool (3.0.0-1) experimental; urgency=low
+
+  * New upstream release.
+    + debian/control.in
+      - Update build-dependencies, especially for Gnome 3
+      - Updated Standards-Version
+    + debian/patches
+      - Removed network-manager (fixed upstream)
+      - Refreshed 01_ping_icmp_req.patch
+      - Added UI fix patch 02_fix_ui.patch
+      - Added interface display patch 03_fix_ifaces.patch
+
+ -- Jean Schurger <jean schurger org>  Fri, 15 Apr 2011 14:18:51 -0400
+
 gnome-nettool (2.30.0-3) unstable; urgency=low
 
   * 02_ping_icmp_req.patch: new patch. Handle the output from 

Modified: desktop/experimental/gnome-nettool/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-nettool/debian/control?rev=27602&op=diff
==============================================================================
--- desktop/experimental/gnome-nettool/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-nettool/debian/control [utf-8] Fri Apr 15 18:41:22 2011
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: gnome-nettool
 Section: gnome
 Priority: optional
@@ -8,13 +13,12 @@
                dh-buildinfo,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
-               libgtk2.0-dev (>= 2.12.0),
-               libgconf2-dev (>= 1.1.11),
+               libgtk-3-dev (>= 3.0.3),
                libgtop2-dev,
                gnome-doc-utils,
                docbook-xml
-Uploaders: Josselin Mouette <joss debian org>, Loic Minier <lool dooz org>, Marc 'HE' Brockschmidt <he debian org>, Sebastian Dröge <slomo debian org>
-Standards-Version: 3.8.3
+Uploaders: Josselin Mouette <joss debian org>
+Standards-Version: 3.9.1
 Homepage: http://projects.gnome.org/gnome-network/
 
 Package: gnome-nettool

Modified: desktop/experimental/gnome-nettool/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-nettool/debian/control.in?rev=27602&op=diff
==============================================================================
--- desktop/experimental/gnome-nettool/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-nettool/debian/control.in [utf-8] Fri Apr 15 18:41:22 2011
@@ -8,13 +8,12 @@
                dh-buildinfo,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
-               libgtk2.0-dev (>= 2.12.0),
-               libgconf2-dev (>= 1.1.11),
+               libgtk-3-dev (>= 3.0.3),
                libgtop2-dev,
                gnome-doc-utils,
                docbook-xml
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://projects.gnome.org/gnome-network/
 
 Package: gnome-nettool

Added: desktop/experimental/gnome-nettool/debian/patches/01_ping_icmp_req.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-nettool/debian/patches/01_ping_icmp_req.patch?rev=27602&op=file
==============================================================================
--- desktop/experimental/gnome-nettool/debian/patches/01_ping_icmp_req.patch (added)
+++ desktop/experimental/gnome-nettool/debian/patches/01_ping_icmp_req.patch [utf-8] Fri Apr 15 18:41:22 2011
@@ -1,0 +1,60 @@
+From: Josselin Mouette <joss debian org>
+Date: Sat, 13 Nov 2010 13:53:12 +0100
+Subject: [PATCH] [ping] Handle output with icmp_req
+
+iputils-ping displays icmp_req= instead of icmp_seq=. Handle the two
+outputs correctly.
+diff -uNr gnome-nettool-3.0.0.orig/src/ping.c gnome-nettool-3.0.0.ping/src/ping.c
+--- gnome-nettool-3.0.0.orig/src/ping.c	2011-01-11 05:32:42.000000000 -0500
++++ gnome-nettool-3.0.0.ping/src/ping.c	2011-04-15 14:12:59.785027195 -0400
+@@ -408,7 +408,7 @@
+ 
+ 	if (len > 0) {		/* there are data to show */
+ 		count = strip_line (line, &data, netinfo);
+-		if ((count == 5) || (count == 6)) {
++		if ((count == 5) || (count == 7)) {
+ 
+ 			/* Creation of GtkTreeView */
+ 			gtk_tree_view_set_rules_hint (GTK_TREE_VIEW
+@@ -522,6 +522,7 @@
+ strip_line (gchar * line, ping_data * data, Netinfo * netinfo)
+ {
+ 	gint count;
++	gchar dummy_buf[3];
+ 
+ 	if (netinfo_get_ip_version (netinfo) == IPV4)
+ 		line = g_strdelimit (line, ":", ' ');
+@@ -533,9 +534,9 @@
+ 			&(data)->bytes, data->ip, &(data)->icmp_seq,
+ 			data->srtt, data->unit);
+ #endif
+-#ifdef PING_PARAMS_6
++#ifdef PING_PARAMS_7
+ 	count = sscanf (line, PING_FORMAT,
+-			&(data)->bytes, data->ip, &(data)->icmp_seq,
++			&(data)->bytes, data->ip, dummy_buf, &(data)->icmp_seq,
+ 			&(data)->ttl, data->srtt, data->unit);
+ #endif
+ 	if (count != 5 && count != 6) {
+diff -uNr gnome-nettool-3.0.0.orig/src/ping.h gnome-nettool-3.0.0.ping/src/ping.h
+--- gnome-nettool-3.0.0.orig/src/ping.h	2011-01-11 05:32:42.000000000 -0500
++++ gnome-nettool-3.0.0.ping/src/ping.h	2011-04-15 14:13:03.297024821 -0400
+@@ -28,14 +28,14 @@
+     /*  <path to program> ping -b [-c <count>] -n <host> */
+ #   define PING_PROGRAM_FORMAT "%s ping -b%s-n %s"
+ #   define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
+-#   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
+-#   define PING_PARAMS_6
++#   define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s"
++#   define PING_PARAMS_7
+ #elif defined(__OSF__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+     /*  <path to program> ping [-c <count>] -n <host> */
+ #   define PING_PROGRAM_FORMAT "%s ping%s-n %s"
+ #   define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
+-#   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
+-#   define PING_PARAMS_6
++#   define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s"
++#   define PING_PARAMS_7
+ #elif defined(__sun__) 
+     /*  <path to program> ping -s -n <host> [<count>] */
+ #   define PING_PROGRAM_FORMAT "%s ping -s -n %s 56%s"

Added: desktop/experimental/gnome-nettool/debian/patches/02_fix_ui.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-nettool/debian/patches/02_fix_ui.patch?rev=27602&op=file
==============================================================================
--- desktop/experimental/gnome-nettool/debian/patches/02_fix_ui.patch (added)
+++ desktop/experimental/gnome-nettool/debian/patches/02_fix_ui.patch [utf-8] Fri Apr 15 18:41:22 2011
@@ -1,0 +1,29 @@
+Description: GtkCombo of the address for traceroute, port scan, and whois should not extend
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=647895
+diff -uNr gnome-nettool-3.0.0.orig/data/gnome-nettool.ui gnome-nettool-3.0.0.ui/data/gnome-nettool.ui
+--- gnome-nettool-3.0.0.orig/data/gnome-nettool.ui	2011-01-11 05:32:42.000000000 -0500
++++ gnome-nettool-3.0.0.ui/data/gnome-nettool.ui	2011-04-15 14:12:33.681024859 -0400
+@@ -1623,6 +1623,7 @@
+                     <property name="visible">True</property>
+                     <property name="border_width">6</property>
+                     <property name="spacing">12</property>
++                    <property name="expand">False</property>
+                     <child>
+                       <object class="GtkHBox" id="hbox36">
+                         <property name="visible">True</property>
+@@ -1775,6 +1776,7 @@
+                     <property name="visible">True</property>
+                     <property name="border_width">6</property>
+                     <property name="spacing">12</property>
++                    <property name="expand">False</property>
+                     <child>
+                       <object class="GtkHBox" id="hbox37">
+                         <property name="visible">True</property>
+@@ -2337,6 +2339,7 @@
+                     <property name="visible">True</property>
+                     <property name="border_width">6</property>
+                     <property name="spacing">12</property>
++                    <property name="expand">False</property>
+                     <child>
+                       <object class="GtkHBox" id="hbox38">
+                         <property name="visible">True</property>

Added: desktop/experimental/gnome-nettool/debian/patches/03_fix_ifaces.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-nettool/debian/patches/03_fix_ifaces.patch?rev=27602&op=file
==============================================================================
--- desktop/experimental/gnome-nettool/debian/patches/03_fix_ifaces.patch (added)
+++ desktop/experimental/gnome-nettool/debian/patches/03_fix_ifaces.patch [utf-8] Fri Apr 15 18:41:22 2011
@@ -1,0 +1,21 @@
+Description: g_object_unref prevent interface name and pixmap to be displayed
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=647896
+diff -uNr gnome-nettool-3.0.0.orig/src/info.c gnome-nettool-3.0.0.ifaces/src/info.c
+--- gnome-nettool-3.0.0.orig/src/info.c	2010-12-02 04:26:14.000000000 -0500
++++ gnome-nettool-3.0.0.ifaces/src/info.c	2011-04-15 14:12:46.953026917 -0400
+@@ -200,13 +198,13 @@
+ 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
+ 	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
+ 					"pixbuf", 0, NULL);
+-	g_object_unref (renderer);
++	/* g_object_unref (renderer); */
+ 
+ 	renderer = gtk_cell_renderer_text_new ();
+ 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
+ 	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
+ 					"markup", 1, NULL);
+-	g_object_unref (renderer);
++	/* g_object_unref (renderer); */
+ 
+ 	gtk_combo_box_set_active (GTK_COMBO_BOX (info->combo), 0);
+ }

Modified: desktop/experimental/gnome-nettool/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-nettool/debian/patches/series?rev=27602&op=diff
==============================================================================
--- desktop/experimental/gnome-nettool/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-nettool/debian/patches/series [utf-8] Fri Apr 15 18:41:22 2011
@@ -1,2 +1,3 @@
-01_network-manager.patch
-02_ping_icmp_req.patch
+01_ping_icmp_req.patch
+02_fix_ui.patch
+03_fix_ifaces.patch
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]