Merge lp:~dobey/ubuntu/precise/ubuntuone-installer/release-2-99-2 into lp:ubuntu/precise/ubuntuone-installer

Proposed by dobey
Status: Merged
Merged at revision: 10
Proposed branch: lp:~dobey/ubuntu/precise/ubuntuone-installer/release-2-99-2
Merge into: lp:ubuntu/precise/ubuntuone-installer
Diff against target: 50 lines (+13/-3)
3 files modified
PKG-INFO (+6/-2)
debian/changelog (+6/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu/precise/ubuntuone-installer/release-2-99-2
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+88958@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 'PKG-INFO'
2--- PKG-INFO 2012-01-04 18:26:01 +0000
3+++ PKG-INFO 2012-01-17 23:05:37 +0000
4@@ -1,6 +1,6 @@
5 Metadata-Version: 1.1
6 Name: ubuntuone-installer
7-Version: 2.99.1
8+Version: 2.99.2
9 Summary: Ubuntu One Installer
10 Home-page: https://launchpad.net/ubuntuone-installer
11 Author: Ubuntu One Hackers
12@@ -12,6 +12,10 @@
13 Requires: aptdaemon.client
14 Requires: aptdaemon.gtk3widgets
15 Requires: defer
16-Requires: gi.repository
17+Requires: gi.repository.GLib
18+Requires: gi.repository.GObject
19+Requires: gi.repository.Gdk
20+Requires: gi.repository.Gtk
21+Requires: gi.repository.Pango
22 Requires: twisted.internet.defer
23 Provides: ubuntuone
24
25=== modified file 'debian/changelog'
26--- debian/changelog 2012-01-04 18:26:27 +0000
27+++ debian/changelog 2012-01-17 23:05:37 +0000
28@@ -1,3 +1,9 @@
29+ubuntuone-installer (2.99.2-0ubuntu1) precise; urgency=low
30+
31+ * New upstream release.
32+
33+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 17 Jan 2012 13:28:12 -0500
34+
35 ubuntuone-installer (2.99.1-0ubuntu1) precise; urgency=low
36
37 * New upstream release.
38
39=== modified file 'setup.py'
40--- setup.py 2012-01-04 18:26:01 +0000
41+++ setup.py 2012-01-17 23:05:37 +0000
42@@ -52,7 +52,7 @@
43
44 DistUtilsExtra.auto.setup(
45 name='ubuntuone-installer',
46- version='2.99.1',
47+ version='2.99.2',
48 license='GPL v3',
49 author='Ubuntu One Hackers',
50 author_email='ubuntuone-users@lists.launchpad.net',

Subscribers

People subscribed via source and target branches

to all changes: