diff -u gnome-disk-utility-2.29.90/debian/changelog gnome-disk-utility-2.29.90/debian/changelog --- gnome-disk-utility-2.29.90/debian/changelog +++ gnome-disk-utility-2.29.90/debian/changelog @@ -1,3 +1,9 @@ +gnome-disk-utility (2.29.90-2ubuntu1) lucid; urgency=low + + * Add 02_unit_fix.patch to correct base-10 prefix from KB to kB (LP: #538732). + + -- Benjamin Drung Sun, 14 Mar 2010 16:14:32 +0100 + gnome-disk-utility (2.29.90-2) experimental; urgency=low [ Michael Biebl ] diff -u gnome-disk-utility-2.29.90/debian/control gnome-disk-utility-2.29.90/debian/control --- gnome-disk-utility-2.29.90/debian/control +++ gnome-disk-utility-2.29.90/debian/control @@ -1,7 +1,8 @@ Source: gnome-disk-utility Section: admin Priority: optional -Maintainer: Utopia Maintenance Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Utopia Maintenance Team Uploaders: Michael Biebl , Martin Pitt Build-Depends: debhelper (>= 7), cdbs, diff -u gnome-disk-utility-2.29.90/debian/patches/series gnome-disk-utility-2.29.90/debian/patches/series --- gnome-disk-utility-2.29.90/debian/patches/series +++ gnome-disk-utility-2.29.90/debian/patches/series @@ -2,0 +3 @@ +02_unit_fix.patch only in patch2: unchanged: --- gnome-disk-utility-2.29.90.orig/debian/patches/02_unit_fix.patch +++ gnome-disk-utility-2.29.90/debian/patches/02_unit_fix.patch @@ -0,0 +1,68 @@ +Description: Correct base-10 prefix from KB to kB +Author: Benjamin Drung +Bug-Ubuntu: https://launchpad.net/bugs/538732 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=612872 + +diff -pruN gnome-disk-utility-2.29.90/src/gdu/gdu-util.c gnome-disk-utility-2.29.90.new/src/gdu/gdu-util.c +--- gnome-disk-utility-2.29.90/src/gdu/gdu-util.c 2010-01-22 18:08:55.000000000 +0100 ++++ gnome-disk-utility-2.29.90.new/src/gdu/gdu-util.c 2010-03-14 15:28:40.697402238 +0100 +@@ -86,7 +86,7 @@ get_pow10_size (guint64 size) + + if (size < MEGABYTE_FACTOR) { + displayed_size = (double) size / KILOBYTE_FACTOR; +- unit = "KB"; ++ unit = "kB"; + } else if (size < GIGABYTE_FACTOR) { + displayed_size = (double) size / MEGABYTE_FACTOR; + unit = "MB"; +@@ -134,7 +134,7 @@ gdu_util_get_size_for_display (guint64 s + gchar *pow10_str; + pow10_str = get_pow10_size (size); + +- /* Translators: The first %s is the size in power-of-10 units, e.g. '100 KB' ++ /* Translators: The first %s is the size in power-of-10 units, e.g. '100 kB' + * the second %s is the size as a number e.g. '100,000 bytes' + */ + str = g_strdup_printf (_("%s (%s bytes)"), pow10_str, size_str); +@@ -883,14 +883,14 @@ gdu_util_get_speed_for_display (guint64 + char *str; + gdouble displayed_speed; + +- if (speed < 1000 * 1000) { +- displayed_speed = (double) speed / 1000.0; +- str = g_strdup_printf (_("%.1f KB/s"), displayed_speed); +- } else if (speed < 1000 * 1000 * 1000) { +- displayed_speed = (double) speed / 1000.0 / 1000.0; ++ if (speed < MEGABYTE_FACTOR) { ++ displayed_speed = (double) speed / KILOBYTE_FACTOR; ++ str = g_strdup_printf (_("%.1f kB/s"), displayed_speed); ++ } else if (speed < GIGABYTE_FACTOR) { ++ displayed_speed = (double) speed / MEGABYTE_FACTOR; + str = g_strdup_printf (_("%.1f MB/s"), displayed_speed); + } else { +- displayed_speed = (double) speed / 1000.0 / 1000.0 / 1000.0; ++ displayed_speed = (double) speed / GIGABYTE_FACTOR; + str = g_strdup_printf (_("%.1f GB/s"), displayed_speed); + } + +diff -pruN gnome-disk-utility-2.29.90/src/gdu-gtk/gdu-size-widget.c gnome-disk-utility-2.29.90.new/src/gdu-gtk/gdu-size-widget.c +--- gnome-disk-utility-2.29.90/src/gdu-gtk/gdu-size-widget.c 2010-01-20 19:41:00.000000000 +0100 ++++ gnome-disk-utility-2.29.90.new/src/gdu-gtk/gdu-size-widget.c 2010-03-14 15:30:39.796658845 +0100 +@@ -86,7 +86,7 @@ gdu_unit_get_name (GduUnit unit) + + switch (unit) { + case GDU_UNIT_KB: +- ret = _("KB"); ++ ret = _("kB"); + break; + default: + g_warning ("Unknown unit %d", unit); +@@ -124,7 +124,7 @@ gdu_unit_guess (const gchar *str) + + ret = GDU_UNIT_NOT_SET; + +- if (strstr (str, "KB") != NULL) { ++ if (strstr (str, "kB") != NULL) { + ret = GDU_UNIT_KB; + } else if (strstr (str, "MB") != NULL) { + ret = GDU_UNIT_MB;