ubuntu/+source/xkeyboard-config:applied/ubuntu/trusty-devel

Last commit made on 2014-01-15
Get this branch:
git clone -b applied/ubuntu/trusty-devel https://git.launchpad.net/ubuntu/+source/xkeyboard-config
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/trusty-devel
Repository:
lp:ubuntu/+source/xkeyboard-config

Recent commits

3e316a1... by Dmitry Shachnev on 2013-12-29

Import patches-applied version 2.10.1-1ubuntu1 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 0f4a889816d5e62ac59c22ef3bd0e201746b54f7
Unapplied parent: 6779f6920378e975eac96551f3b23fdf69e8301e

New changelog entries:
  [ Dmitry Shachnev ]
  * Merge with Debian unstable, remaining changes:
    - control, rules, xkb-data-i18n.install, xkb-data.install: Split out
      xkb-data-i18n to be used by console-setup.
    - xkb-data.postinst.in: Remove the xkb cache to make sure it gets
      regenerated.
    - 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.
    - Add multi-arch support.
  * Dropped change (Ubuntu 12.04 LTS has a version newer than 1.9):
    - Migrate settings from dvorak-intl to dvorak-alt-intl to match rename
      in xkeyboard-config 1.9.
  [ Gunnar Hjalmarsson ]
  * debian/patches/bengali_to_bangla.patch:
    Use the modern language name Bangla instead of Bengali (LP: #991002).

6779f69... by Dmitry Shachnev on 2013-12-29

Import patches-unapplied version 2.10.1-1ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 298d7869e03c7df3988b15c601ec19ed051cf6e7

New changelog entries:
  [ Dmitry Shachnev ]
  * Merge with Debian unstable, remaining changes:
    - control, rules, xkb-data-i18n.install, xkb-data.install: Split out
      xkb-data-i18n to be used by console-setup.
    - xkb-data.postinst.in: Remove the xkb cache to make sure it gets
      regenerated.
    - 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.
    - Add multi-arch support.
  * Dropped change (Ubuntu 12.04 LTS has a version newer than 1.9):
    - Migrate settings from dvorak-intl to dvorak-alt-intl to match rename
      in xkeyboard-config 1.9.
  [ Gunnar Hjalmarsson ]
  * debian/patches/bengali_to_bangla.patch:
    Use the modern language name Bangla instead of Bengali (LP: #991002).

0f4a889... by Julien Cristau on 2013-12-22

Import patches-applied version 2.10.1-1 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: b4a6c2809371d3b8d00781ed933192e6264036fb
Unapplied parent: 298d7869e03c7df3988b15c601ec19ed051cf6e7

New changelog entries:
  [ Dmitry Shachnev ]
  * New upstream release (closes: #718730).
  * Refresh revert-goodmap-badmap-for-apple.diff.
  * Drop preserve-shift.diff, applied upstream.
  * Update debian/watch for new tarballs location (closes: #727812).
  * Disable autopoint, it causes build failure and we use intltoolize
    instead.
  * Bump Standards-Version to 3.9.5, no changes needed.

298d786... by Julien Cristau on 2013-12-22

Import patches-unapplied version 2.10.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ac6b30c3913fa5df28db3e1da867d8a249cc5ab1

New changelog entries:
  [ Dmitry Shachnev ]
  * New upstream release (closes: #718730).
  * Refresh revert-goodmap-badmap-for-apple.diff.
  * Drop preserve-shift.diff, applied upstream.
  * Update debian/watch for new tarballs location (closes: #727812).
  * Disable autopoint, it causes build failure and we use intltoolize
    instead.
  * Bump Standards-Version to 3.9.5, no changes needed.

b4a6c28... by Julien Cristau on 2012-12-25

Import patches-applied version 2.5.1-3 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 8997cad8adf07192cef421fa2e5f87ce8abb7437
Unapplied parent: ac6b30c3913fa5df28db3e1da867d8a249cc5ab1

New changelog entries:
  * Cherry-picks from upstream:
    - A couple of missing chars in gr(polytonic), added on levels 3, 4
      (closes: #696126)
    - Reverting broken fix for is keyboard
    - symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (closes: #657440)
    - symbols/gr: fix comment (closes: #696125)

ac6b30c... by Julien Cristau on 2012-12-25

Import patches-unapplied version 2.5.1-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3c5616146aa4cd6d74fa66b42f2df28bad262d7c

New changelog entries:
  * Cherry-picks from upstream:
    - A couple of missing chars in gr(polytonic), added on levels 3, 4
      (closes: #696126)
    - Reverting broken fix for is keyboard
    - symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (closes: #657440)
    - symbols/gr: fix comment (closes: #696125)

8997cad... by Michael Biebl on 2012-09-21

Import patches-applied version 2.5.1-2.1 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 1fce2f2a5b13435432ab25cff7d2b9ec1ee07493
Unapplied parent: 3c5616146aa4cd6d74fa66b42f2df28bad262d7c

New changelog entries:
  * Non-maintainer upload.
  * Preserve Shift modifier so GTK3 apps can properly differentiate between
    F10 and Shift+F10 (Closes: #656685).

3c56161... by Michael Biebl on 2012-09-21

Import patches-unapplied version 2.5.1-2.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: cad9e709337c752b9aa9ea34d85ff02366e24fec

New changelog entries:
  * Non-maintainer upload.
  * Preserve Shift modifier so GTK3 apps can properly differentiate between
    F10 and Shift+F10 (Closes: #656685).

1fce2f2... by Cyril Brulebois on 2012-08-05

Import patches-applied version 2.5.1-2 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 1f5fb656a340386e7e477e589532b248f5587115
Unapplied parent: cad9e709337c752b9aa9ea34d85ff02366e24fec

New changelog entries:
  [ Ansgar Burchardt ]
  * Use xz compression for binary packages (Closes: #683891).

cad9e70... by Cyril Brulebois on 2012-08-05

Import patches-unapplied version 2.5.1-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: fe70add04bb3d4c90b888df2951318945960dff3

New changelog entries:
  [ Ansgar Burchardt ]
  * Use xz compression for binary packages (Closes: #683891).