r15095 - in /desktop/unstable/gnome-system-monitor/debian: changelog patches/80_use_units_coherent_with_gnome_desktop.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Fri Mar 14 11:17:53 UTC 2008
Author: slomo
Date: Fri Mar 14 11:17:52 2008
New Revision: 15095
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15095
Log:
+ debian/patches/80_use_units_coherent_with_gnome_desktop.patch:
- Updated to apply cleanly again and define a function with the
correct signature instead of defining to one with another signature.
Modified:
desktop/unstable/gnome-system-monitor/debian/changelog
desktop/unstable/gnome-system-monitor/debian/patches/80_use_units_coherent_with_gnome_desktop.patch
desktop/unstable/gnome-system-monitor/debian/patches/series
Modified: desktop/unstable/gnome-system-monitor/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/changelog?rev=15095&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/changelog (original)
+++ desktop/unstable/gnome-system-monitor/debian/changelog Fri Mar 14 11:17:52 2008
@@ -8,6 +8,9 @@
* New upstream stable release:
+ debian/control.in:
- Update build dependencies.
+ + debian/patches/80_use_units_coherent_with_gnome_desktop.patch:
+ - Updated to apply cleanly again and define a function with the
+ correct signature instead of defining to one with another signature.
-- Sebastian Dröge <slomo at debian.org> Fri, 14 Mar 2008 12:04:47 +0100
Modified: desktop/unstable/gnome-system-monitor/debian/patches/80_use_units_coherent_with_gnome_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/patches/80_use_units_coherent_with_gnome_desktop.patch?rev=15095&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/80_use_units_coherent_with_gnome_desktop.patch (original)
+++ desktop/unstable/gnome-system-monitor/debian/patches/80_use_units_coherent_with_gnome_desktop.patch Fri Mar 14 11:17:52 2008
@@ -1,7 +1,6 @@
-diff -Nur gnome-system-monitor-2.19.91.1/src/util.cpp gnome-system-monitor-2.19.91.1.new/src/util.cpp
---- gnome-system-monitor-2.19.91.1/src/util.cpp 2007-07-03 11:50:02.000000000 +0200
-+++ gnome-system-monitor-2.19.91.1.new/src/util.cpp 2007-08-30 10:37:31.572455196 +0200
-@@ -54,48 +54,6 @@
+--- gnome-system-monitor/src/util.cpp.old 2008-03-14 12:12:56.000000000 +0100
++++ gnome-system-monitor/src/util.cpp 2008-03-14 12:15:52.000000000 +0100
+@@ -136,11 +136,6 @@
@@ -10,30 +9,26 @@
-#define GIBIBYTE_FACTOR (1UL << 30)
-
-
--/**
-- * SI_gnome_vfs_format_file_size_for_display:
-- * @size:
-- *
-- * Formats the file size passed in @bytes in a way that is easy for
-- * the user to read. Gives the size in bytes, kibibytes, mebibytes or
-- * gibibytes, choosing whatever is appropriate.
-- *
-- * Returns: a newly allocated string with the size ready to be shown.
-- **/
+ /**
+ * SI_gnome_vfs_format_file_size_for_display:
+ * @size:
+@@ -155,32 +150,9 @@
+ gchar*
+ SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size, GnomeVFSFileSize max_size)
+ {
+- if (max_size == 0)
+- max_size = size;
-
--gchar*
--SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size)
--{
-- if (size < (GnomeVFSFileSize) KIBIBYTE_FACTOR) {
+- if (max_size < (GnomeVFSFileSize) KIBIBYTE_FACTOR) {
- return g_strdup_printf (dngettext(GETTEXT_PACKAGE, "%u byte", "%u bytes",(guint) size), (guint) size);
- } else {
- guint factor;
- const char* format;
-
-- if (size < (GnomeVFSFileSize) MEBIBYTE_FACTOR) {
+- if (max_size < (GnomeVFSFileSize) MEBIBYTE_FACTOR) {
- factor = KIBIBYTE_FACTOR;
- format = N_("%.1f KiB");
-- } else if (size < (GnomeVFSFileSize) GIBIBYTE_FACTOR) {
+- } else if (max_size < (GnomeVFSFileSize) GIBIBYTE_FACTOR) {
- factor = MEBIBYTE_FACTOR;
- format = N_("%.1f MiB");
- } else {
@@ -43,23 +38,11 @@
-
- return g_strdup_printf(_(format), size / (double)factor);
- }
--}
--
++ return gnome_vfs_format_file_size_for_display (size);
+ }
+
-
-
gboolean
load_symbols(const char *module, ...)
{
-diff -Nur gnome-system-monitor-2.19.91.1/src/util.h gnome-system-monitor-2.19.91.1.new/src/util.h
---- gnome-system-monitor-2.19.91.1/src/util.h 2007-07-03 11:41:42.000000000 +0200
-+++ gnome-system-monitor-2.19.91.1.new/src/util.h 2007-08-30 10:37:31.572455196 +0200
-@@ -32,8 +32,7 @@
- unsigned pid);
-
-
--gchar*
--SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size);
-+#define SI_gnome_vfs_format_file_size_for_display gnome_vfs_format_file_size_for_display
-
-
- gboolean
Modified: desktop/unstable/gnome-system-monitor/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/patches/series?rev=15095&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/series (original)
+++ desktop/unstable/gnome-system-monitor/debian/patches/series Fri Mar 14 11:17:52 2008
@@ -1,3 +1,2 @@
01_load_library_instead_of_so.patch
-04_menu_change.patch
80_use_units_coherent_with_gnome_desktop.patch
More information about the pkg-gnome-commits
mailing list