Gnome System Monitor

Merge lp:~robru/gnome-system-monitor/ubuntu into lp:~ubuntu-desktop/gnome-system-monitor/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 45
Proposed branch: lp:~robru/gnome-system-monitor/ubuntu
Merge into: lp:~ubuntu-desktop/gnome-system-monitor/ubuntu
Diff against target: 59 lines (+13/-6)
3 files modified
debian/changelog (+8/-0)
debian/control (+3/-4)
debian/control.in (+2/-2)
To merge this branch: bzr merge lp:~robru/gnome-system-monitor/ubuntu
Reviewer Review Type Date Requested Status
Michael Terry Pending
Review via email: mp+120619@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-08-12 22:20:05 +0000
3+++ debian/changelog 2012-08-21 17:13:20 +0000
4@@ -1,3 +1,11 @@
5+gnome-system-monitor (3.5.90.1-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release
8+ * debian/control:
9+ - Drop gnome-doc-tools in favor of yelp-tools
10+
11+ -- Robert Bruce Park <robru@gottengeography.ca> Tue, 21 Aug 2012 12:00:36 -0500
12+
13 gnome-system-monitor (3.5.90-0ubuntu1) quantal; urgency=low
14
15 * New upstream release
16
17=== modified file 'debian/control'
18--- debian/control 2012-05-14 05:03:19 +0000
19+++ debian/control 2012-08-21 17:13:20 +0000
20@@ -2,13 +2,12 @@
21 #
22 # Modifications should be made to debian/control.in instead.
23 # This file is regenerated automatically in the clean target.
24-
25 Source: gnome-system-monitor
26 Section: gnome
27 Priority: optional
28 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
29 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
30-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org>
31+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
32 Build-Depends: cdbs,
33 debhelper (>= 8),
34 dh-autoreconf,
35@@ -26,8 +25,8 @@
36 libglibmm-2.4-dev (>= 2.27.0),
37 libxml2-dev,
38 librsvg2-dev (>= 2.35.0),
39- gnome-doc-utils,
40- gsettings-desktop-schemas-dev
41+ gsettings-desktop-schemas-dev,
42+ yelp-tools
43 Standards-Version: 3.9.3
44 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-system-monitor/ubuntu
45
46
47=== modified file 'debian/control.in'
48--- debian/control.in 2012-05-14 05:03:19 +0000
49+++ debian/control.in 2012-08-21 17:13:20 +0000
50@@ -21,8 +21,8 @@
51 libglibmm-2.4-dev (>= 2.27.0),
52 libxml2-dev,
53 librsvg2-dev (>= 2.35.0),
54- gnome-doc-utils,
55- gsettings-desktop-schemas-dev
56+ gsettings-desktop-schemas-dev,
57+ yelp-tools
58 Standards-Version: 3.9.3
59 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-system-monitor/ubuntu
60

Subscribers

People subscribed via source and target branches