← Back to branch summary

~ubuntu-branches/ubuntu/raring/wacom-tools/raring

« back to all changes in this revision

Viewing changes to debian/patches/100_fedora-fix-build.diff

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-05-22 12:04:32 UTC
  • mfrom: (1.12.2 upstream) (2.2.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090522120432-00suvwukj864ipib
Tags: 1:0.8.3.2-1ubuntu1
* Merge with Debian unstable, remaining changes:
  - Bump the epoch because of old Ubuntu packaging.
  - debian/control:
    - Change the Maintainer address.
    - Bump the epoch on Replaces/Conflicts.
    - Don't build wacom-kernel-source anymore (#71944).
  - debian/wacom.postinst:
    Remove old files.
  - debian/rules: Disable the scaling quirk.
  - Enable patch system (quilt).
    - Import debian/xsfbs/*
    - Add quilt to build-deps.
  - Include wacomcpl so the stylus can be calibrated. (#216347)
    - debian/rules: --enable-libwacomxi
    - debian/control: Add tcl-dev, tk-dev to Build-Depends, and tcl,
      tk to wacom-tools Depends.
  - Modify 10-linuxwacom.fdi to support WALTOP and N-Trig.
  - Add 104_revert-check.diff: Don't check the serial number, it breaks
    some devices. Disabled for now, needs testing because part of it
    is upstream now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/100_fedora-fix-build.diff
1
 
---
2
 
 src/xdrv/wcmConfig.c |    2 +-
3
 
 src/xdrv/xf86Wacom.h |    2 +-
4
 
 2 files changed, 2 insertions(+), 2 deletions(-)
5
 
 
6
 
--- a/linuxwacom/src/xdrv/xf86Wacom.h   2009-01-15 14:57:45.000000000 -0500
7
 
+++ b/linuxwacom/src/xdrv/xf86Wacom.h   2009-01-15 14:59:33.000000000 -0500
8
 
@@ -23,7 +23,7 @@
9
 
 /****************************************************************************/
10
 
 
11
 
 #include "../include/xdrv-config.h"
12
 
-#ifdef WCM_XORG_XSERVER_1_6
13
 
+#ifdef WCM_XORG
14
 
    #include <xorg-server.h>
15
 
    #include <xorgVersion.h>
16
 
 #else
17
 
--- a/linuxwacom/src/xdrv/wcmConfig.c   2008-12-30 16:46:01.000000000 -0500
18
 
+++ b/linuxwacom/src/xdrv/wcmConfig.c   2009-01-15 15:11:13.000000000 -0500
19
 
@@ -994,7 +994,7 @@ static XF86ModuleVersionInfo xf86WcmVers
20
 
        MODULEVENDORSTRING,
21
 
        MODINFOSTRING1,
22
 
        MODINFOSTRING2,
23
 
-#ifdef WCM_XORG_XSERVER_1_6
24
 
+#ifdef WCM_XORG
25
 
        XORG_VERSION_CURRENT,
26
 
 #else
27
 
        XF86_VERSION_CURRENT,