ubiquity

Merge lp:~ogra/ubiquity/trunk into lp:ubiquity

  1. trunk
  2. Merge into trunk
Proposed by Oliver Grawert
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ogra/ubiquity/trunk
Merge into: lp:ubiquity
Diff against target: 66 lines (+15/-3) (has conflicts)
3 files modified
debian/changelog (+9/-0)
debian/control (+1/-1)
scripts/install.py (+5/-2)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ogra/ubiquity/trunk
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+23653@code.launchpad.net

Description of the change

missed omap merge

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-04-16 17:57:52 +0000
3+++ debian/changelog 2010-04-19 07:48:20 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 ubiquity (2.2.19) UNRELEASED; urgency=low
7
8 * Use allow_change_step(False) from the KDE portions of the partman
9@@ -5,6 +6,14 @@
10
11 -- Evan Dandrea <evand@ubuntu.com> Fri, 16 Apr 2010 18:46:15 +0100
12
13+=======
14+ubiquity (2.2.19) lucid; urgency=low
15+
16+ * add support for omap bootloader installation
17+
18+ -- Oliver Grawert <ogra@ubuntu.com> Mon, 19 Apr 2010 09:33:15 +0200
19+
20+>>>>>>> MERGE-SOURCE
21 ubiquity (2.2.18) lucid; urgency=low
22
23 [ Evan Dandrea ]
24
25=== modified file 'debian/control'
26--- debian/control 2010-03-26 14:48:34 +0000
27+++ debian/control 2010-04-19 07:48:20 +0000
28@@ -11,7 +11,7 @@
29 Package: ubiquity
30 Architecture: any
31 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf (>= 1.4.72ubuntu5), ubiquity-frontend-${mangled-version}, ubiquity-artwork-${mangled-version}, laptop-detect, lsb-release, ubiquity-casper, python-apt (>= 0.6.16.2ubuntu4), ${console-setup-depends}, iso-codes, passwd, adduser, os-prober, rdate, ntfsprogs [any-alpha any-amd64 any-i386 any-ia64 any-lpia], ecryptfs-utils, cryptsetup, python-pyicu, reiserfsprogs, language-selector-common (>= 0.4.16)
32-Recommends: grub-pc [any-amd64 any-i386 any-lpia] | grub [any-amd64 any-i386 any-lpia], flash-kernel [armel], uboot-mkimage [armel], redboot-tools [armel], yaboot [powerpc], hfsutils [powerpc], silo [sparc], dmraid
33+Recommends: grub-pc [any-amd64 any-i386 any-lpia] | grub [any-amd64 any-i386 any-lpia], flash-kernel [armel], uboot-mkimage [armel], uboot-envtools [armel], redboot-tools [armel], yaboot [powerpc], hfsutils [powerpc], silo [sparc], dmraid
34 Conflicts: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot
35 Replaces: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot, ubiquity-frontend-gtk (<< 0.99.82)
36 XB-Python-Version: ${python:Versions}
37
38=== modified file 'scripts/install.py'
39--- scripts/install.py 2010-04-14 16:09:42 +0000
40+++ scripts/install.py 2010-04-19 07:48:20 +0000
41@@ -596,12 +596,15 @@
42 keep.add('grub')
43 keep.add('grub-pc')
44 elif (arch == 'armel' and
45- subarch in ('dove', 'imx51', 'iop32x', 'ixp4xx', 'orion5x')):
46+ subarch in ('dove', 'imx51', 'iop32x', 'ixp4xx', 'orion5x', 'omap')):
47 keep.add('flash-kernel')
48 if subarch == 'dove':
49 keep.add('uboot-mkimage')
50 elif subarch == 'imx51':
51 keep.add('redboot-tools')
52+ elif subarch == 'omap':
53+ keep.add('uboot-envtools')
54+ keep.add('uboot-mkimage')
55 elif arch == 'powerpc' and subarch != 'ps3':
56 keep.add('yaboot')
57 keep.add('hfsutils')
58@@ -1663,7 +1666,7 @@
59 else:
60 break
61 elif (arch == 'armel' and
62- subarch in ('dove', 'imx51', 'iop32x', 'ixp4xx', 'orion5x')):
63+ subarch in ('dove', 'imx51', 'iop32x', 'ixp4xx', 'orion5x', 'omap')):
64 from ubiquity.components import flash_kernel
65 dbfilter = flash_kernel.FlashKernel(None, self.db)
66 ret = dbfilter.run_command(auto_process=True)

Subscribers

People subscribed via source and target branches

to status/vote changes: