[gnome-network] r32646 - in /desktop/unstable/gnome-nettool/debian: changelog patches/01_ping_icmp_req.patch patches/02_fix_ui.patch patches/03_fix_ifaces.patch patches/series

[mpitt users alioth debian org]

Author: mpitt
Date: Wed Feb 22 11:15:29 2012
New Revision: 32646

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32646
Log:
* New upstream release.
* Drop 01_ping_icmp_req.patch, 03_fix_ifaces.patch: Applied upstream.
* Unfuzz 02_fix_ui.patch.

Removed:
    desktop/unstable/gnome-nettool/debian/patches/01_ping_icmp_req.patch
    desktop/unstable/gnome-nettool/debian/patches/03_fix_ifaces.patch
Modified:
    desktop/unstable/gnome-nettool/debian/changelog
    desktop/unstable/gnome-nettool/debian/patches/02_fix_ui.patch
    desktop/unstable/gnome-nettool/debian/patches/series

Modified: desktop/unstable/gnome-nettool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/changelog?rev=32646&op=diff
==============================================================================
--- desktop/unstable/gnome-nettool/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-nettool/debian/changelog [utf-8] Wed Feb 22 11:15:29 2012
@@ -1,6 +1,9 @@
-gnome-nettool (3.0.0-3) UNRELEASED; urgency=low
+gnome-nettool (3.0.1-1) UNRELEASED; urgency=low
 
   * debian/watch: Look for xz tarballs.
+  * New upstream release.
+  * Drop 01_ping_icmp_req.patch, 03_fix_ifaces.patch: Applied upstream.
+  * Unfuzz 02_fix_ui.patch.
 
  -- Martin Pitt <mpitt debian org>  Wed, 22 Feb 2012 12:01:09 +0100
 

Modified: desktop/unstable/gnome-nettool/debian/patches/02_fix_ui.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/patches/02_fix_ui.patch?rev=32646&op=diff
==============================================================================
--- desktop/unstable/gnome-nettool/debian/patches/02_fix_ui.patch [utf-8] (original)
+++ desktop/unstable/gnome-nettool/debian/patches/02_fix_ui.patch [utf-8] Wed Feb 22 11:15:29 2012
@@ -1,29 +1,30 @@
 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 @@
+Index: gnome-nettool/data/gnome-nettool.ui
+===================================================================
+--- gnome-nettool.orig/data/gnome-nettool.ui	2012-01-03 10:10:16.000000000 +0100
++++ gnome-nettool/data/gnome-nettool.ui	2012-02-22 12:13:08.712343896 +0100
+@@ -1460,6 +1460,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">
+                       <object class="GtkHBox" id="hbox43">
                          <property name="visible">True</property>
-@@ -1775,6 +1776,7 @@
+@@ -1965,6 +1966,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">
+                       <object class="GtkTable" id="table7">
                          <property name="visible">True</property>
-@@ -2337,6 +2339,7 @@
+@@ -2166,6 +2168,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">
+                       <object class="GtkTable" id="table8">
                          <property name="visible">True</property>

Modified: desktop/unstable/gnome-nettool/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/patches/series?rev=32646&op=diff
==============================================================================
--- desktop/unstable/gnome-nettool/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-nettool/debian/patches/series [utf-8] Wed Feb 22 11:15:29 2012
@@ -1,3 +1,1 @@
-01_ping_icmp_req.patch
 02_fix_ui.patch
-03_fix_ifaces.patch