Ubuntu
lxc-android-config package

Merge lp:~ubuntu-branches/ubuntu/saucy/lxc-android-config/saucy-201309251636 into lp:ubuntu/saucy/lxc-android-config

  1. Saucy (13.10)
  2. saucy-201309251636
  3. Merge into saucy
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/saucy/lxc-android-config/saucy-201309251636
Merge into: lp:ubuntu/saucy/lxc-android-config
Diff against target: 51 lines (+18/-4) (has conflicts)
2 files modified
debian/changelog (+16/-0)
etc/system-image/writable-paths (+2/-4)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/saucy/lxc-android-config/saucy-201309251636
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+187556@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/saucy/lxc-android-config reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/saucy/lxc-android-config/saucy-201309251636. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

103. By Sebastien Bacher

Define /var/lib/upower as writable, it's needed for charge records
(lp: #1230356)

102. By Martin Pitt

Revert previous addition of timezone files, and instead make
/etc/writable/ writable. This directory will get non-conffiles which need
to be updated atomically. (LP: #1227520)

101. By Oliver Grawert

merge lp:~cwayne18/ubuntu/saucy/lxc-android-config/timezone which makes
three additional files writable to enable timezone selection

100. By Jamie Strandboge

add /etc/apparmor.d/cache as writable path so we don't have to regenerate
system policy on every boot (LP: #1227604)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-09-25 17:50:56 +0000
+++ debian/changelog 2013-09-25 16:45:34 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1lxc-android-config (0.102) saucy; urgency=low2lxc-android-config (0.102) saucy; urgency=low
23
3 [ Sebastien Bacher ]4 [ Sebastien Bacher ]
@@ -10,6 +11,21 @@
1011
11 -- Oliver Grawert <ogra@ubuntu.com> Wed, 25 Sep 2013 17:50:56 +020012 -- Oliver Grawert <ogra@ubuntu.com> Wed, 25 Sep 2013 17:50:56 +0200
1213
14=======
15lxc-android-config (0.102) UNRELEASED; urgency=low
16
17 [ Martin Pitt ]
18 * Revert previous addition of timezone files, and instead make
19 /etc/writable/ writable. This directory will get non-conffiles which need
20 to be updated atomically. (LP: #1227520)
21
22 [ Sebastien Bacher ]
23 * Define /var/lib/upower as writable, it's needed for charge records
24 (lp: #1230356)
25
26 -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 25 Sep 2013 11:19:10 +0200
27
28>>>>>>> MERGE-SOURCE
13lxc-android-config (0.101) saucy; urgency=low29lxc-android-config (0.101) saucy; urgency=low
1430
15 * merge lp:~cwayne18/ubuntu/saucy/lxc-android-config/timezone which makes31 * merge lp:~cwayne18/ubuntu/saucy/lxc-android-config/timezone which makes
1632
=== modified file 'etc/system-image/writable-paths'
--- etc/system-image/writable-paths 2013-09-25 17:50:56 +0000
+++ etc/system-image/writable-paths 2013-09-25 16:45:34 +0000
@@ -21,6 +21,8 @@
21/var/lib/upower auto persistent none none21/var/lib/upower auto persistent none none
22/var/lib/usermetrics auto persistent none none22/var/lib/usermetrics auto persistent none none
23/var/log auto persistent transition none23/var/log auto persistent transition none
24# for non-conffiles which need atomic updates
25/etc/writable auto persistent transition none
24# ufw26# ufw
25/etc/default/ufw auto persistent transition none27/etc/default/ufw auto persistent transition none
26/etc/ufw auto persistent transition none28/etc/ufw auto persistent transition none
@@ -37,7 +39,3 @@
37# ssh39# ssh
38/etc/ssh auto persistent transition none40/etc/ssh auto persistent transition none
39/etc/init/ssh.override auto persistent transition none41/etc/init/ssh.override auto persistent transition none
40# timezone
41/etc/timezone auto persistent transition none
42/etc/localtime auto persistent transition none
43/etc/adjtime auto persistent transition none

Subscribers

People subscribed via source and target branches

to all changes: