Merge lp:~ubuntu-branches/ubuntu/lucid/xkeyboard-config/lucid-201010032130 into lp:ubuntu/lucid/xkeyboard-config
Status: | Work in progress |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/xkeyboard-config/lucid-201010032130 |
Merge into: | lp:ubuntu/lucid/xkeyboard-config |
Diff against target: |
955 lines (+1/-890) (has conflicts) 4 files modified
debian/xkb-data.install (+1/-0) install-sh (+0/-519) missing (+0/-367) semantics/semantics.dir (+0/-4) Contents conflict in Makefile.in Contents conflict in aclocal.m4 Contents conflict in compat/Makefile.in Contents conflict in compat/compat.dir Contents conflict in configure Conflict adding file debian/xkb-data.install. Moved existing file to debian/xkb-data.install.moved. Contents conflict in docs/Makefile.in Contents conflict in geometry/Makefile.in Contents conflict in geometry/digital_vndr/Makefile.in Contents conflict in geometry/geometry.dir Contents conflict in geometry/sgi_vndr/Makefile.in Contents conflict in keycodes/Makefile.in Contents conflict in keycodes/digital_vndr/Makefile.in Contents conflict in keycodes/keycodes.dir Contents conflict in keycodes/sgi_vndr/Makefile.in Contents conflict in keymap/Makefile.in Contents conflict in keymap/digital_vndr/Makefile.in Contents conflict in keymap/keymap.dir Contents conflict in keymap/sgi_vndr/Makefile.in Contents conflict in keymap/sun_vndr/Makefile.in Contents conflict in po/Makefile.in.in Contents conflict in rules/Makefile.in Contents conflict in rules/bin/Makefile.in Contents conflict in rules/compat/Makefile.in Contents conflict in rules/evdev.xml.in Contents conflict in rules/extras/Makefile.in Contents conflict in semantics/Makefile.in Contents conflict in symbols/Makefile.in Contents conflict in symbols/digital_vndr/Makefile.in Contents conflict in symbols/extras/Makefile.in Contents conflict in symbols/fujitsu_vndr/Makefile.in Contents conflict in symbols/hp_vndr/Makefile.in Contents conflict in symbols/macintosh_vndr/Makefile.in Contents conflict in symbols/nec_vndr/Makefile.in Contents conflict in symbols/sgi_vndr/Makefile.in Contents conflict in symbols/sony_vndr/Makefile.in Contents conflict in symbols/sun_vndr/Makefile.in Contents conflict in symbols/symbols.dir Contents conflict in symbols/xfree68_vndr/Makefile.in Contents conflict in types/Makefile.in Contents conflict in types/types.dir |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/xkeyboard-config/lucid-201010032130 |
Related bugs: |
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/xkeyboard-config now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/xkeyboard-config/lucid-201010032130. A merge should be performed if necessary.
Unmerged revisions
- 69. By Bryce Harrington
-
Revert kazakh patch - rejected by archive admins as too likely to cause
regressions for others. - 68. By Bryce Harrington
-
Patch to fix kazakh keyboard layout
- 67. By Bryce Harrington
-
Add missing attribution line
- 66. By Bryce Harrington
-
Changes for last few uploads
- 65. By Bryce Harrington
-
Add tw to Makefile so it will install
- 64. By Bryce Harrington
-
Correct mis-copied patch
- 63. By Bryce Harrington
-
Cherrypick patches from upstream git
This includes patches to enable the Apple aluminum keyboards, and
various minor layout enhancements or fixes to particular keys. - 62. By Bryce Harrington
-
Give Arne credit
- 61. By Bryce Harrington
-
Add two patches from Arne
- 60. By Bryce Harrington
-
Merge with Debian and upstream version 1.8