r12875 - in /desktop/unstable/gnome-system-monitor/debian: changelog control control.in patches/80_use_units_coherent_with_gnome_desktop.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sat Sep 29 04:42:13 UTC 2007
Author: slomo
Date: Sat Sep 29 04:42:13 2007
New Revision: 12875
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12875
Log:
* New upstream release:
+ Fixes invalid conversion from 'pid_t*' to 'unsigned int'
(Closes: #443007).
+ debian/control.in:
- Update libgtop2-dev build dependency to >= 2.19.3.
- Build depend on libpcre3-dev >= 6.4 and libgtkmm-2.4-dev >= 2.8.
+ debian/rules:
- Enable pcre support.
* debian/patches/80_use_units_coherent_with_gnome_desktop.patch:
+ Use units coherent with the other Gnome apps, i.e. don't use
kibibytes, mebibytes and friends. Patch by Christian Persch, taken
from Ubuntu.
Added:
desktop/unstable/gnome-system-monitor/debian/patches/80_use_units_coherent_with_gnome_desktop.patch
Modified:
desktop/unstable/gnome-system-monitor/debian/changelog
desktop/unstable/gnome-system-monitor/debian/control
desktop/unstable/gnome-system-monitor/debian/control.in
desktop/unstable/gnome-system-monitor/debian/rules
Modified: desktop/unstable/gnome-system-monitor/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/changelog?rev=12875&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/changelog (original)
+++ desktop/unstable/gnome-system-monitor/debian/changelog Sat Sep 29 04:42:13 2007
@@ -1,3 +1,20 @@
+gnome-system-monitor (2.20.0-1) unstable; urgency=low
+
+ * New upstream release:
+ + Fixes invalid conversion from 'pid_t*' to 'unsigned int'
+ (Closes: #443007).
+ + debian/control.in:
+ - Update libgtop2-dev build dependency to >= 2.19.3.
+ - Build depend on libpcre3-dev >= 6.4 and libgtkmm-2.4-dev >= 2.8.
+ + debian/rules:
+ - Enable pcre support.
+ * debian/patches/80_use_units_coherent_with_gnome_desktop.patch:
+ + Use units coherent with the other Gnome apps, i.e. don't use
+ kibibytes, mebibytes and friends. Patch by Christian Persch, taken
+ from Ubuntu.
+
+ -- Sebastian Dröge <slomo at debian.org> Sat, 29 Sep 2007 06:17:12 +0200
+
gnome-system-monitor (2.18.2-1) unstable; urgency=low
* New upstream stable release.
Modified: desktop/unstable/gnome-system-monitor/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control?rev=12875&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control (original)
+++ desktop/unstable/gnome-system-monitor/debian/control Sat Sep 29 04:42:13 2007
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Loic Minier <lool at dooz.org>, Oystein Gisnas <oystein at gisnas.net>, Riccardo Setti <giskard at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Loic Minier <lool at dooz.org>, Oystein Gisnas <oystein at gisnas.net>, Riccardo Setti <giskard at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs (>= 0.4.0),
debhelper (>= 5),
libgtk2.0-dev (>= 2.8.0),
@@ -10,7 +10,7 @@
libgconf2-dev (>= 2.6.0),
libwnck-dev (>= 2.9.92),
libxml2-dev,
- libgtop2-dev (>= 2.14.6),
+ libgtop2-dev (>= 2.19.3),
gettext,
scrollkeeper,
gnome-pkg-tools (>= 0.10),
@@ -19,6 +19,8 @@
libglib2.0-dev (>= 2.9.1),
pkg-config (>= 0.19),
gnome-icon-theme (>= 2.15.3),
+ libpcre3-dev (>= 6.4),
+ libgtkmm-2.4-dev (>= 2.8),
gnome-doc-utils
Standards-Version: 3.7.2
Modified: desktop/unstable/gnome-system-monitor/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control.in?rev=12875&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control.in (original)
+++ desktop/unstable/gnome-system-monitor/debian/control.in Sat Sep 29 04:42:13 2007
@@ -10,7 +10,7 @@
libgconf2-dev (>= 2.6.0),
libwnck-dev (>= 2.9.92),
libxml2-dev,
- libgtop2-dev (>= 2.14.6),
+ libgtop2-dev (>= 2.19.3),
gettext,
scrollkeeper,
gnome-pkg-tools (>= 0.10),
@@ -19,6 +19,8 @@
libglib2.0-dev (>= 2.9.1),
pkg-config (>= 0.19),
gnome-icon-theme (>= 2.15.3),
+ libpcre3-dev (>= 6.4),
+ libgtkmm-2.4-dev (>= 2.8),
gnome-doc-utils
Standards-Version: 3.7.2
Added: 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=12875&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/80_use_units_coherent_with_gnome_desktop.patch (added)
+++ desktop/unstable/gnome-system-monitor/debian/patches/80_use_units_coherent_with_gnome_desktop.patch Sat Sep 29 04:42:13 2007
@@ -1,0 +1,65 @@
+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 @@
+
+
+
+-#define KIBIBYTE_FACTOR (1UL << 10)
+-#define MEBIBYTE_FACTOR (1UL << 20)
+-#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.
+- **/
+-
+-gchar*
+-SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size)
+-{
+- if (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) {
+- factor = KIBIBYTE_FACTOR;
+- format = N_("%.1f KiB");
+- } else if (size < (GnomeVFSFileSize) GIBIBYTE_FACTOR) {
+- factor = MEBIBYTE_FACTOR;
+- format = N_("%.1f MiB");
+- } else {
+- factor = GIBIBYTE_FACTOR;
+- format = N_("%.1f GiB");
+- }
+-
+- return g_strdup_printf(_(format), size / (double)factor);
+- }
+-}
+-
+-
+-
+ 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/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/rules?rev=12875&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/rules (original)
+++ desktop/unstable/gnome-system-monitor/debian/rules Sat Sep 29 04:42:13 2007
@@ -8,13 +8,13 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-pcrecpp
DEB_INSTALL_MANPAGES_gnome-system-monitor += debian/gnome-system-monitor.1
build/gnome-system-monitor::
docbook-to-man debian/gnome-system-monitor.sgml \
- >debian/gnome-system-monitor.1
+ > debian/gnome-system-monitor.1
binary-post-install/gnome-system-monitor::
rm -rf debian/gnome-system-monitor/var
More information about the pkg-gnome-commits
mailing list