← Back to branch summary

~ubuntu-branches/ubuntu/precise/gnome-system-monitor/precise

« back to all changes in this revision

Viewing changes to debian/patches/02_lpi.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2011-12-28 14:46:35 UTC
  • mfrom: (1.1.63)
  • Revision ID: package-import@ubuntu.com-20111228144635-3sb1b3a6r2fz8cod
Tags: 3.3.3-0ubuntu1
https://launchpad.net/bugs/531762
https://launchpad.net/bugs/485712
* New upstream unstable release.
  - Shows whether OS is 32-bit or 64-bit (LP: #531762)
  - Network load default colors improved for the colorblind (LP: #485712)
  - UI streamlined (status bar removed, fewer default columns in
    processes tab, etc.)
* debian/patches/02_lpi.patch: Refreshed
* debian/watch: Watch for unstable releases

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_lpi.patch
1
 
Index: gnome-system-monitor-3.1.3/src/interface.cpp
 
1
Index: gnome-system-monitor-3.3.3/src/interface.cpp
2
2
===================================================================
3
 
--- gnome-system-monitor-3.1.3.orig/src/interface.cpp   2011-07-02 19:32:34.000000000 -0400
4
 
+++ gnome-system-monitor-3.1.3/src/interface.cpp        2011-07-12 14:05:16.000000000 -0400
 
3
--- gnome-system-monitor-3.3.3.orig/src/interface.cpp   2011-12-11 12:38:41.000000000 -0600
 
4
+++ gnome-system-monitor-3.3.3/src/interface.cpp        2011-12-28 14:11:06.387179515 -0600
5
5
@@ -29,6 +29,7 @@
6
6
 #include <signal.h>
7
7
 #include <gdk/gdkkeysyms.h>
10
10
 
11
11
 #include "procman.h"
12
12
 #include "callbacks.h"
13
 
@@ -138,6 +139,7 @@
 
13
@@ -162,6 +163,7 @@
14
14
     "    </menu>"
15
15
     "    <menu name=\"HelpMenu\" action=\"Help\">"
16
16
     "      <menuitem name=\"HelpContentsMenu\" action=\"HelpContents\" />"
18
18
     "      <menuitem name=\"HelpAboutMenu\" action=\"About\" />"
19
19
     "    </menu>"
20
20
     "  </menubar>"
21
 
@@ -652,6 +654,9 @@
 
21
@@ -657,6 +659,9 @@
22
22
         g_error("building menus failed");
23
23
     }
24
24
 
28
28
     procdata->action_group = gtk_action_group_new ("ProcmanActions");
29
29
     gtk_action_group_set_translation_domain (procdata->action_group, NULL);
30
30
     gtk_action_group_add_actions (procdata->action_group,
31
 
Index: gnome-system-monitor-3.1.3/configure.ac
 
31
Index: gnome-system-monitor-3.3.3/configure.ac
32
32
===================================================================
33
 
--- gnome-system-monitor-3.1.3.orig/configure.ac        2011-07-04 19:55:47.000000000 -0400
34
 
+++ gnome-system-monitor-3.1.3/configure.ac     2011-07-12 14:21:43.767583880 -0400
35
 
@@ -36,7 +36,7 @@
 
33
--- gnome-system-monitor-3.3.3.orig/configure.ac        2011-12-19 19:04:38.000000000 -0600
 
34
+++ gnome-system-monitor-3.3.3/configure.ac     2011-12-28 14:11:23.799265849 -0600
 
35
@@ -38,7 +38,7 @@
36
36
 LIBXML_REQUIRED=2.0
37
37
 RSVG_REQUIRED=2.12
38
38
 
39
 
-PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-3.0 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED)
40
 
+PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-3.0 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED launchpad-integration-3.0)
 
39
-PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-3.0 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED gmodule-2.0)
 
40
+PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-3.0 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED gmodule-2.0 launchpad-integration-3.0)
41
41
 
42
42
 # Compiler warnings
43
43
 GNOME_COMPILE_WARNINGS([maximum])