Merge lp://staging/~cyruslien/ubuntu/natty/ubiquity/fix-690726 into lp://staging/ubuntu/natty/ubiquity
Proposed by
Cyrus Lien
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~cyruslien/ubuntu/natty/ubiquity/fix-690726 |
| Merge into: | lp://staging/ubuntu/natty/ubiquity |
| Diff against target: |
218834 lines (+216016/-0) (has conflicts) 521 files modified
.bzrignore (+70/-0) .pycheckrc (+4/-0) ABOUT-NLS (+1068/-0) Makefile.am (+9/-0) Makefile.in (+779/-0) aclocal.m4 (+1597/-0) autogen.sh (+10/-0) bin/oem-config-firstboot (+123/-0) bin/oem-config-prepare (+79/-0) bin/oem-config-remaster (+121/-0) bin/oem-config-remove (+27/-0) bin/oem-config-remove-gtk (+74/-0) bin/oem-config-wrapper (+49/-0) bin/ubiquity (+535/-0) bin/ubiquity-dm (+556/-0) bin/ubiquity-greeter-gtk (+168/-0) bin/ubiquity-wireless-manager (+170/-0) bin/ubiquity-wrapper (+138/-0) build/compile (+142/-0) build/config.guess (+1502/-0) build/config.rpath (+666/-0) build/config.sub (+1714/-0) build/depcomp (+630/-0) build/install-sh (+520/-0) build/ltmain.sh (+8413/-0) build/missing (+376/-0) build/mkinstalldirs (+162/-0) compat/anna-install (+3/-0) compat/apt-install (+39/-0) compat/depmod (+3/-0) compat/linux-boot-prober (+13/-0) compat/locale (+20/-0) compat/os-prober (+12/-0) compat/udpkg (+9/-0) compat/update-dev (+5/-0) config.h.in (+99/-0) configure (+17632/-0) configure.ac (+112/-0) d-i/Makefile (+83/-0) d-i/README (+5/-0) d-i/build-manifest (+9/-0) d-i/check-manifest (+42/-0) d-i/get-sources (+118/-0) d-i/lists/amd64 (+2/-0) d-i/lists/any (+27/-0) d-i/lists/armel (+2/-0) d-i/lists/i386 (+2/-0) d-i/lists/lpia (+2/-0) d-i/lists/powerpc (+3/-0) d-i/make-keyboard-names (+134/-0) d-i/manifest (+34/-0) d-i/sources.list (+1/-0) d-i/update-changelog (+31/-0) d-i/update-control (+94/-0) dbus/com.ubuntu.ubiquity.WirelessManager.conf (+23/-0) dbus/com.ubuntu.ubiquity.WirelessManager.service (+4/-0) debian-installer-startup.d/S60oem-config-check (+9/-0) debian/changelog (+8760/-0) debian/changelog.oem-config (+1159/-0) debian/clean (+8/-0) debian/compat (+1/-0) debian/control (+148/-0) debian/copyright (+62/-0) debian/imported-po/Makefile (+29/-0) debian/imported-po/POTFILES.in (+1/-0) debian/imported-po/add-contexts (+14/-0) debian/imported-po/am.po (+43/-0) debian/imported-po/ar.po (+131/-0) debian/imported-po/ast.po (+128/-0) debian/imported-po/be.po (+51/-0) debian/imported-po/bg.po (+126/-0) debian/imported-po/bn.po (+129/-0) debian/imported-po/br.po (+126/-0) debian/imported-po/bs.po (+55/-0) debian/imported-po/ca.po (+146/-0) debian/imported-po/cs.po (+132/-0) debian/imported-po/cy.po (+125/-0) debian/imported-po/da.po (+152/-0) debian/imported-po/de.po (+135/-0) debian/imported-po/dz.po (+53/-0) debian/imported-po/el.po (+147/-0) debian/imported-po/eo.po (+51/-0) debian/imported-po/es.po (+114/-0) debian/imported-po/et.po (+131/-0) debian/imported-po/eu.po (+125/-0) debian/imported-po/fa.po (+51/-0) debian/imported-po/fi.po (+130/-0) debian/imported-po/fr.po (+134/-0) debian/imported-po/ga.po (+127/-0) debian/imported-po/gl.po (+138/-0) debian/imported-po/gu.po (+153/-0) debian/imported-po/he.po (+126/-0) debian/imported-po/hi.po (+137/-0) debian/imported-po/hr.po (+53/-0) debian/imported-po/hu.po (+128/-0) debian/imported-po/id.po (+53/-0) debian/imported-po/it.po (+125/-0) debian/imported-po/ja.po (+130/-0) debian/imported-po/ka.po (+56/-0) debian/imported-po/ko.po (+124/-0) debian/imported-po/ku.po (+89/-0) debian/imported-po/lt.po (+130/-0) debian/imported-po/lv.po (+124/-0) debian/imported-po/mk.po (+57/-0) debian/imported-po/ml.po (+126/-0) debian/imported-po/mr.po (+125/-0) debian/imported-po/nb.po (+123/-0) debian/imported-po/ne.po (+56/-0) debian/imported-po/nl.po (+142/-0) debian/imported-po/nn.po (+131/-0) debian/imported-po/pa.po (+126/-0) debian/imported-po/pl.po (+127/-0) debian/imported-po/pt.po (+124/-0) debian/imported-po/pt_BR.po (+137/-0) debian/imported-po/ro.po (+126/-0) debian/imported-po/ru.po (+137/-0) debian/imported-po/sk.po (+126/-0) debian/imported-po/sl.po (+130/-0) debian/imported-po/sq.po (+124/-0) debian/imported-po/sr.po (+128/-0) debian/imported-po/sv.po (+124/-0) debian/imported-po/ta.po (+138/-0) debian/imported-po/templates.pot (+123/-0) debian/imported-po/th.po (+124/-0) debian/imported-po/tr.po (+135/-0) debian/imported-po/uk.po (+125/-0) debian/imported-po/ur.po (+21/-0) debian/imported-po/vi.po (+126/-0) debian/imported-po/zh_CN.po (+130/-0) debian/imported-po/zh_HK.po (+126/-0) debian/imported-po/zh_TW.po (+126/-0) debian/oem-config-check.install (+2/-0) debian/oem-config-check.templates (+11/-0) debian/oem-config-gtk.dirs (+1/-0) debian/oem-config-gtk.install (+2/-0) debian/oem-config-gtk.postinst (+11/-0) debian/oem-config-gtk.postrm (+13/-0) debian/oem-config-gtk.preinst (+13/-0) debian/oem-config-gtk.prerm (+10/-0) debian/oem-config-kde.dirs (+1/-0) debian/oem-config-kde.install (+1/-0) debian/oem-config-kde.postinst (+11/-0) debian/oem-config-kde.prerm (+10/-0) debian/oem-config-remaster.install (+1/-0) debian/oem-config-udeb.install (+1/-0) debian/oem-config-udeb.postinst (+23/-0) debian/oem-config-udeb.templates (+31/-0) debian/oem-config.dirs (+6/-0) debian/oem-config.install (+5/-0) debian/oem-config.links (+2/-0) debian/oem-config.lintian-overrides (+1/-0) debian/oem-config.manpages (+1/-0) debian/oem-config.oem-config.upstart (+50/-0) debian/oem-config.postinst (+8/-0) debian/oem-config.templates (+52/-0) debian/pycompat (+1/-0) debian/real-po/POTFILES.in (+4/-0) debian/real-po/am.po (+1585/-0) debian/real-po/ar.po (+1664/-0) debian/real-po/ast.po (+1709/-0) debian/real-po/be.po (+1703/-0) debian/real-po/bg.po (+1706/-0) debian/real-po/bn.po (+1647/-0) debian/real-po/bs.po (+1702/-0) debian/real-po/ca.po (+1712/-0) debian/real-po/cs.po (+1696/-0) debian/real-po/cy.po (+1620/-0) debian/real-po/da.po (+1714/-0) debian/real-po/de.po (+1733/-0) debian/real-po/dz.po (+1535/-0) debian/real-po/el.po (+1729/-0) debian/real-po/eo.po (+1690/-0) debian/real-po/es.po (+1712/-0) debian/real-po/et.po (+1690/-0) debian/real-po/eu.po (+1705/-0) debian/real-po/fi.po (+1704/-0) debian/real-po/fr.po (+1727/-0) debian/real-po/ga.po (+1535/-0) debian/real-po/gl.po (+1710/-0) debian/real-po/gu.po (+1585/-0) debian/real-po/he.po (+1674/-0) debian/real-po/hi.po (+1676/-0) debian/real-po/hr.po (+1709/-0) debian/real-po/hu.po (+1706/-0) debian/real-po/id.po (+1704/-0) debian/real-po/it.po (+1712/-0) debian/real-po/ja.po (+1708/-0) debian/real-po/ka.po (+1619/-0) debian/real-po/kk.po (+1700/-0) debian/real-po/km.po (+1673/-0) debian/real-po/ko.po (+1681/-0) debian/real-po/ku.po (+1616/-0) debian/real-po/lt.po (+1697/-0) debian/real-po/lv.po (+1697/-0) debian/real-po/mk.po (+1594/-0) debian/real-po/ml.po (+1558/-0) debian/real-po/mr.po (+1536/-0) debian/real-po/ne.po (+1583/-0) debian/real-po/nl.po (+1717/-0) debian/real-po/pa.po (+1551/-0) debian/real-po/pl.po (+1705/-0) debian/real-po/pt.po (+1715/-0) debian/real-po/pt_BR.po (+1709/-0) debian/real-po/ro.po (+1712/-0) debian/real-po/ru.po (+1703/-0) debian/real-po/sk.po (+1695/-0) debian/real-po/sl.po (+1700/-0) debian/real-po/sq.po (+1704/-0) debian/real-po/sr.po (+1701/-0) debian/real-po/sv.po (+1714/-0) debian/real-po/ta.po (+1542/-0) debian/real-po/templates.pot (+1535/-0) debian/real-po/th.po (+1653/-0) debian/real-po/tl.po (+1536/-0) debian/real-po/tr.po (+1703/-0) debian/real-po/uk.po (+1701/-0) debian/real-po/vi.po (+1695/-0) debian/real-po/wo.po (+1536/-0) debian/real-po/zh_CN.po (+1644/-0) debian/real-po/zh_TW.po (+1649/-0) debian/rules (+282/-0) debian/source/format (+1/-0) debian/source/options (+1/-0) debian/ubiquity-frontend-debconf.install (+4/-0) debian/ubiquity-frontend-gtk.install (+11/-0) debian/ubiquity-frontend-kde.install (+10/-0) debian/ubiquity-gtkui.lintian-overrides (+1/-0) debian/ubiquity-guadalinex-artwork.install (+1/-0) debian/ubiquity-kdeui.lintian-overrides (+1/-0) debian/ubiquity-ubuntu-artwork.install (+3/-0) debian/ubiquity.di-numbers (+5/-0) debian/ubiquity.dirs-any (+8/-0) debian/ubiquity.dirs-armel (+1/-0) debian/ubiquity.dirs-powerpc (+2/-0) debian/ubiquity.docs (+1/-0) debian/ubiquity.install-amd64 (+5/-0) debian/ubiquity.install-any (+108/-0) debian/ubiquity.install-armel (+2/-0) debian/ubiquity.install-i386 (+5/-0) debian/ubiquity.install-powerpc (+10/-0) debian/ubiquity.manpages (+1/-0) debian/ubiquity.postinst (+12/-0) debian/ubiquity.templates (+1194/-0) debian/ubiquity.templates-imported (+72/-0) debian/ubiquity.ubiquity.upstart (+92/-0) desktop/Makefile.am (+13/-0) desktop/Makefile.in (+467/-0) desktop/oem-config-prepare-gtk.desktop.in (+11/-0) desktop/oem-config-prepare-kde.desktop.in (+11/-0) desktop/ubiquity-gtkui.desktop.in (+12/-0) desktop/ubiquity-kdeui.desktop.in (+12/-0) desktop/ubiquity.svg (+319/-0) doc/Changelog.Guadalinex (+148/-0) doc/README (+226/-0) doc/clock-handling (+48/-0) doc/oem-config-firstboot.8 (+59/-0) doc/oem-config-prepare.8 (+39/-0) doc/ubiquity.8 (+123/-0) finish-install.d/01oem-config-udeb (+22/-0) finish-install.d/07oem-config-user (+18/-0) gui/gtk/gtkwidgets.xml (+49/-0) gui/gtk/stepKeyboardConf.ui (+149/-0) gui/gtk/stepLanguage.ui (+209/-0) gui/gtk/stepLanguageOnly.ui (+32/-0) gui/gtk/stepLocation.ui (+42/-0) gui/gtk/stepMigrationAssistant.ui (+52/-0) gui/gtk/stepPartAdvanced.ui (+830/-0) gui/gtk/stepPartAsk.ui (+64/-0) gui/gtk/stepPartAuto.ui (+196/-0) gui/gtk/stepPrepare.ui (+160/-0) gui/gtk/stepUserInfo.ui (+425/-0) gui/gtk/stepWarning.ui (+23/-0) gui/gtk/stepWireless.ui (+30/-0) gui/gtk/ubiquity.ui (+890/-0) gui/qt/app.ui (+476/-0) gui/qt/crashdialog.ui (+192/-0) gui/qt/images/graphics.svg (+1650/-0) gui/qt/partition_create_dialog.ui (+192/-0) gui/qt/partition_edit_dialog.ui (+176/-0) gui/qt/stepIntro.ui (+89/-0) gui/qt/stepKeyboardConf.ui (+157/-0) gui/qt/stepLanguage.ui (+300/-0) gui/qt/stepLocation.ui (+142/-0) gui/qt/stepPartAuto.ui (+101/-0) gui/qt/stepPartMan.ui (+208/-0) gui/qt/stepPrepare.ui (+81/-0) gui/qt/stepUserSetup.ui (+573/-0) gui/qt/style.qss (+146/-0) gui/qt/style_small.qss (+18/-0) m4/ChangeLog (+32/-0) m4/am-check-python-headers.m4 (+35/-0) m4/codeset.m4 (+21/-0) m4/gettext.m4 (+381/-0) m4/glibc2.m4 (+30/-0) m4/glibc21.m4 (+30/-0) m4/iconv.m4 (+180/-0) m4/intdiv0.m4 (+84/-0) m4/intl.m4 (+285/-0) m4/intldir.m4 (+19/-0) m4/intlmacosx.m4 (+51/-0) m4/intltool.m4 (+216/-0) m4/intmax.m4 (+33/-0) m4/inttypes-pri.m4 (+36/-0) m4/inttypes_h.m4 (+26/-0) m4/lcmessage.m4 (+30/-0) m4/lib-ld.m4 (+110/-0) m4/lib-link.m4 (+709/-0) m4/lib-prefix.m4 (+185/-0) m4/libtool.m4 (+7377/-0) m4/lock.m4 (+316/-0) m4/longlong.m4 (+109/-0) m4/ltoptions.m4 (+368/-0) m4/ltsugar.m4 (+123/-0) m4/ltversion.m4 (+23/-0) m4/lt~obsolete.m4 (+92/-0) m4/nls.m4 (+31/-0) m4/po.m4 (+449/-0) m4/printf-posix.m4 (+44/-0) m4/progtest.m4 (+92/-0) m4/size_max.m4 (+68/-0) m4/stdint_h.m4 (+26/-0) m4/ubiquity-python.m4 (+27/-0) m4/uintmax_t.m4 (+30/-0) m4/visibility.m4 (+52/-0) m4/wchar_t.m4 (+20/-0) m4/wint_t.m4 (+28/-0) m4/xsize.m4 (+13/-0) main-menu.d/10oem-config (+6/-0) partman/check.d/_numbers (+1/-0) partman/check.d/partition_too_small (+104/-0) partman/commit.d/_numbers (+1/-0) partman/commit.d/unmount_busy (+112/-0) partman/finish.d/_numbers (+1/-0) partman/finish.d/remove_os_prober_cache (+4/-0) partman/undo.d/_numbers (+1/-0) partman/undo.d/signal_ubiquity (+7/-0) partman/update.d/_numbers (+1/-0) partman/update.d/signal_ubiquity (+16/-0) pixmaps/Makefile.am (+3/-0) pixmaps/Makefile.in (+457/-0) pixmaps/greeter-gtk.svg (+88/-0) po/ChangeLog (+11/-0) po/LINGUAS (+60/-0) po/Makefile.in.in (+217/-0) po/Makevars (+41/-0) po/Makevars.template (+41/-0) po/POTFILES.in (+5/-0) po/Rules-quot (+47/-0) po/am.po (+35/-0) po/ar.po (+35/-0) po/ast.po (+35/-0) po/be.po (+35/-0) po/bg.po (+35/-0) po/bn.po (+35/-0) po/boldquot.sed (+10/-0) po/bs.po (+35/-0) po/ca.po (+35/-0) po/cs.po (+35/-0) po/cy.po (+35/-0) po/da.po (+35/-0) po/de.po (+35/-0) po/el.po (+35/-0) po/en@boldquot.header (+25/-0) po/en@quot.header (+22/-0) po/eo.po (+35/-0) po/es.po (+35/-0) po/et.po (+35/-0) po/eu.po (+35/-0) po/fi.po (+35/-0) po/fr.po (+35/-0) po/ga.po (+35/-0) po/gl.po (+35/-0) po/gu.po (+35/-0) po/he.po (+35/-0) po/hi.po (+35/-0) po/hr.po (+35/-0) po/hu.po (+35/-0) po/id.po (+35/-0) po/insert-header.sin (+23/-0) po/it.po (+35/-0) po/ja.po (+35/-0) po/ka.po (+35/-0) po/kk.po (+35/-0) po/km.po (+37/-0) po/ko.po (+35/-0) po/ku.po (+35/-0) po/lt.po (+35/-0) po/lv.po (+35/-0) po/mk.po (+35/-0) po/ml.po (+35/-0) po/mr.po (+35/-0) po/ne.po (+35/-0) po/nl.po (+35/-0) po/pa.po (+35/-0) po/pl.po (+35/-0) po/pt.po (+35/-0) po/pt_BR.po (+35/-0) po/quot.sed (+6/-0) po/remove-potcdate.sin (+19/-0) po/ro.po (+36/-0) po/ru.po (+35/-0) po/sk.po (+35/-0) po/sl.po (+35/-0) po/sq.po (+35/-0) po/sr.po (+35/-0) po/sv.po (+35/-0) po/ta.po (+35/-0) po/th.po (+35/-0) po/tl.po (+35/-0) po/tr.po (+35/-0) po/ubiquity.pot (+33/-0) po/uk.po (+35/-0) po/vi.po (+35/-0) po/zh_CN.po (+35/-0) po/zh_TW.po (+35/-0) run-pychecker (+20/-0) scripts/activate-dmraid (+40/-0) scripts/apt-setup (+14/-0) scripts/check-kernels (+86/-0) scripts/clock-setup (+6/-0) scripts/clock-setup-apply (+62/-0) scripts/console-setup-apply (+18/-0) scripts/install.py (+613/-0) scripts/localechooser-apply (+58/-0) scripts/migration-assistant (+14/-0) scripts/netcfg-wrapper (+10/-0) scripts/plugininstall.py (+1443/-0) scripts/simple-plugins (+23/-0) scripts/tzsetup (+47/-0) scripts/ubi-reload-keyboard (+8/-0) scripts/update-apt-cache (+5/-0) src/Makefile.am (+1/-0) src/Makefile.in (+610/-0) src/cheese/Makefile.am (+36/-0) src/cheese/Makefile.in (+631/-0) src/cheese/cheese-types.defs (+14/-0) src/cheese/cheese.defs (+91/-0) src/cheese/cheese.override (+21/-0) src/cheese/cheesemodule.c (+46/-0) src/cheese/tests/cheese-test-chooser.py (+57/-0) src/panel/Makefile.am (+17/-0) src/panel/Makefile.in (+584/-0) src/panel/fixedtip.c (+261/-0) src/panel/fixedtip.h (+68/-0) src/panel/na-marshal.c (+167/-0) src/panel/na-marshal.h (+36/-0) src/panel/na-tray-child.c (+515/-0) src/panel/na-tray-child.h (+71/-0) src/panel/na-tray-manager.c (+845/-0) src/panel/na-tray-manager.h (+97/-0) src/panel/na-tray.c (+829/-0) src/panel/na-tray.h (+67/-0) src/panel/panel.c (+302/-0) tests/run (+48/-0) tests/run-frontend (+147/-0) ubiquity/Makefile.am (+9/-0) ubiquity/Makefile.in (+586/-0) ubiquity/__init__.py (+1/-0) ubiquity/auto_update.py (+184/-0) ubiquity/casper.py (+54/-0) ubiquity/components/apt_setup.py (+65/-0) ubiquity/components/check_kernels.py (+24/-0) ubiquity/components/flash_kernel.py (+25/-0) ubiquity/components/grubinstaller.py (+40/-0) ubiquity/components/hw_detect.py (+38/-0) ubiquity/components/install.py (+75/-0) ubiquity/components/kbootinstaller.py (+30/-0) ubiquity/components/partman_commit.py (+96/-0) ubiquity/components/plugininstall.py (+98/-0) ubiquity/components/yabootinstaller.py (+30/-0) ubiquity/debconfcommunicator.py (+46/-0) ubiquity/debconffilter.py (+449/-0) ubiquity/filteredcommand.py (+454/-0) ubiquity/frontend/__init__.py (+3/-0) ubiquity/frontend/base.py (+394/-0) ubiquity/frontend/debconf_ui.py (+151/-0) ubiquity/frontend/gtk_components/keyboard_query.py (+122/-0) ubiquity/frontend/gtk_ui.py (+1590/-0) ubiquity/frontend/kde_components/Keyboard.py (+282/-0) ubiquity/frontend/kde_components/PartAuto.py (+213/-0) ubiquity/frontend/kde_components/PartMan.py (+462/-0) ubiquity/frontend/kde_components/PartitionBar.py (+321/-0) ubiquity/frontend/kde_components/PartitionModel.py (+261/-0) ubiquity/frontend/kde_components/ProgressDialog.py (+72/-0) ubiquity/frontend/kde_components/SqueezeLabel.py (+21/-0) ubiquity/frontend/kde_components/Timezone.py (+240/-0) ubiquity/frontend/kde_components/__init__.py (+3/-0) ubiquity/frontend/kde_components/testing/partauto.py (+64/-0) ubiquity/frontend/kde_components/testing/partitionbar.py (+41/-0) ubiquity/frontend/kde_components/testing/partman.py (+350/-0) ubiquity/frontend/kde_ui.py (+1306/-0) ubiquity/frontend/noninteractive.py (+241/-0) ubiquity/gconftool.py (+129/-0) ubiquity/gtkwidgets.py (+1071/-0) ubiquity/i18n.py (+352/-0) ubiquity/im_switch.py (+159/-0) ubiquity/install_misc.py (+899/-0) ubiquity/keyboard_detector.py (+96/-0) ubiquity/misc.py (+526/-0) ubiquity/osextras.py (+115/-0) ubiquity/osextrasmodule.c (+115/-0) ubiquity/parted_server.py (+222/-0) ubiquity/plugin.py (+48/-0) ubiquity/plugin_manager.py (+143/-0) ubiquity/plugins/ubi-console-setup.py (+695/-0) ubiquity/plugins/ubi-language.py (+764/-0) ubiquity/plugins/ubi-migrationassistant.py (+343/-0) ubiquity/plugins/ubi-network.py (+38/-0) ubiquity/plugins/ubi-partman.py (+2510/-0) ubiquity/plugins/ubi-prepare.py (+351/-0) ubiquity/plugins/ubi-tasks.py (+38/-0) ubiquity/plugins/ubi-timezone.py (+611/-0) ubiquity/plugins/ubi-usersetup.py (+824/-0) ubiquity/plugins/ubi-warning.py.disabled (+80/-0) ubiquity/plugins/ubi-wireless.py.disabled (+81/-0) ubiquity/progressposition.py (+86/-0) ubiquity/qtwidgets.py (+37/-0) ubiquity/segmented_bar.py (+732/-0) ubiquity/timezone_map.py (+778/-0) ubiquity/tz.py (+254/-0) ubiquity/validation.py (+136/-0) Conflict adding file .pycheckrc. Moved existing file to .pycheckrc.moved. Conflict adding file ABOUT-NLS. Moved existing file to ABOUT-NLS.moved. Conflict adding file Makefile.am. Moved existing file to Makefile.am.moved. Conflict adding file Makefile.in. Moved existing file to Makefile.in.moved. Conflict adding file aclocal.m4. Moved existing file to aclocal.m4.moved. Conflict adding file autogen.sh. Moved existing file to autogen.sh.moved. Conflict adding file bin. Moved existing file to bin.moved. Conflict adding file build. Moved existing file to build.moved. Conflict adding file compat. Moved existing file to compat.moved. Conflict adding file config.h.in. Moved existing file to config.h.in.moved. Conflict adding file configure.ac. Moved existing file to configure.ac.moved. Conflict adding file configure. Moved existing file to configure.moved. Conflict adding file d-i. Moved existing file to d-i.moved. Conflict adding file dbus. Moved existing file to dbus.moved. Conflict adding file debian-installer-startup.d. Moved existing file to debian-installer-startup.d.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file desktop. Moved existing file to desktop.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file finish-install.d. Moved existing file to finish-install.d.moved. Conflict adding file gui. Moved existing file to gui.moved. Conflict adding file m4. Moved existing file to m4.moved. Conflict adding file main-menu.d. Moved existing file to main-menu.d.moved. Conflict adding file partman. Moved existing file to partman.moved. Conflict adding file pixmaps. Moved existing file to pixmaps.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file run-pychecker. Moved existing file to run-pychecker.moved. Conflict adding file scripts. Moved existing file to scripts.moved. Conflict adding file src. Moved existing file to src.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file ubiquity. Moved existing file to ubiquity.moved. |
| To merge this branch: | bzr merge lp://staging/~cyruslien/ubuntu/natty/ubiquity/fix-690726 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Needs Resubmitting | ||
|
Review via email:
|
|||
Description of the change
(LP: 690726)
Add shutdown option
Implement ubiquity/poweroff preseed option
To post a comment you must log in.
Unmerged revisions
- 4494. By Cyrus Lien
-
* Add shutdown option
Implement ubiquity/poweroff preseed option - 4493. By Colin Watson
-
releasing version 2.5.12
- 4492. By Colin Watson
-
Automatic update of included source packages: clock-setup 0.106ubuntu1,
console-setup 1.57ubuntu5, partman-basicfilesystem s 69ubuntu1,
partman-efi 23ubuntu1, partman-partitioning 79ubuntu1. - 4491. By Mario Limonciello
-
add bug number
- 4490. By Evan
-
Detect hostname collisions (LP: #634187).
- 4489. By Evan
-
Missed a pc105.tree reference that needed to be removed.
- 4488. By Evan
-
pc105.tree is included in console-setup now, which speeds up
ubiquity builds. - 4487. By Evan
-
Update LINGUAS.
- 4486. By Evan
-
Fix mistake in the cleanup branch merge that broke translations
(LP: #691671). - 4485. By Evan
-
If a session indicator gconf key starts unset, make sure it ends
that way (LP: #684052).
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Please resubmit this as a merge against lp:ubiquity (which is the same
as lp:~ubuntu-installer/ubiquity/trunk). Regrettably,
lp:ubuntu/ubiquity is not the same thing at the moment and we don't use
it; merges proposed against it are unreadable.
review resubmit