Merge lp:~timo-jyrinki/lxc-android-config/randomtest into lp:~timo-jyrinki/lxc-android-config/trunk

Proposed by Timo Jyrinki
Status: Work in progress
Proposed branch: lp:~timo-jyrinki/lxc-android-config/randomtest
Merge into: lp:~timo-jyrinki/lxc-android-config/trunk
Diff against target: 104 lines (+33/-9)
7 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+12/-0)
debian/control (+13/-4)
debian/copyright (+1/-1)
debian/lxc-android-config.install (+3/-3)
debian/rules (+2/-0)
debian/source/format (+0/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/lxc-android-config/randomtest
Reviewer Review Type Date Requested Status
Timo Jyrinki Pending
Review via email: mp+269866@code.launchpad.net

Commit message

test

Description of the change

will be abandoned

To post a comment you must log in.
6. By Timo Jyrinki

Fake release.

Unmerged revisions

6. By Timo Jyrinki

Fake release.

5. By Timo Jyrinki

test

4. By Simon Fels

Switch to non native version

3. By Simon Fels

Adjust for citrain packaging guidelines

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

2. By Simon Fels

Add necessary bits for citrain support

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2015-09-02 09:04:42 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2015-09-02 07:50:44 +0000
11+++ debian/changelog 2015-09-02 09:04:42 +0000
12@@ -1,3 +1,15 @@
13+lxc-android-config (0.230+15.10.20150902-0ubuntu1) UNRELEASED; urgency=medium
14+
15+ * Rebuild for switching package building to citrain.
16+
17+ -- Simon Fels <simon.fels@canonical.com> Wed, 02 Sep 2015 10:34:53 +0200
18+
19+lxc-android-config (0.230+15.10.20150901-0ubuntu1) wily; urgency=medium
20+
21+ * Fake release.
22+
23+ -- Simon Fels <simon.fels@canonical.com> Wed, 02 Sep 2015 10:34:53 +0200
24+
25 lxc-android-config (0.229) wily; urgency=medium
26
27 * Let bluetooth daemon load a touch specific configuration on startup in
28
29=== modified file 'debian/control'
30--- debian/control 2015-09-02 07:50:44 +0000
31+++ debian/control 2015-09-02 09:04:42 +0000
32@@ -2,15 +2,24 @@
33 Section: utils
34 Priority: optional
35 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
36-Build-Depends: debhelper (>= 9), dh-systemd
37+Build-Depends: debhelper (>= 9),
38+ dh-systemd,
39 Standards-Version: 3.9.6
40+# if you don't have have commit access to this branch but would like to upload
41+# directly to Ubuntu, don't worry: your changes will be merged back into the
42+# upstream branch
43+Vcs-Bzr: lp:lxc-android-config
44
45 Package: lxc-android-config
46 Architecture: all
47 Multi-Arch: foreign
48-Depends: lxc (>= 1.1.0~alpha2-0ubuntu1), cgmanager, debianutils, ${misc:Depends}
49-Breaks: ubuntu-touch-session (<< 0.107), powerd (<< 0.14-0ubuntu1)
50-Recommends: ofono
51+Depends: cgmanager,
52+ debianutils,
53+ lxc (>= 1.1.0~alpha2-0ubuntu1),
54+ ${misc:Depends},
55+Breaks: powerd (<< 0.14-0ubuntu1),
56+ ubuntu-touch-session (<< 0.107),
57+Recommends: ofono,
58 Description: configuration to fire up an ubuntu-touch android container
59 This package contains the scripts to boot an Ubuntu Touch device.
60 .
61
62=== modified file 'debian/copyright'
63--- debian/copyright 2015-09-02 07:50:44 +0000
64+++ debian/copyright 2015-09-02 09:04:42 +0000
65@@ -1,7 +1,7 @@
66 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
67 Upstream-Name: lxc-android-config
68 Upstream-Contact: Oliver Grawert <ogra@ubuntu.com>
69-Source: lp:ubuntu/lxc-android-config
70+Source: lp:lxc-android-config
71
72 Files: *
73 Copyright: 2013 Canonical LTD.
74
75=== modified file 'debian/lxc-android-config.install'
76--- debian/lxc-android-config.install 2015-09-02 07:50:44 +0000
77+++ debian/lxc-android-config.install 2015-09-02 09:04:42 +0000
78@@ -1,4 +1,4 @@
79+etc
80+lib
81+usr
82 var
83-usr
84-lib
85-etc
86
87=== modified file 'debian/rules'
88--- debian/rules 2015-09-02 07:50:44 +0000
89+++ debian/rules 2015-09-02 09:04:42 +0000
90@@ -1,5 +1,7 @@
91 #!/usr/bin/make -f
92
93+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
94+
95 %:
96 dh $@ --with systemd
97
98
99=== removed directory 'debian/source'
100=== removed file 'debian/source/format'
101--- debian/source/format 2015-09-02 07:50:44 +0000
102+++ debian/source/format 1970-01-01 00:00:00 +0000
103@@ -1,1 +0,0 @@
104-3.0 (native)

Subscribers

People subscribed via source and target branches

to all changes: