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
=== modified file 'debian/changelog'
--- debian/changelog 2012-08-12 22:20:05 +0000
+++ debian/changelog 2012-08-21 17:13:20 +0000
@@ -1,3 +1,11 @@
1gnome-system-monitor (3.5.90.1-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release
4 * debian/control:
5 - Drop gnome-doc-tools in favor of yelp-tools
6
7 -- Robert Bruce Park <robru@gottengeography.ca> Tue, 21 Aug 2012 12:00:36 -0500
8
1gnome-system-monitor (3.5.90-0ubuntu1) quantal; urgency=low9gnome-system-monitor (3.5.90-0ubuntu1) quantal; urgency=low
210
3 * New upstream release11 * New upstream release
412
=== modified file 'debian/control'
--- debian/control 2012-05-14 05:03:19 +0000
+++ debian/control 2012-08-21 17:13:20 +0000
@@ -2,13 +2,12 @@
2# 2#
3# Modifications should be made to debian/control.in instead.3# Modifications should be made to debian/control.in instead.
4# This file is regenerated automatically in the clean target.4# This file is regenerated automatically in the clean target.
5
6Source: gnome-system-monitor5Source: gnome-system-monitor
7Section: gnome6Section: gnome
8Priority: optional7Priority: optional
9Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>8Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
10XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>9XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
11Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org>10Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
12Build-Depends: cdbs,11Build-Depends: cdbs,
13 debhelper (>= 8),12 debhelper (>= 8),
14 dh-autoreconf,13 dh-autoreconf,
@@ -26,8 +25,8 @@
26 libglibmm-2.4-dev (>= 2.27.0),25 libglibmm-2.4-dev (>= 2.27.0),
27 libxml2-dev,26 libxml2-dev,
28 librsvg2-dev (>= 2.35.0),27 librsvg2-dev (>= 2.35.0),
29 gnome-doc-utils,28 gsettings-desktop-schemas-dev,
30 gsettings-desktop-schemas-dev29 yelp-tools
31Standards-Version: 3.9.330Standards-Version: 3.9.3
32Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-system-monitor/ubuntu31Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-system-monitor/ubuntu
3332
3433
=== modified file 'debian/control.in'
--- debian/control.in 2012-05-14 05:03:19 +0000
+++ debian/control.in 2012-08-21 17:13:20 +0000
@@ -21,8 +21,8 @@
21 libglibmm-2.4-dev (>= 2.27.0),21 libglibmm-2.4-dev (>= 2.27.0),
22 libxml2-dev,22 libxml2-dev,
23 librsvg2-dev (>= 2.35.0),23 librsvg2-dev (>= 2.35.0),
24 gnome-doc-utils,24 gsettings-desktop-schemas-dev,
25 gsettings-desktop-schemas-dev25 yelp-tools
26Standards-Version: 3.9.326Standards-Version: 3.9.3
27Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-system-monitor/ubuntu27Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-system-monitor/ubuntu
2828

Subscribers

People subscribed via source and target branches