diff -u glib2.0-2.20.1/debian/changelog glib2.0-2.20.1/debian/changelog --- glib2.0-2.20.1/debian/changelog +++ glib2.0-2.20.1/debian/changelog @@ -1,3 +1,10 @@ +glib2.0 (2.20.1-0ubuntu3) karmic; urgency=low + + * debian/patches/05_iec_standard.patch: Use IEC standard for binary byte + units (LP: #369525). + + -- Benjamin Drung Wed, 29 Apr 2009 23:11:42 +0200 + glib2.0 (2.20.1-0ubuntu2) jaunty; urgency=low * Build-depend on libgamin-dev | libfam-dev, not libfam-dev | libgamin-dev; diff -u glib2.0-2.20.1/debian/patches/series glib2.0-2.20.1/debian/patches/series --- glib2.0-2.20.1/debian/patches/series +++ glib2.0-2.20.1/debian/patches/series @@ -5,2 +5,3 @@ 04_homedir_env.patch +05_iec_standard.patch 60_wait-longer-for-threads-to-die.patch only in patch2: unchanged: --- glib2.0-2.20.1.orig/debian/patches/05_iec_standard.patch +++ glib2.0-2.20.1/debian/patches/05_iec_standard.patch @@ -0,0 +1,44 @@ +# Ubuntu: https://launchpad.net/bugs/369525 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=554172 +# Description: Use IEC standard for binary byte units. +# More details: https://blueprints.launchpad.net/ubuntu/+spec/desktop-unit-consistency/ +diff -pruN glib2.0-2.20.1.orig/glib/gfileutils.c glib2.0-2.20.1/glib/gfileutils.c +--- glib2.0-2.20.1.orig/glib/gfileutils.c 2009-04-01 01:04:20.000000000 +0200 ++++ glib2.0-2.20.1/glib/gfileutils.c 2009-04-29 23:04:41.000000000 +0200 +@@ -1714,11 +1714,11 @@ g_build_filename (const gchar *first_ele + * @size: a size in bytes. + * + * Formats a size (for example the size of a file) into a human readable string. +- * Sizes are rounded to the nearest size prefix (KB, MB, GB) and are displayed +- * rounded to the nearest tenth. E.g. the file size 3292528 bytes will be +- * converted into the string "3.1 MB". ++ * Sizes are rounded to the nearest size prefix (KiB, MiB, GiB) and are ++ * displayed rounded to the nearest tenth. E.g. the file size 3292528 bytes ++ * will be converted into the string "3.1 MiB". + * +- * The prefix units base is 1024 (i.e. 1 KB is 1024 bytes). ++ * The prefix units base is 1024 (i.e. 1 KiB is 1024 bytes). + * + * This string should be freed with g_free() when not needed any longer. + * +@@ -1739,17 +1739,17 @@ g_format_size_for_display (goffset size) + if (size < (goffset) MEGABYTE_FACTOR) + { + displayed_size = (gdouble) size / KILOBYTE_FACTOR; +- return g_strdup_printf (_("%.1f KB"), displayed_size); ++ return g_strdup_printf (_("%.1f KiB"), displayed_size); + } + else if (size < (goffset) GIGABYTE_FACTOR) + { + displayed_size = (gdouble) size / MEGABYTE_FACTOR; +- return g_strdup_printf (_("%.1f MB"), displayed_size); ++ return g_strdup_printf (_("%.1f MiB"), displayed_size); + } + else + { + displayed_size = (gdouble) size / GIGABYTE_FACTOR; +- return g_strdup_printf (_("%.1f GB"), displayed_size); ++ return g_strdup_printf (_("%.1f GiB"), displayed_size); + } + } + }