Merge lp:~morphis/lxc-android-config/add-citrain-support into lp:~timo-jyrinki/lxc-android-config/trunk

[Simon Fels]

Add citrain build support

[lp:~morphis/lxc-android-config/add-citrain-support]

3. By Simon Fels on 2015-09-02

Adjust for citrain packaging guidelines

See https://wiki.ubuntu.com/DailyRelease/InlinePackaging for details

4. By Simon Fels on 2015-09-02

Switch to non native version

5. By Simon Fels on 2015-09-02

Use correct version format

6. By Simon Fels on 2015-09-02

Remove bzr builddeb configuration

7. By Simon Fels on 2015-09-02

Revert version in changelog

[Timo Jyrinki (timo-jyrinki)]

Looking good!

review: Approve

Unmerged revisions

7. By Simon Fels on 2015-09-02

Revert version in changelog

6. By Simon Fels on 2015-09-02

Remove bzr builddeb configuration

5. By Simon Fels on 2015-09-02

Use correct version format

4. By Simon Fels on 2015-09-02

Switch to non native version

3. By Simon Fels on 2015-09-02

Adjust for citrain packaging guidelines

See https://wiki.ubuntu.com/DailyRelease/InlinePackaging for details

2. By Simon Fels on 2015-09-02

Add necessary bits for citrain support

=== 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-09-02 09:10:20 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True 

=== removed file 'debian/bzr-builddeb.conf'
--- debian/bzr-builddeb.conf	2015-09-02 07:50:44 +0000
+++ debian/bzr-builddeb.conf	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[BUILDDEB]
-native = True

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-02 07:50:44 +0000
+++ debian/changelog	2015-09-02 09:10:20 +0000
@@ -1,3 +1,9 @@
+lxc-android-config (0.230-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Rebuild for switching package building to citrain.
+
+ -- Simon Fels <[e-mail]>  Wed, 02 Sep 2015 10:34:53 +0200
+
 lxc-android-config (0.229) wily; urgency=medium
 
   * Let bluetooth daemon load a touch specific configuration on startup in

=== modified file 'debian/control'
--- debian/control	2015-09-02 07:50:44 +0000
+++ debian/control	2015-09-02 09:10:20 +0000
@@ -2,15 +2,24 @@
 Section: utils
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9), dh-systemd
+Build-Depends: debhelper (>= 9),
+               dh-systemd,
 Standards-Version: 3.9.6
+# if you don't have have commit access to this branch but would like to upload
+# directly to Ubuntu, don't worry: your changes will be merged back into the
+# upstream branch
+Vcs-Bzr: lp:lxc-android-config
 
 Package: lxc-android-config
 Architecture: all
 Multi-Arch: foreign
-Depends: lxc (>= 1.1.0~alpha2-0ubuntu1), cgmanager, debianutils, ${misc:Depends}
-Breaks: ubuntu-touch-session (<< 0.107), powerd (<< 0.14-0ubuntu1)
-Recommends: ofono
+Depends: cgmanager,
+         debianutils,
+         lxc (>= 1.1.0~alpha2-0ubuntu1),
+         ${misc:Depends},
+Breaks: powerd (<< 0.14-0ubuntu1),
+        ubuntu-touch-session (<< 0.107),
+Recommends: ofono,
 Description: configuration to fire up an ubuntu-touch android container
  This package contains the scripts to boot an Ubuntu Touch device.
  .

=== modified file 'debian/copyright'
--- debian/copyright	2015-09-02 07:50:44 +0000
+++ debian/copyright	2015-09-02 09:10:20 +0000
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lxc-android-config
 Upstream-Contact:  Oliver Grawert <[e-mail]>
-Source: lp:ubuntu/lxc-android-config
+Source: lp:lxc-android-config
 
 Files: *
 Copyright: 2013 Canonical LTD.

=== modified file 'debian/lxc-android-config.install'
--- debian/lxc-android-config.install	2015-09-02 07:50:44 +0000
+++ debian/lxc-android-config.install	2015-09-02 09:10:20 +0000
@@ -1,4 +1,4 @@
+etc
+lib
+usr
 var
-usr
-lib
-etc

=== modified file 'debian/rules'
--- debian/rules	2015-09-02 07:50:44 +0000
+++ debian/rules	2015-09-02 09:10:20 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
 %:
 	dh $@ --with systemd
 

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2015-09-02 07:50:44 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (native)