Merge lp:~nataliabidart/ubuntu/precise/ubuntuone-storage-protocol/ubuntuone-storage-protocol-2.99.1 into lp:ubuntu/precise/ubuntuone-storage-protocol

Proposed by Natalia Bidart
Status: Merged
Merge reported by: dobey
Merged at revision: not available
Proposed branch: lp:~nataliabidart/ubuntu/precise/ubuntuone-storage-protocol/ubuntuone-storage-protocol-2.99.1
Merge into: lp:ubuntu/precise/ubuntuone-storage-protocol
Diff against target: 70 lines (+13/-6)
5 files modified
PKG-INFO (+1/-1)
debian/changelog (+8/-0)
debian/control (+2/-2)
debian/watch (+1/-2)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu/precise/ubuntuone-storage-protocol/ubuntuone-storage-protocol-2.99.1
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+87404@code.launchpad.net

Description of the change

- Updating debian/watch to download from latest milestone.
- debian/control: updating Standards-version to 3.9.2.
- New upstream release.

To post a comment you must log in.
41. By Natalia Bidart

- debian/watch: download from latest milestone.

Revision history for this message
dobey (dobey) :
review: Approve

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 2011-12-21 13:46:52 +0000
3+++ PKG-INFO 2012-01-03 19:35:27 +0000
4@@ -1,6 +1,6 @@
5 Metadata-Version: 1.0
6 Name: ubuntuone-storage-protocol
7-Version: 2.99.0
8+Version: 2.99.1
9 Summary: UNKNOWN
10 Home-page: UNKNOWN
11 Author: UNKNOWN
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2011-12-21 13:46:52 +0000
15+++ debian/changelog 2012-01-03 19:35:27 +0000
16@@ -1,3 +1,11 @@
17+ubuntuone-storage-protocol (2.99.1-0ubuntu1) UNRELEASED; urgency=low
18+
19+ * New upstream release.
20+ * debian/watch: download from latest milestone.
21+ * debian/control: updating Standards-version to 3.9.2.
22+
23+ -- Natalia Bidart (nessita) <natalia.bidart@canonical.com> Tue, 03 Jan 2012 16:07:08 -0300
24+
25 ubuntuone-storage-protocol (2.99.0-0ubuntu1) precise; urgency=low
26
27 * New upstream release.
28
29=== modified file 'debian/control'
30--- debian/control 2011-12-21 13:46:52 +0000
31+++ debian/control 2012-01-03 19:35:27 +0000
32@@ -4,14 +4,14 @@
33 X-Python-Version: >= 2.6
34 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
35 XSBC-Original-Maintainer: Rick McBride <rick.mcbride@canonical.com>
36-Build-Depends: debhelper (>= 7.0.14),
37+Build-Depends: debhelper (>= 7.0.14),
38 python-all (>= 2.6.6-3)
39 Build-Depends-Indep: protobuf-compiler (>> 2.0.3-0ubuntu1),
40 python-twisted-core,
41 python-oauth (>= 1.0~svn1092),
42 python-openssl,
43 python-protobuf (>= 2.0.3-0ubuntu1)
44-Standards-Version: 3.9.1
45+Standards-Version: 3.9.2
46 Homepage: https://one.ubuntu.com
47
48 Package: python-ubuntuone-storageprotocol
49
50=== modified file 'debian/watch'
51--- debian/watch 2009-06-30 12:00:00 +0000
52+++ debian/watch 2012-01-03 19:35:27 +0000
53@@ -1,3 +1,2 @@
54 version=3
55-http://launchpad.net/ubuntuone-storage-protocol/+download .*/ubuntuone-storage-protocol-([0-9.]+)\.tar\.gz
56-
57+http://launchpad.net/ubuntuone-storage-protocol/stable-3-0/2.99.1 .*/ubuntuone-storage-protocol-([0-9.]+)\.tar\.gz
58
59=== modified file 'setup.py'
60--- setup.py 2011-12-21 13:46:52 +0000
61+++ setup.py 2012-01-03 19:35:27 +0000
62@@ -70,7 +70,7 @@
63
64
65 setup(name='ubuntuone-storage-protocol',
66- version='2.99.0',
67+ version='2.99.1',
68 packages=['ubuntuone',
69 'ubuntuone.storageprotocol'],
70 extra_path='ubuntuone-storage-protocol',

Subscribers

People subscribed via source and target branches