lp:ubuntu/precise/xkeyboard-config

Created by James Westby on 2011-10-13 and last modified on 2012-01-24
Get this branch:
bzr branch lp:ubuntu/precise/xkeyboard-config
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Status:
Mature

Recent revisions

78. By Timo Aaltonen on 2012-01-24

* Merge from Debian experimental. Remaining Ubuntu changes:
  + rules, xkb-data-i18n.install, xkb-data.install: Split out
    xkb-data-i18n to be used by console-setup.
  + 105_intelligent_keyboard.patch: Add support for the Intelligent
    Keyboard K04
  + 108_fix_intltool_make_check.diff: Fix make check in the presence
    of the quilt patch system.
  + xkb-data.postinst.in: Migrate console-setup/keyboard-configuration
    settings from dvorak-intl to dvorak-alt-intl to match rename in
    xkeyboard-config 1.9. (LP: 742683)
* xkb-data.install: Add missing directories (man, pkgconfig).
* xkb-data.postinst: Remove the xkb cache to make sure it gets regenerated.

77. By Timo Aaltonen <tjaalton@batty> on 2011-10-05

rules: Bring back the pot file build, very much needed still.
This time move the original file away during build, and restore
on clean. (LP: #868554)

76. By Timo Aaltonen on 2011-08-11

* Merge from Debian experimental. Remaining Ubuntu changes:
    + xkb-data-i18n.install, xkb-data.install, rules: Split out
      xkb-data-i18n to be used by console-setup.
    + 105_intelligent_keyboard.patch: Add support for the Intelligent
      Keyboard K04
    + 108_fix_intltool_make_check.diff: Fix make check in the presence
      of the quilt patch system.
    + xkb-data.postinst.in: Migrate console-setup/keyboard-configuration
      settings from dvorak-intl to dvorak-alt-intl to match rename in
      xkeyboard-config 1.9. (LP: 742683)
* No need to build the pot file anymore, upstream version is used.
* Fix dh_autoreconf override in rules (FTBFS).

75. By Bryce Harrington on 2011-06-06

* Add 109_west_bengal_layouts.patch: four new Bengali keyboard layouts
  (LP: #793778)
* Add 110_hu_revert_ellipsis_to_greater.patch: Cherrypick of upstream
  commit to revert the period key from ellipsis to greater. The latter
  was felt to be the more efficient key usage even though it's a bit
  redundant with other keys.
  (LP: #793042)

74. By Chris Halse Rogers on 2011-05-24

* Merge from Debian experimental. Remaining Ubuntu changes:
    + xkb-data-i18n.install, xkb-data.install, rules: Split out
      xkb-data-i18n to be used by console-setup.
    + rules: Generate pot file for translations during build
    + 105_intelligent_keyboard.patch: Add support for the Intelligent
      Keyboard K04
* debian/patches/108_taiwan.patch:
* debian/patches/104_macbook_expose_and_dashboard.patch:
* debian/patches/107_lao.patch:
  - Drop, included upstream
* debian/xkb-data.postinst.in:
  - Migrate console-setup/keyboard-configuration settings from dvorak-intl
    to dvorak-alt-intl to match rename in xkeyboard-config 1.9. (LP: #742683)
* debian/patches/108_fix_intltool_make_check.diff:
  - Fix make check in the presence of the quilt patch system.

73. By Evan on 2011-02-08

Fix broken HTC Dream stanza.

72. By Bryce Harrington on 2011-02-03

Refresh patches 104, 105, 108 to apply

71. By Bryce Harrington on 2011-02-01

* Merge from debian of 2.1 release.
  - Fixes Ubuntu bugs:
    + Sindhi keyboard layout (locale: sd_PK, sd_IN) (LP: #588918)
    + Fix conflict between Mali and Malayalam layouts (LP: #575660)
    + Support for Philippines "National Keyboard Layout" (LP: #672881)
    + Support for Kinesis keyboard geometry (LP: #393887)
    + Support for Apple Aluminium keyboards (LP: #696232)
    + Support for abnt2 keyboard, thinkpad variant for Lenovo 3000 v100
      laptops (LP: #359719)
    + Fix CapsLock misspelling (LP: #592448)
  - Remaining Ubuntu changes:
    + xkb-data-i18n.install, xkb-data.install, rules: Split out
      xkb-data-i18n to be used by console-setup.
    + rules: Generate pot file for translations during build
    + 104_macbook_expose_and_dashboard.patch: Add keycode definitions
        required for Apples Expose & Dashboard keys (F3/F4).
    + 105_intelligent_keyboard.patch: Add support for the Intelligent
      Keyboard K04
    + 107_lao.patch: New keyboard layout for Lao, implemented as
      an alternative to the default one.
    + 108_taiwan.patch: New keyboard layouts for Taiwan.
* Drop 102_mac_aliases.patch: This appears to have some side effects,
  and the patch was not taken by upstream because it was an incomplete
  fix. Reopens bug 327963
* Drop patches included in the new upstream release:
    - 106_fixspell3d.patch: upstream
    - 109_mali.patch: upstream
    - 110_variants-cleanup.patch
    - 111_il-missing-symbol.patch
    - 112_zero-with-spacing.patch
    - 113_cz-dvorak-ucw.patch
    - 114_ejn_4_level.patch
    - 115_aluminium_geometries.patch
    - 116_aluminium_keycodes.patch
    - 117_aluminium_symbols.patch
    - 118_aluminium_aliases.patch
    - 119_aluminium_pc_compat.patch
    - 120_aluminium_rules.patch
    - 121_tamil_chars.patch
    - 122_olpc-azerty.patch
    - 123_fix_i18n.patch
    - 124_serbian_ru_level3.patch
    - 125_mapping_tools_launch5_menukb.patch
    - 126_swahili_arabic.patch
    - 127_restore_gb_colemak.patch

70. By Bryce Harrington on 2010-04-14

* rules: Make pot file as part of build process.
  (LP: #562872)
* Renumber patch 130 to 128 so is consecutive

69. By Bryce Harrington on 2010-04-19

Revert kazakh patch - rejected by archive admins as too likely to cause
regressions for others.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/quantal/xkeyboard-config
This branch contains Public information 
Everyone can see this information.

Subscribers