Merge lp:click/devel into lp:click

[Michael Vogt]

Add ubuntu-sdk-15.10-{,papi,qml.html}-dev1 sdk into the chroot.

[lp:click/devel]

575. By Michael Vogt on 2015-07-02

debian/control: drop X-Auto-Uploader: no-rewrite-version

576. By Michael Vogt on 2015-07-02

debian/source/format: move to 3.0 (quilt)

577. By Michael Vogt on 2015-07-02

.bzr-builddeb/default.conf: use split = true

[Robert Bruce Park (robru)]

Silo 45 (which has this MP) has been approved by QA, but I need this MP top-approved before i can publish:

https://ci-train.ubuntu.com/job/ubuntu-landing-045-2-publish/3/console

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2015-07-02 11:43:00 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'click/chroot.py'
--- click/chroot.py	2015-05-01 07:23:33 +0000
+++ click/chroot.py	2015-07-02 11:43:00 +0000
@@ -1,6 +1,7 @@
 # Copyright (C) 2013 Canonical Ltd.
 # Authors: Colin Watson <[e-mail]>,
 #          Brian Murray <[e-mail]>
+#          Michael Vogt <[e-mail]>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,8 +54,10 @@
     "ubuntu-sdk-15.04-html": "ubuntu-sdk-15.04",
     "ubuntu-sdk-15.04-papi": "ubuntu-sdk-15.04",
     "ubuntu-sdk-15.04-qml": "ubuntu-sdk-15.04",
-    # core
-    "ubuntu-core-15.04-dev1": "ubuntu-core-15.04",
+    # 15.10
+    "ubuntu-sdk-15.10-html-dev1": "ubuntu-sdk-15.10-dev1",
+    "ubuntu-sdk-15.10-papi-dev1": "ubuntu-sdk-15.10-dev1",
+    "ubuntu-sdk-15.10-qml-dev1": "ubuntu-sdk-15.10-dev1",
     }
 
 
@@ -63,7 +66,7 @@
     "ubuntu-sdk-14.04": "trusty",
     "ubuntu-sdk-14.10": "utopic",
     "ubuntu-sdk-15.04": "vivid",
-    "ubuntu-core-15.04": "vivid",
+    "ubuntu-sdk-15.10": "wily",
     }
 
 
@@ -182,9 +185,17 @@
         #  oxideqt-codecs/oxidec-codecs-extras is sorted
         "oxideqt-codecs-extra",
         ],
-    "ubuntu-core-15.04-dev1": [
-        "ubuntu-core-libs:{TARGET}",
-        "ubuntu-core-libs-dev:{TARGET}",
+    "ubuntu-sdk-15.10-dev1": [
+        # the sdk libs
+        "ubuntu-sdk-libs:{TARGET}",
+        "ubuntu-sdk-libs-dev:{TARGET}",
+        # the native build tools
+        "ubuntu-sdk-libs-tools",
+        # FIXME: see
+        #  http://pad.lv/~mvo/oxide/crossbuild-friendly/+merge/234093
+        # we help the apt resolver here until the
+        #  oxideqt-codecs/oxidec-codecs-extras is sorted
+        "oxideqt-codecs-extra",
         ],
     }
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-07 14:47:11 +0000
+++ debian/changelog	2015-07-02 11:43:00 +0000
@@ -1,3 +1,11 @@
+click (0.4.39.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * lp:~mvo/click/lp1456328-15.10-devlibs:
+    - add ubuntu-sdk-15.10-dev1
+    - remove ubuntu-core-15.04-dev1
+
+ -- Michael Vogt <[e-mail]>  Thu, 02 Jul 2015 09:05:10 +0200
+
 click (0.4.39) vivid; urgency=low
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'debian/control'
--- debian/control	2014-10-10 07:10:23 +0000
+++ debian/control	2015-07-02 11:43:00 +0000
@@ -6,7 +6,6 @@
 Build-Depends: debhelper (>= 9~), dh-autoreconf, intltool, python3:any (>= 3.2), python3-all:any, python3-setuptools, python3-apt, python3-debian, python3-gi, python3:any (>= 3.3) | python3-mock, pep8, python3-pep8, pyflakes, python3-sphinx, pkg-config, valac, gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), libglib2.0-dev (>= 2.34), gir1.2-glib-2.0, libjson-glib-dev (>= 0.10), libgee-0.8-dev, libpackagekit-glib2-dev (>= 0.7.2), python3-coverage, python3-six, dh-systemd (>= 1.3)
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-managed-branches/click/click
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-managed-branches/click/click/files
-X-Auto-Uploader: no-rewrite-version
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
 XS-Testsuite: autopkgtest

=== modified file 'debian/source/format'
--- debian/source/format	2013-04-10 15:55:06 +0000
+++ debian/source/format	2015-07-02 11:43:00 +0000
@@ -1,1 +1,1 @@
-3.0 (native)
+3.0 (quilt)