← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to debian/patches/000_ubuntu_fix_read_kernel_mapping.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/000_ubuntu_fix_read_kernel_mapping.patch
1
 
diff -urNad xorg-server-1.0.2~/hw/xfree86/os-support/linux/lnx_KbdMap.c xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_KbdMap.c
2
 
--- xorg-server-1.0.2~/hw/xfree86/os-support/linux/lnx_KbdMap.c 2005-07-03 12:51:16.000000000 +0200
3
 
+++ xorg-server-1.0.2/hw/xfree86/os-support/linux/lnx_KbdMap.c  2006-04-21 08:04:56.000000000 +0200
4
 
@@ -180,7 +180,7 @@
5
 
 /*
6
 
  * Maps the AT keycodes to Linux keycodes
7
 
  */
8
 
-static unsigned char at2lnx[NUM_KEYCODES] =
9
 
+static unsigned char at2lnx[] =
10
 
 {
11
 
        0x01,   /* KEY_Escape */        0x02,   /* KEY_1 */
12
 
        0x03,   /* KEY_2 */             0x04,   /* KEY_3 */