Merge ~zhsj/ubuntu/+source/console-setup:merge-lp2020749-mantic into ubuntu/+source/console-setup:debian/sid
Proposed by
Shengjing Zhu
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | ~zhsj/ubuntu/+source/console-setup:merge-lp2020749-mantic | ||||
| Merge into: | ubuntu/+source/console-setup:debian/sid | ||||
| Diff against target: |
9870 lines (+7609/-326) 107 files modified
Keyboard/KeyboardNames.pl (+136/-120) Keyboard/Makefile (+9/-4) Keyboard/ckbcomp (+6/-6) Keyboard/kbdnames-maker (+14/-0) Keyboard/keymaptree (+126/-0) Keyboard/keymaptree.use (+48/-0) Keyboard/pc105.tree (+448/-0) Keyboard/xmlreader (+12/-0) debian/changelog (+3095/-0) debian/clean (+1/-0) debian/console-setup-linux.postinst (+11/-0) debian/console-setup-linux.prerm (+12/-0) debian/console-setup-linux.setvtrgb.service (+15/-0) debian/console-setup-udeb.base-installer (+9/-8) debian/console-setup.apport (+13/-0) debian/console-setup.config (+8/-4) debian/console-setup.initramfs-hook (+118/-0) debian/console-setup.initramfs-top (+136/-0) debian/console-setup.postinst (+20/-2) debian/control (+13/-28) debian/keyboard-configuration.config (+175/-96) debian/keyboard-configuration.postinst (+31/-4) debian/keyboard-configuration.templates (+21/-1) debian/keyboard_present.sh (+1/-0) debian/po/am.po (+39/-0) debian/po/ar.po (+39/-0) debian/po/ast.po (+39/-0) debian/po/be.po (+39/-0) debian/po/bg.po (+39/-0) debian/po/bn.po (+39/-0) debian/po/bo.po (+39/-0) debian/po/bs.po (+39/-0) debian/po/ca.po (+39/-0) debian/po/cs.po (+39/-0) debian/po/cy.po (+39/-0) debian/po/da.po (+39/-0) debian/po/de.po (+39/-0) debian/po/dz.po (+39/-0) debian/po/el.po (+39/-0) debian/po/eo.po (+39/-0) debian/po/es.po (+39/-0) debian/po/et.po (+39/-0) debian/po/eu.po (+39/-0) debian/po/fa.po (+39/-0) debian/po/fi.po (+39/-0) debian/po/fr.po (+39/-0) debian/po/ga.po (+39/-0) debian/po/gl.po (+39/-0) debian/po/gu.po (+39/-0) debian/po/he.po (+39/-0) debian/po/hi.po (+39/-0) debian/po/hr.po (+39/-0) debian/po/hu.po (+42/-0) debian/po/hy.po (+36/-0) debian/po/id.po (+39/-0) debian/po/is.po (+39/-0) debian/po/it.po (+39/-0) debian/po/ja.po (+39/-0) debian/po/ka.po (+39/-0) debian/po/kab.po (+39/-0) debian/po/kk.po (+39/-0) debian/po/km.po (+39/-0) debian/po/kn.po (+39/-0) debian/po/ko.po (+39/-0) debian/po/ku.po (+39/-0) debian/po/lo.po (+39/-0) debian/po/lt.po (+39/-0) debian/po/lv.po (+39/-0) debian/po/mk.po (+39/-0) debian/po/ml.po (+39/-0) debian/po/mr.po (+39/-0) debian/po/nb.po (+39/-0) debian/po/ne.po (+39/-0) debian/po/nl.po (+39/-0) debian/po/nn.po (+39/-0) debian/po/oc.po (+39/-0) debian/po/pa.po (+39/-0) debian/po/pl.po (+39/-0) debian/po/pt.po (+39/-0) debian/po/pt_BR.po (+39/-0) debian/po/ro.po (+39/-0) debian/po/ru.po (+39/-0) debian/po/se.po (+39/-0) debian/po/si.po (+39/-0) debian/po/sk.po (+39/-0) debian/po/sl.po (+39/-0) debian/po/sq.po (+39/-0) debian/po/sr.po (+39/-0) debian/po/sr@latin.po (+39/-0) debian/po/sv.po (+39/-0) debian/po/ta.po (+39/-0) debian/po/te.po (+39/-0) debian/po/templates.pot (+36/-0) debian/po/tg.po (+39/-0) debian/po/th.po (+39/-0) debian/po/tl.po (+39/-0) debian/po/tr.po (+39/-0) debian/po/ug.po (+39/-0) debian/po/uk.po (+39/-0) debian/po/vi.po (+39/-0) debian/po/zh_CN.po (+39/-0) debian/po/zh_TW.po (+39/-0) debian/preprocessor (+0/-6) debian/rules (+45/-42) debian/vtrgb (+3/-0) debian/vtrgb.vga (+3/-0) setupcon (+41/-5) |
||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Steve Langasek (community) | Approve | ||
| git-ubuntu import | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2023-05-25.
To post a comment you must log in.
Revision history for this message
| Shengjing Zhu (zhsj) wrote | # |
Revision history for this message
| Steve Langasek (vorlon) wrote | # |
Revision history for this message
| Shengjing Zhu (zhsj) wrote | # |
Revision history for this message
| Steve Langasek (vorlon) | # |
review:
Approve
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Delta from existing Ubuntu version:
-XS-Debian-
-XS-Debian-Vcs-Git: https:/
-Vcs-Bzr: http://
+Vcs-Browser: https:/
+Vcs-Git: https:/
This looks reasonable since the listed Vcs-Bzr branch has no commits in 6 years, but should be annotated in the changelog.
+ - Add noudeb build profile
Wrong indentation, this shouldn't be under 'remaining changes' which refers to the carry-over delta but should be a separate top-level entry in the changelog since you've introduced this change in this upload.
Looking at the commit log, there are a number of other changes you've made which are not documented correctly in the changelog. Please resolve.