xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2010-11-19 Thread Cyril Brulebois 
 debian/changelog |8 ++--
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 94fe1dc0f12bd3ec7b0339782f27217e6f49748a
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 19 21:16:00 2010 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index ee438c4..ef26ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-aiptek (1:1.3.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-aiptek (1:1.3.1-1) experimental; urgency=low
 
   [ Robert Hooker ]
   * New upstream release.
@@ -7,7 +7,7 @@ xserver-xorg-input-aiptek (1:1.3.1-1) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Add myself to Uploaders.
 
- -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 13:52:05 -0400
+ -- Cyril Brulebois k...@debian.org  Fri, 19 Nov 2010 21:15:57 +0100
 
 xserver-xorg-input-aiptek (1:1.3.0-3) experimental; urgency=low
 

commit ad528f4d84a89bafb3586207748d473c986a4989
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 19 21:15:53 2010 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index c1b88e6..ee438c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-input-aiptek (1:1.3.1-1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * New upstream release.
   * Bump xutils-dev requirement for new util-macros.
 
+  [ Cyril Brulebois ]
+  * Add myself to Uploaders.
+
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 13:52:05 -0400
 
 xserver-xorg-input-aiptek (1:1.3.0-3) experimental; urgency=low
diff --git a/debian/control b/debian/control
index b957f67..c891ea0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-aiptek
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Cyril Brulebois 
k...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pjxzr-0007s8...@alioth.debian.org

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2010-10-18 Thread Robert Hooker 
 .gitignore   |   76 --
 COPYING  |   33 --
 ChangeLog|  281 +++
 Makefile.am  |   11 +-
 configure.ac |   59 +--
 debian/changelog |7 +
 debian/control   |2 
 man/Makefile.am  |   61 +++
 src/Makefile.am  |4 
 src/xf86Aiptek.c |   68 -
 src/xf86Aiptek.h |6 -
 11 files changed, 486 insertions(+), 122 deletions(-)

New commits:
commit 3537d32f7812ce5618d2a69d97d49a2bbcaa106a
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 13:53:42 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index 992c944..c1b88e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-input-aiptek (1:1.3.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
- -- Robert Hooker robert.hoo...@canonical.com  Mon, 18 Oct 2010 13:48:45 
-0400
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 13:52:05 -0400
 
 xserver-xorg-input-aiptek (1:1.3.0-3) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c07d90d..b957f67 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  x11proto-input-dev,
  automake,
  libtool,
- xutils-dev
+ xutils-dev (= 1:7.5+4)
 Standards-Version: 3.8.3
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-aiptek
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-aiptek.git

commit 9c211a91504fe5643f8682972c6279d48cfbd7b3
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 13:49:24 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 62c59be..4ccb0ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,284 @@
+commit 799d13a3ac1f15ebca3625183340379840beb2f3
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Aug 10 10:28:26 2010 -0400
+
+xf86-input-aiptek 1.3.1
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 209b9147799079981db4abebdbac093dec59d5a5
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu May 27 19:35:46 2010 -0400
+
+config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
+
+It depends on util-macros 1.8
+The existing statement can now be removed from the configuration file.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 7a08e526ad7ebe2702269d5a0a048f62b1bfbca1
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu May 27 19:34:40 2010 -0400
+
+config: upgrade to util-macros 1.8 for additional man page support
+
+Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+The value of MAN_SUBST is the same for all X.Org packages.
+
+Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit e4976108867158f0c90cd1023595f858bea1ea56
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Apr 17 18:52:54 2010 -0400
+
+man: Use Autoconf provided $(AM_V_GEN)$(SED)
+
+Enables silent rule and use platform appropriate version of sed.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 39f1c78b01fb8f2c0450f02c8f5a6329dff6dd04
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Apr 15 10:46:42 2010 -0400
+
+config: fix warnings, m4 quoting and layout
+
+Fix some m4 quoting
+Fix some autoconf warnings
+Regroup statements per section
+Add comments
+Upgrade X.Org macros to 1.4 for INSTALL file copying
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 43cdbc01fb1f7197134434b7db00705e4e6c8d56
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Apr 15 10:24:16 2010 -0400
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit e97e0199a722bdfa30ef0ba070f421e01987ce25
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Apr 15 10:22:35 2010 -0400
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Regroup AC statements at the top.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit a4da6aa6996c7030b48b39eafbadeed8e512010e
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Apr 15 10:20:43 2010 -0400
+
+config: update AC_PREREQ statement to 2.60
+
+Unrelated to the previous patches, the new value simply reflects
+the reality that the minimum level for autoconf to configure
+all x.org modules is 2.60 dated June 2006.
+
+ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit c0aa30c9d92617d0febe521780588e095569216a
+Author: Gaetan Nadon mems...@videotron.ca

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2010-10-12 Thread Cyril Brulebois 
 debian/README.source  |2 +-
 debian/changelog  |   15 +++
 debian/control|8 +++-
 debian/rules  |   14 +++---
 debian/xsfbs/xsfbs.mk |   35 ++-
 5 files changed, 48 insertions(+), 26 deletions(-)

New commits:
commit 1d2fa6af6f58a9b623d10b6d725e38e15e88fbdc
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 13 01:37:44 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 4a73640..a2057c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-aiptek (1:1.3.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-aiptek (1:1.3.0-3) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.
 
- -- Cyril Brulebois k...@debian.org  Wed, 13 Oct 2010 01:37:17 +0200
+ -- Cyril Brulebois k...@debian.org  Wed, 13 Oct 2010 01:37:40 +0200
 
 xserver-xorg-input-aiptek (1:1.3.0-2) unstable; urgency=medium
 

commit 2ddeb50ad7d80f94961935574de1922d1fcf2943
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 13 01:37:31 2010 +0200

Build against Xserver 1.9.1 rc1.

diff --git a/debian/changelog b/debian/changelog
index a1aea9e..4a73640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-aiptek (1:1.3.0-3) UNRELEASED; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois k...@debian.org  Wed, 13 Oct 2010 01:37:17 +0200
+
 xserver-xorg-input-aiptek (1:1.3.0-2) unstable; urgency=medium
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
diff --git a/debian/control b/debian/control
index aa80dda..c07d90d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.7.6.901),
+ xserver-xorg-dev (= 2:1.9.0.901),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,

commit 7e9482489694dac53da10cce35dcf49aad35bae0
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 15 17:03:29 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 1ab7f3d..a1aea9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-aiptek (1:1.3.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-aiptek (1:1.3.0-2) unstable; urgency=medium
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
   * Update xsfbs, use new ${xinpdriver:Depends} substvar.
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:11:25 +0100
+ -- Julien Cristau jcris...@debian.org  Sat, 15 May 2010 17:02:45 +0200
 
 xserver-xorg-input-aiptek (1:1.3.0-1) experimental; urgency=low
 

commit 23eac429e12aaa50347cf4f722579c96668274c7
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 15 16:56:54 2010 +0200

Update xsfbs, use new ${xinpdriver:Depends} substvar.

diff --git a/debian/changelog b/debian/changelog
index 78c85e7..1ab7f3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-aiptek (1:1.3.0-2) UNRELEASED; urgency=low
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
+  * Update xsfbs, use new ${xinpdriver:Depends} substvar.
 
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:11:25 +0100
 
diff --git a/debian/control b/debian/control
index 96ea097..aa80dda 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.7),
+ xserver-xorg-dev (= 2:1.7.6.901),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,
@@ -19,7 +19,7 @@ XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-aipt
 
 Package: xserver-xorg-input-aiptek
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends}
 Provides: ${xinpdriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- Aiptek input driver

commit 4d22f37dff66805dc4a8f055a14ec13c69a65ffd
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:55 2010 +0700

Remove duplicate xorg.fd.o URL and confusing mailing list URL from 
debian/control

diff --git a/debian/control b/debian/control
index a2a6917..96ea097 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,5 @@ Description: X.Org X server -- Aiptek input driver
  .
  More information about X.Org can be found at:
  URL:http://www.X.org
- URL:http://xorg.freedesktop.org
- URL:http://lists.freedesktop.org/mailman/listinfo/xorg
  .
  This package is built from the X.org xf86-input-aiptek driver module.

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2009-12-05 Thread Cyril Brulebois 
 ChangeLog |   52 ++
 configure.ac  |   32 +-
 debian/README.source  |   73 ++
 debian/changelog  |   17 +++
 debian/control|4 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 src/xf86Aiptek.c  |   95 ++-
 8 files changed, 221 insertions(+), 318 deletions(-)

New commits:
commit 3984724b977d5a8f599658666ab4c75f5d90a3f0
Author: Cyril Brulebois k...@debian.org
Date:   Sat Dec 5 23:33:38 2009 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 5daeab9..8b00805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-input-aiptek (1:1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-aiptek (1:1.3.0-1) experimental; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:02 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Dec 2009 23:33:34 +0100
 
 xserver-xorg-input-aiptek (1:1.2.0-2) unstable; urgency=low
 

commit 7f3a11b0d1da60933b9563bb96058c0bc0c793fc
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 02:09:22 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index d405669..5daeab9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-input-aiptek (1:1.3.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 27 Nov 2009 17:16:24 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:02 +0200
 
 xserver-xorg-input-aiptek (1:1.2.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 324aa6b..a03cd85 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Julien Cristau 
jcris...@debian.
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.5.99.901),
+ xserver-xorg-dev (= 2:1.7),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,

commit d2c06c5d068a73c696d5a87ecf254544fd1a5a2e
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 11:41:40 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 48e6e6a..d405669 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-aiptek (1:1.3.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 27 Nov 2009 17:16:24 +0200
 
diff --git a/debian/control b/debian/control
index ff753e4..324aa6b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.8.3
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-aiptek
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-aiptek.git
 

commit c2c32ef24bfe781b69260cab2d22a475a29343f3
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Fri Nov 27 17:16:57 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 3ca6a2f..62c59be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+commit 19ab688471916b0b4ab780ea39b60f2199234f54
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Sep 11 12:04:00 2009 +1000
+
+aiptek 1.3.0
+
+commit c6628efe89ba9f6d5274e4d5677c039cef89eb6f
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Sep 11 12:03:35 2009 +1000
+
+Require xorg-macros 1.3 for XORG_DEFAULT_OPTIONS.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 51ded98cc9643c6789d3297b4e60097fcb342cd5
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Sep 11 12:02:53 2009 +1000
+
+Remove some unused crap from configure.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit ca98d5b84fa7e4ed4ea0ae09226728ba137f7c46
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Aug 25 21:03:39 2009 +1000
+
+Hide the InitKeyClassDeviceStruct behind ABI ifdefs.
+
+Function was removed from the server a while ago.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 3337f41ca5af021fb7ed8db0efc5e39f04e3d012
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Aug 19 15:11:42 2009 +1000
+
+Reset local-private to NULL after freeing it. (#22693)
+
+If it's not NULL, xf86DeleteInput will try to free it again.
+
+X.Org Bug 22693 http://bugs.freedesktop.org/show_bug.cgi?id=22693
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit f440e333bb535854ed25e258fc502b1b6a8d5e44
+Author: Peter Hutterer

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2009-04-01 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/rules |7 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 9da5c3660e51984cb7b1a92438c7b7fbc563eaab
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 1 00:59:16 2009 +0200

Allow parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 93d361b..1003c7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-aiptek (1:1.2.0-2) UNRELEASED; urgency=low
+
+  * Allow parallel builds.
+
+ -- Julien Cristau jcris...@debian.org  Wed, 01 Apr 2009 00:59:08 +0200
+
 xserver-xorg-input-aiptek (1:1.2.0-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 1e2b63c..2b41b79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,14 @@
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2009-03-31 Thread Timo Aaltonen 
 .cvsignore   |   19 
 .gitignore   |   26 
 ChangeLog|  400 
 Makefile.am  |9 
 Makefile.in  |  653 -
 README   |   20 
 aclocal.m4   | 7951 ---
 config.guess | 1500 ---
 config.h.in  |   66 
 config.sub   | 1616 
 configure|22051 ---
 configure.ac |   17 
 debian/changelog |   20 
 debian/control   |   11 
 debian/rules |   20 
 depcomp  |  530 -
 install-sh   |  323 
 ltmain.sh| 6871 -
 man/.cvsignore   |2 
 man/Makefile.in  |  419 -
 man/aiptek.man   |2 
 missing  |  360 
 mkinstalldirs|  158 
 src/.cvsignore   |6 
 src/Makefile.am  |5 
 src/Makefile.in  |  504 -
 src/xf86Aiptek.c |  267 
 src/xf86Aiptek.h |   10 
 28 files changed, 652 insertions(+), 43184 deletions(-)

New commits:
commit 58823fa8bf3d1636421d15f1c8b849a46c73b68f
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Tue Mar 31 17:16:05 2009 +0300

Update the upstream ChangeLog.

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000..3ca6a2f
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,388 @@
+commit b4dfb51ee61f5c54134e5731e0581f9f74bc6829
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Feb 24 13:44:25 2009 +1000
+
+aiptek 1.2.0
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit acfbb985d63861cf414f568001a4bce89b75b0d9
+Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
+Date:   Mon Feb 2 18:13:44 2009 -0200
+
+Janitor: rework make distcheck
+
+  Don't use a static ChangeLog, and distribute the generated one.
+  Use only one .gitignore file.
+  Minor cleanup on configure.ac, aiming as similar as possible
+drivers configure.ac's.
+
+commit 3c0327e190e134a4435b4c22238749fed12a6709
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Thu Jan 29 15:11:26 2009 -0800
+
+Add README with pointers to mailing list, bugzilla  git repos
+
+commit 8d05f481f0219dafed821b7cc89784afe73a5e24
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 9 16:10:14 2009 -0800
+
+Remove xorgconfig  xorgcfg from See Also list in man page
+
+commit 9caf1a8372b5c9bae4032d256bb6065d8dbf26ba
+Author: Peter Hutterer peter.hutte...@redhat.com
+Date:   Thu Aug 14 15:01:28 2008 +0930
+
+Fix build, xf86Version.h has been superseeded by xorgVersion.h
+
+commit 87a3bd344129c06e4f4f90b10d13347b77f2be93
+Author: Julien Cristau jcris...@debian.org
+Date:   Thu Jul 17 18:25:05 2008 +0200
+
+Link against -lm for sqrt()
+
+commit 056b2a86085fd68f6408c53eb148284e2b506e77
+Author: Peter Hutterer pe...@cs.unisa.edu.au
+Date:   Mon May 26 22:01:29 2008 +0930
+
+Check for XINPUT ABI 3.
+
+commit a92bf3b53a277928c94aa87f245ccf301c1e7a2d
+Author: René van Paassen rene.vanpaas...@gmail.com
+Date:   Tue Jan 29 22:42:40 2008 +0100
+
+Bumped the version to 1.1.1
+
+This version is actually being tested/used by someone with a tablet (me)
+
+commit 4a8945d179f3ca9c6ca3553d36ce9840228cf84f
+Author: René van Paassen r...@pascua.localdomain
+Date:   Tue Jan 29 22:32:04 2008 +0100
+
+added #if to handle MiPointer{Current|Get}Screen cases
+
+commit 28269504679fd705f5666c450dbf862f91c8ca84
+Author: René van Paassen r...@pascua.localdomain
+Date:   Tue Jan 29 22:29:41 2008 +0100
+
+moved xf86AiptekClose after RemoveEnabled.., fixes crash VT switch
+
+commit a23587a1eef2c256ae9d4184405efb74135e13d5
+Author: René van Paassen r...@pascua.localdomain
+Date:   Tue Jan 29 22:24:34 2008 +0100
+
+Converted xf86msg into debug messages, to prevent filling the log
+
+commit 51a90b36853a98f6ec5f04c54a9d76fddcfa8ad6
+Author: Peter Hutterer pe...@cs.unisa.edu.au
+Date:   Thu Jan 17 17:21:38 2008 +1030
+
+Don't worry about being core pointer if XInput API is  0.
+
+Server 1.4 and above let all devices be XI devices and the core devices are
+virtual. So we don't have to worry about it in the driver.
+
+This should make the code compatible with both 1.3 and 1.4.
+
+commit f424235dd26fa22bc3830cf9d884d7643abf3568
+Author: Peter Hutterer pe...@cs.unisa.edu.au
+Date:   Thu Jan 17 13:24:46 2008 +1030
+
+Revert Driver's don't have to worry about being core pointers anymore.
+There's a better way of doing things. See next commit.
+
+This reverts commit 66e0fbb24377ac14b9cf8a80a55253cff13d7913.
+
+commit e34bc8e774d92bd81dcefbcd341ab3f040a7f144
+Author: Peter Hutterer pe...@cs.unisa.edu.au
+Date:   Thu Jan 10 11:27:39 2008 +1030
+
+Remove redefinition of NEED_XF86_TYPES.
+
+commit a88dafb63b0e0f3e4557ae75a3ee9a377ea4ef68
+Author: Peter Hutterer pe...@cs.unisa.edu.au
+Date:   Thu Jan 10 11:26:49 2008 +1030
+
+miPointerCurrentScreen is deprecated, miPointerGetScreen is all the rage 
now.
+
+Untested due to lack of device.
+
+commit 66e0fbb24377ac14b9cf8a80a55253cff13d7913
+Author: Peter Hutterer pe...@cs.unisa.edu.au

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2009-03-31 Thread Julien Cristau 
 debian/changelog |8 ++--
 debian/control   |2 +-
 debian/rules |2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit c1cd0cbeaaea9435a380579f34119cc938da8b3d
Author: Julien Cristau jcris...@debian.org
Date:   Tue Mar 31 22:06:03 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d9c0d45..93d361b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-aiptek (1:1.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-aiptek (1:1.2.0-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
@@ -8,7 +8,7 @@ xserver-xorg-input-aiptek (1:1.2.0-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Build against xserver = 1.6 rc1.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 31 Mar 2009 16:09:22 +0300
+ -- Julien Cristau jcris...@debian.org  Tue, 31 Mar 2009 22:05:22 +0200
 
 xserver-xorg-input-aiptek (1:1.1.1-1) unstable; urgency=low
 

commit 2fa632e5844403f412077a2eb1e3080a5edf9424
Author: Julien Cristau jcris...@debian.org
Date:   Tue Mar 31 22:03:50 2009 +0200

Don't try to apply patches, we don't have any

Causes FTBFS due to missing quilt build-dep

diff --git a/debian/rules b/debian/rules
index d87d3a6..1e2b63c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure:
autoreconf -vfi
 
 obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure

commit d2af41fe43aa750a39ef0bcb05bd8c3881e50c20
Author: Julien Cristau jcris...@debian.org
Date:   Tue Mar 31 22:03:46 2009 +0200

Build against xserver = 1.6 rc1.

diff --git a/debian/changelog b/debian/changelog
index c6cb3fb..d9c0d45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xserver-xorg-input-aiptek (1:1.2.0-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Run autoreconf at build time; build-depend on automake, libtool
 and xutils-dev.
 
+  [ Julien Cristau ]
+  * Build against xserver = 1.6 rc1.
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 31 Mar 2009 16:09:22 +0300
 
 xserver-xorg-input-aiptek (1:1.1.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2b3d515..ff753e4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Julien Cristau 
jcris...@debian.
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.4),
+ xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2009-03-31 Thread Julien Cristau 
 debian/xsfbs/repack.sh   |   32 +++
 debian/xsfbs/xsfbs-autoreconf.mk |  150 --
 debian/xsfbs/xsfbs.mk|  127 +---
 debian/xsfbs/xsfbs.sh|  405 +--
 4 files changed, 233 insertions(+), 481 deletions(-)

New commits:
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Feb 17 17:20:42 2009 +0100

xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so

libx11's postinst was the only post-sarge user, and it's gone now.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
   fi
 }
 
-register_x_lib_dir_with_ld_so () {
-  # syntax: register_x_lib_dir_with_ld_so
-  #
-  # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
-  # libraries.
-  #
-  # Call this function from the postinst script of a package that places a
-  # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
-  local dir ldsoconf
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line not already present?
-  if ! fgrep -qsx $dir $ldsoconf; then
-observe adding $dir directory to $ldsoconf
-echo $dir  $ldsoconf
-  fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
-  # syntax: deregister_x_lib_dir_with_ld_so
-  #
-  # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
-  # libraries, if and only if no shared libaries remain there.
-  #
-  # Call this function from the postrm script of a package that places a shared
-  # library in /usr/X11R6/lib, in the event $1 is remove, and before
-  # invoking ldconfig.
-
-  local dir ldsoconf fgrep_status cmp_status
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line present?
-  if fgrep -qsx $dir $ldsoconf; then
-# are there any shared objects in the directory?
-if [ $(echo $dir/lib*.so.*.*) = $dir/lib*.so.*.* ]; then
-  # glob expansion produced nothing, so no shared libraries are present
-  observe removing $dir directory from $ldsoconf
-  # rewrite the file (very carefully)
-  set +e
-  fgrep -svx $dir $ldsoconf  $ldsoconf.dpkg-tmp
-  fgrep_status=$?
-  set -e
-  case $fgrep_status in
-0|1) ;; # we don't actually care if any lines matched or not
-*) die error reading \$ldsoconf\; fgrep exited with status \
-  $fgrep_status ;;
-  esac
-  set +e
-  cmp -s $ldsoconf.dpkg-tmp $ldsoconf
-  cmp_status=$?
-  set -e
-  case $cmp_status in
-0) rm $ldsoconf.dpkg-tmp ;; # files are identical
-1) mv $ldsoconf.dpkg-tmp $ldsoconf ;; # files differ
-*) die error comparing \$ldsoconf.dpkg-tmp\ to \$ldsoconf\; \
-  cmp exited with status $cmp_status ;;
-  esac
-fi
-  fi
-}
-
 make_symlink_sane () {
   # syntax: make_symlink_sane symlink target
   #

commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau jcris...@debian.org
Date:   Sun Feb 1 01:31:31 2009 +0100

xsfbs: add a repack script for uscan

This will automatically prune upstream tarballs

diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+   exit 0
+fi
+
+if [ x$1 != x--upstream-version ]; then
+   exit 1
+fi
+
+version=$2
+filename=$3
+
+if [ -z $version ] || ! [ -f $filename ]; then
+   exit 1
+fi
+
+dir=$(pwd)
+tempdir=$(mktemp -d)
+
+cd $tempdir
+tar xf $dir/$filename
+cat $dir/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf $dir/$filename *
+cd $dir
+rm -rf $tempdir
+echo Done pruning upstream tarball
+
+exit 0

commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jul 17 15:44:45 2008 +0200

xsfbs.mk: make 'log' a separate target

'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
 .PHONY: prepare
 stampdir_targets+=prepare
 prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
-   mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
$@
 
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+   mkdir -p $(STAMP_DIR)/log
+
 # Apply all patches to the upstream source.
 .PHONY: patch
 stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 
 # Revert all patches to the upstream source.
 .PHONY: unpatch
-unpatch:

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2007-09-14 Thread Brice Goglin 
 debian/changelog |6 ++
 debian/copyright |3 +++
 2 files changed, 9 insertions(+)

New commits:
commit c4f2aeb299bcf010b9647e5f8aafd2e1ecb8a307
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sat Sep 15 01:40:24 2007 +0200

Add upstream URL to debian/copyright

diff --git a/debian/changelog b/debian/changelog
index fe2cd00..c113fea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-aiptek (1:1.0.1-5) UNRELEASED; urgency=low
+
+  * Add upstream URL to debian/copyright.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 01:40:08 +0200
+
 xserver-xorg-input-aiptek (1:1.0.1-4) experimental; urgency=low
 
   * Build against xserver 1.4.
diff --git a/debian/copyright b/debian/copyright
index 0834f79..dad76da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
 Copyright 2003 by Bryan W. Headley. [EMAIL PROTECTED]
 
 Lineage: This driver is based on both the xf86HyperPen and xf86Wacom tablet


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2007-09-11 Thread Julien Cristau 
 Makefile.in   |   16 
 aclocal.m4|  379 +-
 config.guess  |  667 ++--
 config.h.in   |9 
 config.sub|  230 +
 configure | 7799 ++
 debian/changelog  |   25 
 debian/control|   12 
 debian/rules  |2 
 debian/xsfbs/xsfbs.mk |   46 
 debian/xsfbs/xsfbs.sh |7 
 ltmain.sh |   12 
 man/Makefile.in   |   16 
 mkinstalldirs |   89 
 src/Makefile.in   |   14 
 15 files changed, 5103 insertions(+), 4220 deletions(-)

New commits:
commit eae77d4ad703964b5861e1512f3d5859ed5aff6c
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Sep 11 23:35:53 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 5d3d378..fe2cd00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-input-aiptek (1:1.0.1-4) UNRELEASED; urgency=low
+xserver-xorg-input-aiptek (1:1.0.1-4) experimental; urgency=low
 
   * Build against xserver 1.4.
   * Generate the Provides field automatically.
   * Add myself to Uploaders and remove Branden with his permission.
 
- -- Julien Cristau [EMAIL PROTECTED]  Tue, 11 Sep 2007 22:58:52 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Tue, 11 Sep 2007 23:30:20 +0200
 
 xserver-xorg-input-aiptek (1:1.0.1-3) unstable; urgency=low
 

commit 6ad15e30ddd4567bf5b20a1f889e003376b888bb
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Sep 11 23:03:47 2007 +0200

Update for xserver 1.4

* Bump xserver-xorg-dev build-dep
* Generate the Provides field automatically
* Add myself to Uploaders and remove Branden

diff --git a/debian/changelog b/debian/changelog
index 4fcaaa7..5d3d378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-aiptek (1:1.0.1-4) UNRELEASED; urgency=low
+
+  * Build against xserver 1.4.
+  * Generate the Provides field automatically.
+  * Add myself to Uploaders and remove Branden with his permission.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Tue, 11 Sep 2007 22:58:52 +0200
+
 xserver-xorg-input-aiptek (1:1.0.1-3) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 63c8887..81e7557 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xserver-xorg-input-aiptek
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 
2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
+Uploaders: David Nusinow [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED]
+Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-aiptek
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-aiptek.git
@@ -11,7 +11,7 @@ XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-aipt
 Package: xserver-xorg-input-aiptek
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Provides: xserver-xorg-input
+Provides: ${xinpdriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- Aiptek input driver
  This package provides the driver for Aiptek HyperPen USB graphics tablets.

commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Aug 29 09:36:00 2007 +0200

Do not call laptop-detect, let the only user call it directly

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
 
 ARCHITECTURE=$(dpkg --print-installation-architecture)
 
-LAPTOP=
-if [ -n $(which laptop-detect) ]; then
-if laptop-detect /dev/null; then
-   LAPTOP=true
-fi
-fi
-
 if [ $1 = reconfigure ] || [ -n $DEBCONF_RECONFIGURE ]; then
   RECONFIGURE=true
 else

commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Thu Jul 12 16:06:22 2007 +0200

Fix display the output of quilt push/pop.

Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next /dev/null 21; then \
  echo -n Applying patches...; \
- if $(QUILT) push -a -v 21 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v $(STAMP_DIR)/log/patch 21; then \
+   cat $(STAMP_DIR)/log/patch; \
echo successful.; \

xserver-xorg-input-aiptek: Changes to 'debian-experimental'

2007-02-18 Thread Julien Cristau 
 debian/changelog  |5 ++---
 debian/control|4 ++--
 debian/rules  |2 +-
 debian/xsfbs/xsfbs.mk |   15 +++
 4 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 5c501810577ca99ebbeb64d5ca364af44ccf71bd
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Feb 18 18:03:43 2007 +0100

Generate the dependency on xserver-xorg-core automatically.

diff --git a/debian/changelog b/debian/changelog
index 622f019..9f26f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,9 @@ xserver-xorg-input-aiptek (1:1.0.1-3) UN
 
   * Add link to xserver-xorg-core bug script, so that bugreports contain
 the user's config and log files.
-  * Bump dependency on xserver-xorg-core to = 2:1.1.1-11, as previous
-versions don't have the bug script.
+  * Generate the dependency on xserver-xorg-core automatically.
 
- -- Julien Cristau [EMAIL PROTECTED]  Tue,  7 Nov 2006 07:30:35 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 18 Feb 2007 18:02:59 +0100
 
 xserver-xorg-input-aiptek (1:1.0.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f25c04c..50b9279 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.1.1-1), 
linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
+Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.2.0-3), 
linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
 Standards-Version: 3.7.2
 
 Package: xserver-xorg-input-aiptek
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (= 2:1.1.1-11)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: xserver-xorg-input
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- Aiptek input driver
diff --git a/debian/rules b/debian/rules
index f535e80..9ceec79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
dh_testdir
dh_testroot
 

commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Feb 17 16:01:41 2007 +0100

Add new serverabi rule to generate drivers dependency on the server.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 7b8206e..dbb2872 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,6 +354,21 @@ # Generate the shlibs.local file.
 debian/shlibs.local:
cat debian/*.shlibs $@
 
+SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2/dev/null)
+SERVER_DEPENDS = xserver-xorg-core (= $(SERVERABI))
+ifeq ($(PACKAGE),)
+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
+endif
+
+.PHONY: serverabi
+serverabi:
+ifeq ($(SERVERABI),)
+   @echo error: xserver-xorg-dev needs to be installed
+   @exit 1
+else
+   echo xserver:Depends=$(SERVER_DEPENDS)  debian/$(PACKAGE).substvars
+endif
+
 include debian/xsfbs/xsfbs-autoreconf.mk
 
 # vim:set noet ai sts=8 sw=8 tw=0:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]