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

[dobey]

Prepare the release.

[lp:~dobey/software-center/train-magic]

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)]

Looks good to me.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-07 18:53:43 +0000
+++ debian/changelog	2016-01-07 19:00:41 +0000
@@ -1,8 +1,10 @@
-software-center (15.12.20151218) UNRELEASED; urgency=medium
+software-center (16.01+16.04.20160107) UNRELEASED; urgency=medium
 
   * Convert back to a native package to enable CI train landing.
+  * debian/patches:
+    - All patches merged upstream.
 
- -- Rodney Dawes <[e-mail]>  Fri, 18 Dec 2015 15:16:14 -0500
+ -- Rodney Dawes <[e-mail]>  Fri, 18 Dec 2015 15:16:14 -0500
 
 software-center (13.10-0ubuntu13) xenial; urgency=medium
 
 
=== modified file 'debian/compat'
--- debian/compat	2016-01-07 18:53:43 +0000
+++ debian/compat	2016-01-07 19:00:41 +0000
@@ -1,1 +1,1 @@
-7
+9
 
=== modified file 'debian/control'
--- debian/control	2016-01-07 18:53:43 +0000
+++ debian/control	2016-01-07 19:00:41 +0000
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.15.1~),
                lsb-release,
                gettext,
@@ -17,10 +17,11 @@
                python-setuptools,
                python-scour,
                python-xapian,
-               python-xdg
+               python-xdg,
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.7
 Homepage: https://launchpad.net/software-center
+Vcs-Bzr: lp:software-center
 
 Package: software-center
 Architecture: all
@@ -53,12 +54,12 @@
          oneconf (>= 0.2.6),
          python-oneconf (>= 0.3) | oneconf (<< 0.3),
          python-debtagshw,
-Recommends: lsb-release, 
-            apt-xapian-index (>= 0.38ubuntu1), 
-            update-notifier, 
+Recommends: lsb-release,
+            apt-xapian-index (>= 0.38ubuntu1),
+            update-notifier,
             software-properties-gtk,
-            sessioninstaller, 
-            xz-utils (>= 5.1.1alpha+20120614-1)
+            sessioninstaller,
+            xz-utils (>= 5.1.1alpha+20120614-1),
 Conflicts: gnome-app-install (<< 1)
 Replaces: gnome-app-install
 Provides: gnome-app-install