xserver-xorg-input-penmount: Changes to 'debian-unstable'

2011-06-28 Thread Cyril Brulebois
 .gitignore   |   72 ++---
 ChangeLog|  186 +++
 Makefile.am  |   10 +-
 configure.ac |   53 ---
 debian/changelog |9 ++
 debian/control   |4 -
 man/Makefile.am  |   25 ---
 src/xf86PM.c |  165 +++-
 src/xf86PM.h |7 --
 9 files changed, 338 insertions(+), 193 deletions(-)

New commits:
commit a7bf68025d4c53c115bafd0d21e8d7b2de01fa49
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 28 12:18:39 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 0c00e1c..f030827 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-penmount (1:1.5.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.5.0-1) unstable; urgency=low
 
   * New upstream release:
 - Support Xserver 1.10 (Closes: #625063).
   * Bump xserver-xorg-dev build-dep accordingly.
   * Bump Standards-Version to 3.9.2 (no changes).
 
- -- Cyril Brulebois k...@debian.org  Tue, 28 Jun 2011 12:14:47 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 28 Jun 2011 12:18:34 +0200
 
 xserver-xorg-input-penmount (1:1.4.1-4) unstable; urgency=low
 

commit 38bc066579fce03cf3f85c9bf8a9fd81ce6a5234
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 28 12:16:17 2011 +0200

Bump Standards-Version to 3.9.2 (no changes).

diff --git a/debian/changelog b/debian/changelog
index 6122339..0c00e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-penmount (1:1.5.0-1) UNRELEASED; urgency=low
   * New upstream release:
 - Support Xserver 1.10 (Closes: #625063).
   * Bump xserver-xorg-dev build-dep accordingly.
+  * Bump Standards-Version to 3.9.2 (no changes).
 
  -- Cyril Brulebois k...@debian.org  Tue, 28 Jun 2011 12:14:47 +0200
 
diff --git a/debian/control b/debian/control
index ff39018..ca67c98 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  x11proto-randr-dev,
  x11proto-input-dev,
  xutils-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-penmount
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penmount.git
 

commit 2172c75d1ada316b48be22c4e282b77275115981
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 28 12:16:02 2011 +0200

Bump xserver-xorg-dev build-dep accordingly.

diff --git a/debian/changelog b/debian/changelog
index c9bf615..6122339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-penmount (1:1.5.0-1) UNRELEASED; urgency=low
 
   * New upstream release:
 - Support Xserver 1.10 (Closes: #625063).
+  * Bump xserver-xorg-dev build-dep accordingly.
 
  -- Cyril Brulebois k...@debian.org  Tue, 28 Jun 2011 12:14:47 +0200
 
diff --git a/debian/control b/debian/control
index d7ed6a4..ff39018 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  quilt,
  pkg-config,
- xserver-xorg-dev (= 2:1.9.4),
+ xserver-xorg-dev (= 2:1.10),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev,

commit f927a250ad21c72732961f380fd862e820c9ff20
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 28 12:15:40 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index a5040ca..01edc4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,189 @@
+commit 30bf5a6bb20b8ad703f305bcde0ade2a99328b6c
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jun 28 10:38:27 2011 +1000
+
+penmount 1.5.0
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit f0158bd0eb8efe2e051bb00d98d17b6071224062
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jun 28 10:37:53 2011 +1000
+
+Require server 1.10 instead of manual ABI checks
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 6658e9ad22923e8bb90ff84c079e870a8e416976
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Dec 2 14:34:06 2010 +1000
+
+Support (and require) input ABI 12.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Trevor Woerner twoer...@gmail.com
+
+commit 55f9e93bb67bda172de9ba71c465d2fbd0a80410
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Dec 2 14:33:11 2010 +1000
+
+Move default_options up
+
+no functional changes, prep work for ABI 12
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Trevor Woerner twoer...@gmail.com
+
+commit 79c7b3641c9b42ff13c0472707d20133707aa96f
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Dec 2 14:30:08 2010 +1000
+
+Add TS_Raw and TS_Scaled defines
+
+The use of these is driver-internal, they used to be in the server but not
+since ABI 12.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Trevor 

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2011-02-05 Thread Cyril Brulebois
 debian/README.source|   24 -
 debian/changelog|   23 +
 debian/compat   |2 
 debian/control  |   22 
 debian/patches/series   |1 
 debian/rules|  104 
 debian/xserver-xorg-input-penmount.install  |1 
 debian/xserver-xorg-input-penmount.manpages |1 
 debian/xsfbs/repack.sh  |   32 -
 debian/xsfbs/xsfbs.mk   |  285 
 debian/xsfbs/xsfbs.sh   |  622 
 11 files changed, 49 insertions(+), 1068 deletions(-)

New commits:
commit e154c8546e958bd7ecdb2fe48981abea6fb87cfa
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:40:16 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 725886a..1266b28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-penmount (1:1.4.1-4) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.4.1-4) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -13,7 +13,7 @@ xserver-xorg-input-penmount (1:1.4.1-4) UNRELEASED; 
urgency=low
   * Bump Standards-Version to 3.9.1 (no changes needed).
   * Add quilt build-dep for future use.
 
- -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 05:34:54 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:40:15 +0100
 
 xserver-xorg-input-penmount (1:1.4.1-3) experimental; urgency=low
 

commit 87f32f4b167cb5a1ae66f87eaa7a6f314ddbb27e
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 09:32:00 2011 +0100

Add a placeholding series file.

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..fdffa2a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder

commit 6ee865db607e09982ce5fd630eb4b9c866d146b5
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 11:40:48 2011 +0100

Fix sequence ordering.

Since both the autoreconf and quilt sequences insert a command before
dh_auto_configure, it is important that we use the quilt one in the first
place, so that autoreconf is run on a patched tree. Ditto for dh_clean.

diff --git a/debian/rules b/debian/rules
index 63d3106..3d192dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,4 +14,4 @@ override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
 
 %:
-   dh $@ --with autoreconf,quilt,xsf --builddirectory=build/
+   dh $@ --with quilt,autoreconf,xsf --builddirectory=build/

commit ed3e1b44f4fef62c2e87fea01ee011f3708f2a68
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 11:40:44 2011 +0100

Add quilt build-dep for future use.

diff --git a/debian/changelog b/debian/changelog
index 791101a..725886a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-input-penmount (1:1.4.1-4) UNRELEASED; 
urgency=low
   * Update Uploaders list. Thanks, David  Brice!
   * Wrap Depends/Provides.
   * Bump Standards-Version to 3.9.1 (no changes needed).
+  * Add quilt build-dep for future use.
 
  -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 05:34:54 +0100
 
diff --git a/debian/control b/debian/control
index 307cdfd..d7ed6a4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 8),
  dh-autoreconf,
+ quilt,
  pkg-config,
  xserver-xorg-dev (= 2:1.9.4),
  x11proto-core-dev,

commit f8cea2245ad23f7f195c7ce06f65965cdac88571
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 05:39:33 2011 +0100

Bump Standards-Version to 3.9.1 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index d69d331..791101a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-input-penmount (1:1.4.1-4) UNRELEASED; 
urgency=low
   * Remove long obsolete Replaces.
   * Update Uploaders list. Thanks, David  Brice!
   * Wrap Depends/Provides.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 05:34:54 +0100
 
diff --git a/debian/control b/debian/control
index c3054f2..307cdfd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  x11proto-randr-dev,
  x11proto-input-dev,
  xutils-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-penmount
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penmount.git
 

commit cef8d44ee3b91e0dcc57ebb06bb184a3f825aea3
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 05:39:17 2011 +0100

Wrap Depends/Provides.

diff --git a/debian/changelog b/debian/changelog
index 83f2591..d69d331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-input-penmount (1:1.4.1-4) UNRELEASED; urgency=low
   * Remove xsfbs 

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2010-05-23 Thread Julien Cristau
 debian/README.source  |2 +-
 debian/changelog  |6 ++
 debian/control|4 ++--
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 31 insertions(+), 16 deletions(-)

New commits:
commit 084bf760ecf488bf747da870064d61953f193b0a
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 23 23:32:48 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index f3b6adf..c147ddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-penmount (1:1.4.1-2) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.4.1-2) unstable; urgency=medium
 
   * Update xsfbs and use new ${xinpdriver:Depends} substvar.
 
- -- Julien Cristau jcris...@debian.org  Sun, 23 May 2010 23:31:59 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 23 May 2010 23:32:38 +0200
 
 xserver-xorg-input-penmount (1:1.4.1-1) unstable; urgency=low
 

commit 34522a19e5f07d390239c801498caa19fc29c554
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 23 23:32:20 2010 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 15f90e4..f3b6adf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-penmount (1:1.4.1-2) UNRELEASED; urgency=low
+
+  * Update xsfbs and use new ${xinpdriver:Depends} substvar.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 23 May 2010 23:31:59 +0200
+
 xserver-xorg-input-penmount (1:1.4.1-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index c193df3..fc21659 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@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,
@@ -20,7 +20,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penmoun
 
 Package: xserver-xorg-input-penmount
 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 -- Penmount input driver

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois k...@debian.org
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)

commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau jcris...@debian.org
Date:   Fri Apr 16 22:14:46 2010 +0200

Update serverabi rule for xserver 1.7.6.901

Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers.  The ${xserver:Depends} variable is deprecated.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2/dev/null)
+
+# these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
 INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
 endif
 
 .PHONY: serverabi
 serverabi: install
-ifeq ($(SERVERMINVERS),)
-   @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+   @echo 'error: xserver-xorg-dev = 1.7.6.901 needs to be installed'
@exit 1
 else
-   echo xserver:Depends=$(SERVER_DEPENDS)  debian/$(PACKAGE).substvars
+   echo 

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2010-05-07 Thread Mikhail Gusarov
 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit ebeeb59865d35cee6b354ead443d4115c80696c3
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:56 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 84ea8ee..c193df3 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,5 @@ Description: X.Org X server -- Penmount 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-penmount driver module.


-- 
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/e1oammt-0007dk...@alioth.debian.org



xserver-xorg-input-penmount: Changes to 'debian-unstable'

2010-03-04 Thread Brice Goglin
 COPYING  |   28 +--
 ChangeLog|   44 ++
 Makefile.am  |2 -
 README   |   13 ++---
 configure.ac |   31 -
 debian/changelog |8 -
 src/Makefile.am  |1 
 src/xf86PM.c |   79 ++-
 src/xf86PM.h |1 
 9 files changed, 114 insertions(+), 93 deletions(-)

New commits:
commit 11df7928d7f6a7756626029ef02dd385a02a6c72
Author: Brice Goglin bgog...@debian.org
Date:   Thu Mar 4 21:30:49 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 714794e..15f90e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.4.1-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * Bump Standards-Version to 3.8.3.
@@ -13,7 +13,7 @@ xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; 
urgency=low
   * New upstream release.
 + Fix FTBFS against Xserver 1.7, closes: #569400.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
+ -- Brice Goglin bgog...@debian.org  Thu, 04 Mar 2010 21:30:38 +0100
 
 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low
 

commit e59ecc43257dc6a46c50a1ce696272859dc7b810
Author: Brice Goglin bgog...@debian.org
Date:   Thu Mar 4 21:26:31 2010 +0100

New upstream release

diff --git a/ChangeLog b/ChangeLog
index dc92b61..a5040ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit 3bc3d1245676f6022fd3db48eb3e7f3b66c7561f
+Author: Julien Cristau jcris...@debian.org
+Date:   Wed Mar 3 23:41:39 2010 +0100
+
+Bump to 1.4.1
+
+commit a6fedb3d2fd0288283602fef14f2a0a460b2afef
+Author: Julien Cristau jcris...@debian.org
+Date:   Wed Mar 3 23:48:33 2010 +0100
+
+Don't use obsolete loader functions
+
+commit 1d6ba7c8c8c7183569f9dc708090f36de8b6bdd6
+Author: Julien Cristau jcris...@debian.org
+Date:   Wed Mar 3 23:40:11 2010 +0100
+
+Janitorial configure.ac/Makefile.am updates
+
+Use XORG_DEFAULT_OPTIONS and update ChangeLog rule to work with newer
+git.  Also set AM_CFLAGS in Makefile.am instead of setting CFLAGS from
+configure.ac.
+
+commit dab0c2742c034750e3e9673167eb20812b679818
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Jul 17 13:59:43 2009 +1000
+
+Cope with XINPUT ABI 7.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit fedbe483260a4bc8e2cc77e7d6a543ba37170448
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Mon May 11 20:04:51 2009 -0700
+
+Fill in COPYING file, add SubmittingPatches URL to README
+
+commit b5a8cdbd73939aa62cf3ae08957db67c65e6b51f
+Author: Steve Bian s...@pictorii.com
+Date:   Sun Jan 18 23:33:52 2009 +1100
+
+Added InvertX option
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit 0536f70861f11192820439d36de951ef106d4e5e
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Thu Feb 19 16:32:32 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 99d7fd6..714794e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * Bump Standards-Version to 3.8.3.
@@ -9,6 +9,10 @@ xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
 
+  [ Brice Goglin ]
+  * New upstream release.
++ Fix FTBFS against Xserver 1.7, closes: #569400.
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
 
 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low

commit 3bc3d1245676f6022fd3db48eb3e7f3b66c7561f
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 3 23:41:39 2010 +0100

Bump to 1.4.1

diff --git a/configure.ac b/configure.ac
index 1377a00..1a68272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-penmount],
-1.4.0,
+1.4.1,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-penmount)
 

commit a6fedb3d2fd0288283602fef14f2a0a460b2afef
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 3 23:48:33 2010 +0100

Don't use obsolete loader functions

diff --git a/src/xf86PM.c b/src/xf86PM.c
index 1e38124..14cbe22 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -84,62 +84,12 @@ static XF86ModuleVersionInfo VersionRec =
 * a tool */
 };
 
-
-static const char *reqSymbols[] = {
-   AddEnabledDevice,
-   ErrorF,
-   InitButtonClassDeviceStruct,
-   InitProximityClassDeviceStruct,
-   InitValuatorAxisStruct,
-   InitValuatorClassDeviceStruct,
-   InitPtrFeedbackClassDeviceStruct,
-   RemoveEnabledDevice,
-   

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2010-01-22 Thread Julien Cristau
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 55229f75f69a7700f88d1a65a6fdb4442f156d6b
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:32 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 41ba985..99d7fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
 
diff --git a/debian/control b/debian/control
index bc96c6c..84ea8ee 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-penmount
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Julien Cristau jcris...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@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



xserver-xorg-input-penmount: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau
 debian/changelog |5 +
 debian/rules |   14 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 29f3ff7bd6625d89acfba40ad896aa58816c4eb8
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:45 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index cf5909e..41ba985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
 
 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 432c068..4e34983 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,17 +35,17 @@ confflags += --disable-static
 configure:
autoreconf -vfi
 
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
-   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE)  \
+build/config.status: configure
+   mkdir -p build
+   cd build  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS=$(CFLAGS) 
 
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd build  $(MAKE)
$@
 
 clean:
@@ -57,7 +57,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing aclocal.m4 mkinstalldirs config.h.in
@@ -70,7 +70,7 @@ install: build
dh_clean -k
dh_installdirs
 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+   cd build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install serverabi


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



xserver-xorg-input-penmount: Changes to 'debian-unstable'

2009-12-04 Thread Timo Aaltonen
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c4732976b2e8a0c7bc05590d38be492a445bdea1
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 02:09:24 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index 1aed591..cf5909e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low
 
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 15:43:05 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
 
 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 233acb9..bc96c6c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 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,


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



xserver-xorg-input-penmount: Changes to 'debian-unstable'

2009-11-30 Thread Timo Aaltonen
 debian/README.source  |   73 ++
 debian/changelog  |6 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 5 files changed, 83 insertions(+), 264 deletions(-)

New commits:
commit 847a7a9311001e00339d9bde482792af2a75bf3d
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 15:43:24 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 270cf02..1aed591 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low
+
+  * Bump Standards-Version to 3.8.3.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 15:43:05 +0200
+
 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low
 
   * Allow parallel builds.
diff --git a/debian/control b/debian/control
index 1174100..233acb9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-penmount
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penmount.git
 

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date +%F %X%z/)' $ $@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' $$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-   -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
  $$MAINTSCRIPT.tmp $$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
  fi; \

commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 15:33:39 2009 +0200

xsfbs.sh: fix typo and remove svn keyword

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 # This is the X Strike Force shell library for X Window System package
 # maintainer scripts.  It serves to define shell functions commonly used by
 # such packages, and performs some error checking necessary for proper 
operation
@@ -8,7 +6,7 @@
 # removal tasks.
 
 # If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
 # skip past this library by scanning forward in this file to the string
 # GOBSTOPPER.
 

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-# Generate the shlibs.local file.

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2009-04-09 Thread Julien Cristau
 ChangeLog  |   79 
 Makefile.in|  679 -
 aclocal.m4 | 8256 -
 config.guess   | 1526 ---
 config.h.in|   66 
 config.sub | 1658 ---
 configure  |22716 -
 debian/changelog   |   17 
 debian/control |   12 
 debian/rules   |   25 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   29 
 debian/xsfbs/xsfbs.sh  |   66 
 depcomp|  589 -
 install-sh |  519 -
 ltmain.sh  | 6964 ---
 man/Makefile.in|  425 
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.in|  513 -
 20 files changed, 164 insertions(+), 44535 deletions(-)

New commits:
commit fc50bfd26151725643d528c2477082ce14cf957b
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 16:31:37 2009 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index c4f0449..270cf02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-input-penmount (1:1.4.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low
 
   * Allow parallel builds.
+  * Upload to unstable.
 
- -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 16:31:18 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 16:31:35 +0100
 
 xserver-xorg-input-penmount (1:1.4.0-1) experimental; urgency=low
 

commit a025bb156b9ca976f9629193ba6f3b51611983c5
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 16:31:25 2009 +0100

Allow parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 83dac13..c4f0449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-penmount (1:1.4.0-2) UNRELEASED; urgency=low
+
+  * Allow parallel builds.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 16:31:18 +0100
+
 xserver-xorg-input-penmount (1:1.4.0-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index f4a7a18..432c068 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)

commit 70e24753b1f08c8432e1c1d59fa553d4591639c0
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 1 19:07:19 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 290250d..83dac13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-penmount (1:1.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.4.0-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
@@ -8,7 +8,7 @@ xserver-xorg-input-penmount (1:1.4.0-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Build against xserver = 1.6 rc1.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 26 Feb 2009 17:59:16 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 01 Apr 2009 19:05:58 +0200
 
 xserver-xorg-input-penmount (1:1.3.0-1) unstable; urgency=low
 

commit c7b602e4cacf74e78cc734807f0ae4975b4fca0b
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 1 19:06:54 2009 +0200

debian/rules: build needs to depend on config.status

diff --git a/debian/rules b/debian/rules
index 51e9f9c..f4a7a18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,14 +35,14 @@ configure:
autoreconf -vfi
 
 obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
-   mkdir obj-$(DEB_BUILD_GNU_TYPE)
+   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE)  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS=$(CFLAGS) 
 
 build: build-stamp
-build-stamp:
+build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
dh_testdir
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@

commit 307f29b07d307b0c60aac04a3975791a027172f1
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 1 19:05:32 2009 +0200

Don't try to apply patches, there aren't any

diff --git a/debian/rules b/debian/rules
index c366c48..51e9f9c 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 

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2009-02-26 Thread Timo Aaltonen
 README   |   20 ++
 configure.ac |2 
 debian/changelog |6 +
 man/penmount.man |2 
 src/xf86PM.c |  182 +++
 src/xf86PM.h |1 
 6 files changed, 199 insertions(+), 14 deletions(-)

New commits:
commit a20637dcbcf1ac7ede21cc16cd09a3e57a252d70
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Thu Feb 26 17:59:51 2009 +0200

Start a new release.

diff --git a/debian/changelog b/debian/changelog
index cc90b78..d919b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-penmount (1:1.4.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 26 Feb 2009 17:59:16 +0200
+
 xserver-xorg-input-penmount (1:1.3.0-1) unstable; urgency=low
 
   * New upstream release.

commit 0536f70861f11192820439d36de951ef106d4e5e
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Feb 19 16:32:32 2009 +1000

penmount 1.4.0

diff --git a/configure.ac b/configure.ac
index b245f5f..e32aeea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-penmount],
-1.3.0,
+1.4.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-input-penmount)
 

commit ae5faa7a024cf63b766b916ef09adf3e66d1a170
Author: mjs m...@core7.eu
Date:   Tue Feb 17 01:48:43 2009 +0100

Add DMC9512 support #19885

Add new value for the ControllerModel option because we can not auto-detect 
it (looks like a DMC8910).
The only relevant difference between the DMC8910 and DMC9512 is the device 
initialization.

Signed-off-by: mjs m...@core7.eu
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/xf86PM.c b/src/xf86PM.c
index 95adb8b..d07e242 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -4,6 +4,9 @@
  * CoAuthor: Mayk Langer lan...@vsys.de
  * 
  * History:
+ * 02/01/2009: mjs m...@core7.eu
+ * - Added DMC9512 controller protocol support
+ *   based on old code from 
http://www.salt.com.tw/Download/Driver/PenMount/DMC9512/
  * 09/16/2005: Jaya Kumar jayakumar.x...@gmail.com 
  * - Added DMC9000 controller protocol support
  * - DMC9000 support work was sponsored by CIS(M) Sdn Bhd
@@ -348,6 +351,119 @@ DMC9000_DeviceControl (DeviceIntPtr dev, int mode)
 
 }
 
+static Bool
+DMC9512_ProcessDeviceOn(PenMountPrivatePtr priv, DeviceIntPtr dev, 
InputInfoPtr pInfo)
+{
+   unsigned char   buf[5] = { 'D', 'G', 0x02, 0x80, 0x00 };
+
+   XisbBlockDuration (priv-buffer, 50);
+
+   if ( PenMountSendPacket(priv, buf, 5) != Success )
+   {
+   return !Success;
+   }
+
+   /* wait for right response */
+   priv-lex_mode = PenMount_Response0;
+
+   if (PenMountGetPacket (priv) != Success )
+   {
+   return !Success;
+   }
+
+   if ( ! (priv-packet[0] == 0xff  priv-packet[1] == 0x70) )
+   {
+   return !Success;
+   }
+
+   xf86Msg(X_NOTICE, %s: DMC9512: found\n, pInfo-name);
+   priv-chip = DMC9512;
+
+   /* disable DMC9512 */
+   buf[2] = 0x0a;
+   buf[3] = 0x00;
+   buf[4] = 0x00;
+   PenMountSendPacket(priv,buf,5);
+   priv-lex_mode = PenMount_Response0;
+   PenMountGetPacket(priv);
+
+   /* set screen width */
+   buf[2] = 0x02;
+   buf[3] = 0x03; /*(priv-screen_width  0x0fff)  8;*/
+   buf[4] = 0xfc; /*priv-screen_width  0xff;*/
+   PenMountSendPacket(priv,buf,5);
+   priv-lex_mode = PenMount_Response0;
+   PenMountGetPacket(priv);
+
+   /* set screen height */
+   buf[2] = 0x02;
+   buf[3] = 0x13; /*(priv-screen_height  0x0fff)  8;*/
+   buf[4] = 0xfc; /*priv-screen_height  0xff;*/
+   buf[3] |= 0x10;
+   PenMountSendPacket(priv,buf,5);
+   priv-lex_mode = PenMount_Response0;
+   PenMountGetPacket(priv);
+
+   /* Set Calibration Data */
+   /* Set X-coordinate of the Left Top corner */
+   buf[2] = 0x02;
+   buf[3] = 0x40;
+   buf[4] = 0x03;
+   PenMountSendPacket(priv,buf,5);
+   priv-lex_mode = PenMount_Response0;
+   PenMountGetPacket(priv);
+
+   /* Set Y-coordinate of the Left Top corner */
+   buf[2] = 0x02;
+   buf[3] = 0x50;
+   buf[4] = 0x03;
+   PenMountSendPacket(priv,buf,5);
+   priv-lex_mode = PenMount_Response0;
+   PenMountGetPacket(priv);
+
+   /* Set X-coordinate of the Right bottom corner */
+   buf[2] = 0x02;
+   buf[3] = 0x60;
+   buf[4] = 0xfc;
+   PenMountSendPacket(priv,buf,5);
+   priv-lex_mode = PenMount_Response0;
+   PenMountGetPacket(priv);
+
+   /* Set Y-coordinate of the Right bottom corner */
+   buf[2] = 0x02;
+   buf[3] = 0x70;
+   buf[4] = 0xfc;
+   PenMountSendPacket(priv,buf,5);
+   priv-lex_mode = PenMount_Response0;
+   PenMountGetPacket(priv);
+
+   /* Set Screen Width Again */
+   buf[2] = 0x02;
+   buf[3] 

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2008-05-31 Thread Julien Cristau
 ChangeLog|   14 
 Makefile.in  |  152 +--
 aclocal.m4   |  911 ---
 config.guess |   60 -
 config.sub   |   78 +
 configure| 1837 ++-
 configure.ac |2 
 debian/changelog |   13 
 debian/control   |   10 
 debian/rules |2 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|  102 --
 debian/xsfbs/xsfbs.sh|  387 
 depcomp  |   93 +
 install-sh   |  514 +++---
 ltmain.sh|  277 +++--
 man/Makefile.in  |   94 +
 missing  |   61 -
 mkinstalldirs|5 
 src/Makefile.in  |  140 +-
 src/xf86PM.c |4 
 21 files changed, 3084 insertions(+), 1822 deletions(-)

New commits:
commit db36e881a292d43ec75845fb6a0e2839ca07ac9e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat May 31 23:18:18 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 9349d1a..cc90b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-penmount (1:1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.3.0-1) unstable; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.7.3.
@@ -9,7 +9,7 @@ xserver-xorg-input-penmount (1:1.3.0-1) UNRELEASED; urgency=low
 dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
 dpkg-dev = 1.14.17.
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 21:12:53 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Sat, 31 May 2008 23:18:12 +0200
 
 xserver-xorg-input-penmount (1:1.2.1-2) unstable; urgency=low
 

commit 1ade91a92d0743b318fe48a699caec4acc60abc3
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat May 31 22:40:15 2008 +0200

Run dpkg-shlibdeps with --warnings=6.

Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find.  Build-depend on dpkg-dev = 1.14.17.

diff --git a/debian/changelog b/debian/changelog
index 5be10b4..9349d1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ xserver-xorg-input-penmount (1:1.3.0-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.7.3.
   * Drop the XS- prefix from Vcs-* control fields.
   * Add myself to Uploaders.
+  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
+/usr/bin/Xorg and other modules, and that's not a bug, so we want
+dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
+dpkg-dev = 1.14.17.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 21:12:53 +0100
 
diff --git a/debian/control b/debian/control
index 5bc5196..c58f522 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Brice Goglin [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
+Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, dpkg-dev (= 1.14.17)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-penmount
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penmount.git
diff --git a/debian/rules b/debian/rules
index f9e488a..c72ee9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
-   dh_shlibdeps
+   dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb

commit ffcff17a6e950b3cc1776335168831b33e8abf58
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat May 31 22:39:11 2008 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index f6dca53..5be10b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-penmount (1:1.3.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump Standards-Version to 3.7.3.
   * Drop the XS- prefix from Vcs-* control fields.
+  * Add myself to Uploaders.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 21:12:53 +0100
 
diff --git a/debian/control b/debian/control
index 4265a4f..5bc5196 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-penmount
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: 

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2007-09-16 Thread David Nusinow
 .cvsignore|   19 ---
 .gitignore|   22 
 ChangeLog |  259 +++---
 Makefile.am   |8 +
 Makefile.in   |8 +
 config.sub|   14 --
 configure |   20 +--
 configure.ac  |2 
 debian/changelog  |   22 ++--
 debian/control|6 -
 debian/copyright  |3 
 debian/xsfbs/xsfbs.mk |   27 +++--
 debian/xsfbs/xsfbs.sh |7 -
 man/.cvsignore|2 
 man/.gitignore|2 
 src/.cvsignore|6 -
 src/.gitignore|6 +
 src/xf86PM.c  |2 
 18 files changed, 325 insertions(+), 110 deletions(-)

New commits:
commit 2970af5e261c8aa13580d91a8ed79ce501124044
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 16 15:32:20 2007 -0400

* Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8a07cf0..b01059f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-penmount (1:1.2.1-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 16 Sep 2007 15:13:39 -0400
+
 xserver-xorg-input-penmount (1:1.2.1-1) experimental; urgency=low
 
   [ Julien Cristau ]

commit aa044e5e30b664ee108ab4b91af5dc2c61a44f7d
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Sep 12 12:50:38 2007 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 75226d4..8a07cf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-penmount (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-penmount (1:1.2.1-1) experimental; urgency=low
 
   [ Julien Cristau ]
   * Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -20,11 +20,7 @@ xserver-xorg-input-penmount (1:1.2.1-1) UNRELEASED; 
urgency=low
   * New upstream release.
 + Builds fine on Xserver 1.4, closes: #422678.
 
-  [ Drew Parsons ]
-  * Use PACKAGE_VERSION_* to identify the driver version (pull from
-upstream git)
-
- -- Brice Goglin [EMAIL PROTECTED]  Wed, 12 Sep 2007 12:47:38 +0200
+ -- Brice Goglin [EMAIL PROTECTED]  Wed, 12 Sep 2007 12:50:09 +0200
 
 xserver-xorg-input-penmount (1:1.2.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9e7aabd..ee23923 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-penmount
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED]
+Uploaders: David Nusinow [EMAIL PROTECTED], Brice Goglin [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-penmount

commit 4bdb91fb956d448a9a72e92a9febedde7498b032
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Sep 12 12:48:47 2007 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000..32ee712
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,245 @@
+commit db7b7d03a7e9136badf994c218cd137b59a376c2
+Author: Tilman Sauerbeck [EMAIL PROTECTED]
+Date:   Mon Sep 10 19:05:02 2007 +0200
+
+Added man/penmount.? to .gitignore.
+
+commit 564d77fc97015fe5ae1dd7baf643524ad32ba19d
+Author: Tilman Sauerbeck [EMAIL PROTECTED]
+Date:   Mon Sep 10 19:04:08 2007 +0200
+
+Bumped version to 1.2.1.
+
+commit 45808497336a336ed76450fbe8279f0e6a7d5a4d
+Author: Tilman Sauerbeck [EMAIL PROTECTED]
+Date:   Mon Sep 10 19:03:30 2007 +0200
+
+Generate ChangeLog from git.
+
+commit 395e77e359d7d95e57116e70393ddba8d753efcc
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Mon Sep 3 05:52:21 2007 -0400
+
+Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 4f886668127dad7f561334459cd9723f9af93103
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Thu Aug 23 19:25:36 2007 -0400
+
+Rename .cvsignore to .gitignore
+
+commit 960f0207a4845b489a1c1ca9823821047722585d
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Wed Aug 8 01:09:31 2007 +0300
+
+Convert from TSCalibrationCtl to AbsCalibCtl
+
+commit 7810e0bb438525c005f66a9bc5cc0af489fa08a1
+Author: Drew Parsons [EMAIL PROTECTED]
+Date:   Thu Jun 14 21:52:28 2007 +1000
+
+Update version using PACKAGE_VERSION_*
+
+commit 5b785515ddbf7e799a1a32b9957195966a5cd513
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Sat Jun 3 09:35:42 2006 +
+
+Bug #4495: Add DMC9000 support. (Jaya Kumar). Bump to 1.2.0.
+
+commit f661f8975ff3940d8bff03e4090f235fe18a682e
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Fri Apr 7 18:06:50 2006 +
+
+Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
+commit 68ee6b856239014ce271102d63431bedf99f3f4e
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Wed Dec 21 02:29:58 2005 +
+
+Update package version for 

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2007-06-14 Thread Drew Parsons
 debian/changelog |6 +-
 src/xf86PM.c |2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c6345a1e40c2b4e24cab0b43ea3eaeff36ba19a3
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Fri Jun 15 00:31:28 2007 +1000

Use PACKAGE_VERSION_* to identify the driver version

(pull from upstream git)

diff --git a/debian/changelog b/debian/changelog
index eb2ee64..d3da403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,11 @@ xserver-xorg-input-penmount (1:1.2.0-2) UNRELEASED; 
urgency=low
 module in the long description.
   * Remove Fabio from uploaders with his permission. He's always welcome back.
 
- -- Brice Goglin [EMAIL PROTECTED]  Tue, 24 Apr 2007 01:04:44 +0200
+  [ Drew Parsons ]
+  * Use PACKAGE_VERSION_* to identify the driver version (pull from 
+upstream git)
+
+ -- Drew Parsons [EMAIL PROTECTED]  Thu, 14 Jun 2007 21:58:22 +1000
 
 xserver-xorg-input-penmount (1:1.2.0-1) unstable; urgency=low
 

commit 7810e0bb438525c005f66a9bc5cc0af489fa08a1
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Thu Jun 14 21:52:28 2007 +1000

Update version using PACKAGE_VERSION_*

diff --git a/src/xf86PM.c b/src/xf86PM.c
index 8a7c4b3..70e855c 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -73,7 +73,7 @@ static XF86ModuleVersionInfo VersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
-   1, 1, 0,
+   PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, 
PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,


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



xserver-xorg-input-penmount: Changes to 'debian-unstable'

2007-04-23 Thread Brice Goglin
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4139dd20a329f6a16fea1bd63c168d62a357a3bd
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Tue Apr 24 01:04:57 2007 +0200

Remove Fabio from uploaders with his permission. He's always welcome back.

diff --git a/debian/changelog b/debian/changelog
index 8ec3494..eb2ee64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ xserver-xorg-input-penmount (1:1.2.0-2) UNRELEASED; 
urgency=low
   * Add XS-Vcs-*.
   * Add a link to www.X.org and a reference to the xf86-input-penmount
 module in the long description.
+  * Remove Fabio from uploaders with his permission. He's always welcome back.
 
- -- Brice Goglin [EMAIL PROTECTED]  Sun, 22 Apr 2007 18:00:53 +0200
+ -- Brice Goglin [EMAIL PROTECTED]  Tue, 24 Apr 2007 01:04:44 +0200
 
 xserver-xorg-input-penmount (1:1.2.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e93a060..367bd10 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-penmount
 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]
+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
 Standards-Version: 3.7.2
 XS-Vcs-Git: 
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-penmount


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



xserver-xorg-input-penmount: Changes to 'debian-unstable'

2007-04-22 Thread Brice Goglin
 .cvsignore   |   19 
 ChangeLog|2 
 Makefile.in  |   16 
 aclocal.m4   |  376 +
 autogen.sh   |   12 
 config.guess |   58 
 config.h.in  |9 
 config.sub   |   99 
 configure| 7718 ---
 debian/changelog |   14 
 debian/control   |   10 
 debian/rules |4 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 
 debian/xsfbs/xsfbs.mk|  379 +
 debian/xsfbs/xsfbs.sh|  907 
 ltmain.sh|2 
 man/.cvsignore   |2 
 man/Makefile.am  |2 
 man/Makefile.in  |   16 
 mkinstalldirs|   89 
 src/.cvsignore   |6 
 src/Makefile.in  |   14 
 22 files changed, 6064 insertions(+), 3840 deletions(-)

New commits:
commit 8a3c375d4f424bf1e3142c78097a3282bce4748d
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sun Apr 22 19:21:47 2007 +0200

autoreconf

diff --git a/Makefile.in b/Makefile.in
index de8f711..d50b00f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ host_triplet = @host@
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
-   config.sub depcomp install-sh ltmain.sh missing
+   config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,7 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) 
$(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -129,6 +129,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -163,13 +164,9 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -186,24 +183,31 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 inputdir = @inputdir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
diff --git a/aclocal.m4 b/aclocal.m4
index 28a3353..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1397,18 +1397,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -1564,7 +1552,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1605,18 +1593,6 @@ netbsdelf*-gnu)
   dynamic_linker='NetBSD ld.elf_so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix 

xserver-xorg-input-penmount: Changes to 'debian-unstable'

2007-01-28 Thread David Nusinow
New branch 'debian-unstable' available with the following commits:
commit 9e418e6cc7d811446d6f167a9c2c45fabbf1b7db
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Nov 7 06:46:29 2006 +

For each driver, add a symlink to xserver-xorg-core's bug script, so that 
each
new bugreport contains the user's config and log files.  Bump dependencies 
on
xserver-xorg-core to = 2:1.1.1-11, to make sure that the bug script is
present.

commit 611fb465505c892111065c00ca5ef4828b8c6958
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Fri Oct 13 12:39:39 2006 +

  * New upstream version (following X11R7.1).
  * Standards version 3.7.2.
  * Use debhelper 5.
  * Use dh_installman to install manpages.
  * Exclude penmount_drv.la from dh_install.

commit 8f89c791678b83ecced6b215af3ae468569c60fc
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Fri Oct 13 12:29:13 2006 +

New upstream version xf86-input-penmount-1.2.0.

commit 94881c0decb11ef0fe91d70a0f9c67d8d5255bd3
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit dd7c108e98b2b1e741a444d6f290a0ca74be1559
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 08:03:56 2006 +

merge 7.1 onto trunk for all input drivers -- packaging fixes only for
everything except keyboard and mouse, so no uploads needed, but no
reason to keep non-7.1 changes on a 7.1 branch we're abandoning, either

commit 3ed874156e081312654c7b33ad57acfc8a5f87b4
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 06:48:25 2006 +

more fixes for unversioned directory names (input drivers)

commit 94942f16e556ab55d5b31c47a07b2d48782b4988
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Apr 5 00:10:22 2006 +

Prepare changelogs for upload to unstable

commit 71fae2b2b9eef98994a773680de84ba8f9e54a93
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Feb 13 03:46:16 2006 +

Fix Branden's email address

commit b5d51b1033d15542cc4e9174f143c16eca0d12a2
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Feb 12 16:24:02 2006 +

Move all install files for renaming scheme and delete v4l driver which 
doesn't currently have packaging

commit 65abd95a5801026c1e5b2037cca672693afdaba5
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Feb 10 05:20:12 2006 +

Actually change the names of the input drivers.

commit 772a355d2cc30b2554001ee10b963bca8faf67bd
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Feb 10 03:40:14 2006 +

Change driver package names to new scheme

commit 3ab359fbf9c351623bb1ae28f2f505bc01e17c0f
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Jan 30 02:24:55 2006 +

Move .install files to new naming scheme for drivers

commit 35841ab88e0c38028aa6821a4ec5da930ba5f389
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Jan 29 21:21:32 2006 +

Pull in and use xsfbs

commit a852c58b3bf706b7ebd230d1bc32f50c33739ffe
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Jan 29 20:36:06 2006 +

* Rename driver packages to be more consistent and intuitive
  + Video drivers are now named xorg-video-driver-foo and input drivers are
now named xorg-input-driver-foo
  + Video drivers provide xorg-video-driver and input drivers provide
xorg-input-driver
  + xorg-server-core depends on xorg-video-drivers-all | xorg-video-driver
and also xorg-input-drivers-all | xorg-input-drivers

commit d09e19f6c49d9035d9a465c6e596d938bd88f6eb
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 20 04:31:26 2006 +

Fix maintainer and uploader fields. God, I love sed.

commit 1bfabd9e9868188b0cd91b02611c2e3736fa35e7
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 13 05:48:42 2006 +

Add packaging for various drivers

commit 8691b824c50e1c50a44dc12a7e9608915e1cb796
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 13 04:05:21 2006 +

Update drivers in modular branch. We'll re-pull the ubuntu packaging 
properly

commit ee224307607c0aeb30ade33c9692f51c69ecc513
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Dec 30 18:14:25 2005 +

Vendor drop of the rest of 7.0


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