[gnome-network] r38261 - in /desktop/unstable/gnome-nettool/debian: changelog patches/printf.patch patches/series

[jbicha-guest users alioth debian org]

Author: jbicha-guest
Date: Thu May 30 21:41:08 2013
New Revision: 38261

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38261
Log:
* debian/patches/printf.patch:
  - Patch from Bugzilla to fix format error 

Added:
    desktop/unstable/gnome-nettool/debian/patches/printf.patch
Modified:
    desktop/unstable/gnome-nettool/debian/changelog
    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=38261&op=diff
==============================================================================
--- desktop/unstable/gnome-nettool/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-nettool/debian/changelog [utf-8] Thu May 30 21:41:08 2013
@@ -1,3 +1,10 @@
+gnome-nettool (3.8.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/printf.patch:
+    - Patch from Bugzilla to fix format error 
+
+ -- Jeremy Bicha <jbicha ubuntu com>  Thu, 30 May 2013 17:40:01 -0400
+
 gnome-nettool (3.8.0-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-nettool/debian/patches/printf.patch
URL: 
http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/patches/printf.patch?rev=38261&op=file
==============================================================================
--- desktop/unstable/gnome-nettool/debian/patches/printf.patch (added)
+++ desktop/unstable/gnome-nettool/debian/patches/printf.patch [utf-8] Thu May 30 21:41:08 2013
@@ -1,0 +1,39 @@
+Author: Jan Steffens (heftig) <jan steffens gmail com>
+Bug: https://bugzilla.gnome.org/699546
+Description: Fix format error
+
+diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c
+--- gnome-nettool-3.8.0/src/info.c     2013-05-02 13:58:40.000000000 +0200
++++ gnome-nettool-3.8.0-printf/src/info.c      2013-05-03 05:20:04.684921458 +0200
+@@ -232,13 +232,13 @@
+       text_rx_bytes = util_legible_bytes (netload.bytes_in);
+       text_tx_bytes = util_legible_bytes (netload.bytes_out);
+ 
+-      g_sprintf (rx_pkt, "%lld", netload.packets_in);
+-      g_sprintf (tx_pkt, "%lld", netload.packets_out);
++      g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in);
++      g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out);
+ 
+-      g_sprintf (rx_error, "%lld", netload.errors_in);
+-      g_sprintf (tx_error, "%lld", netload.errors_out);
++      g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in);
++      g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out);
+ 
+-      g_sprintf (collisions, "%lld", netload.collisions);
++      g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions);
+       
+       gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes);
+       gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt);
+diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c
+--- gnome-nettool-3.8.0/src/utils.c    2013-05-02 13:58:40.000000000 +0200
++++ gnome-nettool-3.8.0-printf/src/utils.c     2013-05-03 05:21:45.704202804 +0200
+@@ -272,7 +272,7 @@
+           unit = "KiB";
+       }
+       
+-      result = g_strdup_printf ("%lld.%lld %s", short_rx / 10,
++      result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10,
+                                   short_rx % 10, unit);
+       return result;  
+ }
+

Modified: desktop/unstable/gnome-nettool/debian/patches/series
URL: 
http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/patches/series?rev=38261&op=diff
==============================================================================
--- desktop/unstable/gnome-nettool/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-nettool/debian/patches/series [utf-8] Thu May 30 21:41:08 2013
@@ -1,1 +1,2 @@
 02_fix_ui.patch
+printf.patch