Merge lp:~dobey/software-center/train-magic into lp:software-center

Proposed by dobey on 2016-01-07
Status: Merged
Approved by: dobey on 2016-01-07
Approved revision: 3340
Merged at revision: 3340
Proposed branch: lp:~dobey/software-center/train-magic
Merge into: lp:software-center
Diff against target: 67 lines (+13/-10)
3 files modified
debian/changelog (+4/-2)
debian/compat (+1/-1)
debian/control (+8/-7)
To merge this branch: bzr merge lp:~dobey/software-center/train-magic
Reviewer Review Type Date Requested Status
Kyle Fazzari (community) Approve on 2016-01-07
software-store-developers 2016-01-07 Pending
Review via email: mp+281918@code.launchpad.net

Commit message

Prepare the release.

To post a comment you must log in.
3339. By dobey on 2016-01-07

Merge the debian tree in for CI train landing support.

3340. By dobey on 2016-01-07

Prepare the debian tree for a release.

Kyle Fazzari (kyrofa) wrote :

Looks good to me.

review: Approve

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 2016-01-07 18:53:43 +0000
3+++ debian/changelog 2016-01-07 19:00:41 +0000
4@@ -1,8 +1,10 @@
5-software-center (15.12.20151218) UNRELEASED; urgency=medium
6+software-center (16.01+16.04.20160107) UNRELEASED; urgency=medium
7
8 * Convert back to a native package to enable CI train landing.
9+ * debian/patches:
10+ - All patches merged upstream.
11
12- -- Rodney Dawes <rodney.dawes@ubuntu.com> Fri, 18 Dec 2015 15:16:14 -0500
13+ -- Rodney Dawes <rodney.dawes@canonical.com> Fri, 18 Dec 2015 15:16:14 -0500
14
15 software-center (13.10-0ubuntu13) xenial; urgency=medium
16
17
18=== modified file 'debian/compat'
19--- debian/compat 2016-01-07 18:53:43 +0000
20+++ debian/compat 2016-01-07 19:00:41 +0000
21@@ -1,1 +1,1 @@
22-7
23+9
24
25=== modified file 'debian/control'
26--- debian/control 2016-01-07 18:53:43 +0000
27+++ debian/control 2016-01-07 19:00:41 +0000
28@@ -2,7 +2,7 @@
29 Section: gnome
30 Priority: optional
31 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
32-Build-Depends: debhelper (>= 7.0.50),
33+Build-Depends: debhelper (>= 9),
34 dpkg-dev (>= 1.15.1~),
35 lsb-release,
36 gettext,
37@@ -17,10 +17,11 @@
38 python-setuptools,
39 python-scour,
40 python-xapian,
41- python-xdg
42+ python-xdg,
43 Standards-Version: 3.9.6
44 X-Python-Version: >= 2.7
45 Homepage: https://launchpad.net/software-center
46+Vcs-Bzr: lp:software-center
47
48 Package: software-center
49 Architecture: all
50@@ -53,12 +54,12 @@
51 oneconf (>= 0.2.6),
52 python-oneconf (>= 0.3) | oneconf (<< 0.3),
53 python-debtagshw,
54-Recommends: lsb-release,
55- apt-xapian-index (>= 0.38ubuntu1),
56- update-notifier,
57+Recommends: lsb-release,
58+ apt-xapian-index (>= 0.38ubuntu1),
59+ update-notifier,
60 software-properties-gtk,
61- sessioninstaller,
62- xz-utils (>= 5.1.1alpha+20120614-1)
63+ sessioninstaller,
64+ xz-utils (>= 5.1.1alpha+20120614-1),
65 Conflicts: gnome-app-install (<< 1)
66 Replaces: gnome-app-install
67 Provides: gnome-app-install

Subscribers

People subscribed via source and target branches