ChangeLog | 258 +++++
Makefile.in | 152 +--
aclocal.m4 | 911 ++++++++++++-------
config.guess | 60 -
config.sub | 74 +
configure | 1837 ++++++++++++++++++++++++++-------------
configure.ac | 2
debian/changelog | 13
debian/control | 10
debian/rules | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150 ---
debian/xsfbs/xsfbs.mk | 80 -
depcomp | 93 +
install-sh | 514 +++++++---
ltmain.sh | 277 +++--
man/Makefile.in | 94 +
missing | 61 -
mkinstalldirs | 5
src/Makefile.in | 140 +-
src/xf86Calcomp.h | 2
20 files changed, 3106 insertions(+), 1629 deletions(-)
New commits:
commit 1d136bf6021314b47ecc740f1b36cbf25f85b75b
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu May 22 18:57:22 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9f299da..1a40c7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-calcomp (1:1.1.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-calcomp (1:1.1.2-1) unstable; urgency=low
* New upstream release.
* Bump Standards-Version to 3.7.3.
@@ -9,7 +9,7 @@ xserver-xorg-input-calcomp (1:1.1.2-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 18:21:02 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 22 May 2008 18:57:09 +0200
xserver-xorg-input-calcomp (1:1.1.1-2) unstable; urgency=low
commit 3c7a9eafd9f03be232b70876a59fb722e89063d7
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu May 22 18:51:52 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 d7c18d5..9f299da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ xserver-xorg-input-calcomp (1:1.1.2-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 18:21:02 +0100
diff --git a/debian/control b/debian/control
index 470d52b..3cda4a4 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-calcomp
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-calcomp.git
diff --git a/debian/rules b/debian/rules
index a7b3ec0..2bd8e2b 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 231704429e6dd3bf8ab426de2b7c69d351b5bb00
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu May 22 18:43:42 2008 +0200
Build against xserver-xorg-dev 1.4, and add myself to Uploaders
diff --git a/debian/changelog b/debian/changelog
index 790f51a..d7c18d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
xserver-xorg-input-calcomp (1:1.1.2-1) UNRELEASED; urgency=low
* New upstream release.
- * Build against xserver 1.5 rc1.
* 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 18:21:02 +0100
diff --git a/debian/control b/debian/control
index 58a2a4d..470d52b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xserver-xorg-input-calcomp
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.4.99.901), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
+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
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-calcomp
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-calcomp.git
commit c87ea43906787791a87a659c0a9d6312945ffb32
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Apr 13 03:12:18 2008 +0200
Remove xsfbs-autoreconf.mk
It has never been used, and that doesn't look likely to change.
diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index dce8fc8..0000000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id$
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# The idea behind this is storing changes produced by autoreconf as a
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFILES += aclocal.m4
-
-# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
-
-# Internal target. Never invoke directly.
-stampdir_target+=check.md5sum
-$(STAMP_DIR)/check.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules prepare
- for F in $(RECONF_CHECKFILES); do \
- find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
- LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
- done
-
-# Internal target. Never invoke directly.
-$(STAMP_DIR)/clean.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules unpatch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- mv $(STAMP_DIR)/check.md5sum $@
-
-# Internal target. Never invoke directly.
-debian/patches/patched.md5sum:
- dh_testdir
- [ -f $(STAMP_DIR)/clean.md5sum ] || \
- $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum
-
- $(MAKE) -f debian/rules patch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/clean.md5sum \
- $(STAMP_DIR)/check.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- else \
- mv $(STAMP_DIR)/check.md5sum $@; \
- fi
-
-# Internal target. Never invoke directly.
-,PHONY: doautoreconf
-doautoreconf: patch
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true
- if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \
- quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt rename -p autoreconf.diff autoreconf-old.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- fi
-
- if [ -e $(RECONF_DIR) ]; then \
- echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \
- exit 1; \
- fi
-
- mkdir -p $(RECONF_DIR)/before
- find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \
- -a ! -wholename ./debian -a ! -wholename ./patches \
- -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
- xargs -i{} cp -al {} $(RECONF_DIR)/before/
-
- for F in $(RECONF_PRUNEFILES); do \
- find $(RECONF_DIR)/before -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
-
- for F in $(RECONF_NOLINKFILES); do \
- find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \
- -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \
- -print | \
- xargs --no-run-if-empty -i{} cp --remove-destination {} \
- $(RECONF_DIR)/after/{}; \
- done
-
- cd $(RECONF_DIR)/after && autoreconf -v --install && \
- for F in $(RECONF_PRUNEFILES); do \
- find . -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true
-
- quilt import $(RECONF_DIR)/autoreconf.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1
-
- mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum
-
- rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff
-
- @echo
- @echo "****************************************************************"
- @echo " This target is made to fail INTENTIONALLY. It should NEVER "
- @echo " be invoked during automatic builds. "
- @echo
- @echo " This target was invoked because you added/removed/changed "
- @echo " patches which modify either configure.ac or Makefile.am and, "
- @echo " thus, require autoreconf run. And all autoreconfing should "
- @echo " happen before uploading. "
- @echo
- @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) "
- @echo
- @echo " If you see this message, autoreconfing actually SUCCEEDED, "
- @echo " and your build should finish successfully, when rerun. "
- @echo "****************************************************************"
- @echo
- exit 1;
-
-.PHONY: autoreconf
-autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/check.md5sum \
- debian/patches/patched.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- fi
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 51fa145..6582a42 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -307,6 +307,4 @@ else
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
endif
-include debian/xsfbs/xsfbs-autoreconf.mk
-
# vim:set noet ai sts=8 sw=8 tw=0:
commit 5e65187660c0e782a10889366edba1e1bbe42b4e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 21 18:23:07 2008 +0100
Build against xserver 1.5 rc1 and minor debian/control updates
* Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 796a7fc..790f51a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
xserver-xorg-input-calcomp (1:1.1.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Build against xserver 1.5 rc1.
+ * Bump Standards-Version to 3.7.3.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Julien Cristau <[EMAIL PROTECTED]> Fri, 21 Mar 2008 18:21:02 +0100
diff --git a/debian/control b/debian/control
index 6d196c4..58a2a4d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
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-calcomp
-XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-calcomp.git
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.4.99.901), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-calcomp
+Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-calcomp.git
Package: xserver-xorg-input-calcomp
Architecture: any
commit dd6b2588647c35620efd0a7da5bee7c1dc3fa8e6
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 21 18:21:41 2008 +0100
Update changelogs
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..ff4fbd2
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,258 @@
+commit 6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Thu Mar 20 14:58:52 2008 -0400
+
+ calcomp 1.1.2
+
+commit 7c22915799dc8738dd1dc5225723344fff6eccfa
+Author: Stefan Dirsch <[EMAIL PROTECTED]>
+Date: Sat Feb 9 05:07:16 2008 +0100
+
+ Fixed static array overrun (Novell Bug #326967).
+
+ See https://bugzilla.novell.com/show_bug.cgi?id=326967 for some
+ more details.
+
+commit b202b45aeec28c5f858c0df977d1dc8e1a9d14eb
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Mon Sep 10 18:15:04 2007 +0200
+
+ Added some more patterns to .gitignore.
+
+commit 60bb7cdf42b0ac2fc9b9e1340423af7518fe1abe
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Mon Sep 10 18:13:36 2007 +0200
+
+ Bumped version to 1.1.1.
+
+commit 045dd911511bf806b8576302f1e196d137fb4665
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Mon Sep 10 18:12:33 2007 +0200
+
+ Generate ChangeLog from git.
+
+commit 1f3bd7beab75627cb3005faf9c0347eb7d7e5903
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Wed Aug 8 00:52:35 2007 +0300
+
+ Compile fix when building with DEBUG
+
+ XisbTrace didn't seem to do anything useful at all.
+
+commit c805910dda5b6aa7de2ded1e67b125ed2590fda5
+Author: Brice Goglin <[EMAIL PROTECTED]>
+Date: Mon Aug 6 22:16:52 2007 +0200
+
+ Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
+
+commit 2417ced11cac0b3d3483c80a52d631009fb712d5
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Jan 2 14:28:42 2007 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit ce14d8f26f5f9c7c286941302bb5a53129239615
+Author: Eric S. Raymond <[EMAIL PROTECTED]>
+Date: Tue Jan 2 14:27:57 2007 -0800
+
+ Bug 9512: Broken list markup in calcomp.4
+
+ <https://bugs.freedesktop.org/show_bug.cgi?id=9512>
+
+commit 35b73a133fea204931b1624c8fa60ba75f9b99dd
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Apr 7 16:54:17 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
+commit cdc0e8108a47f9ccf7dd1898bd75a996480a7df1
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Dec 21 02:29:56 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 9600e57b8965e33c736ea728ee7dfe192042d184
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Dec 19 16:25:49 2005 +0000
+
+ Stub COPYING files
+
+commit 1c6382cacb8f28f3a90ac7cbf974a34069826c80
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu Dec 15 00:24:13 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit ca4c2d1efafeada1a8104deb4d742dacc535534a
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Dec 6 22:48:27 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit f87ae0938b0ef841bd6f2442762977e8908c3672
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Dec 3 05:49:29 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 9cbc23babeb84dc2e5dc9226d931939a85485593
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Dec 2 02:16:04 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit d6c038110aebc756849fa4f3795de750db2d40c8
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Tue Nov 29 23:29:54 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 094f25dbb87b58fe6a0a81a9e3a7ccb4c6b3f6c4
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Nov 28 22:04:05 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 0dc26bbc517a5e7a16bbf20e1c8fa6518a8e3ffa
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Mon Nov 21 10:49:01 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 3d5e4eb212d13010b175906a9499bafafcbd24a5
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Nov 9 21:15:10 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit d53e6e9c20783d284ff88e4d3649ad2e7f8fe366
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Nov 1 15:08:48 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 343486daf6b7faaeb88d98746fa91da17b112b8f
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Oct 19 02:47:59 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit ca6c572ea6cf765680790f45e27cf47366b9f2ee
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Oct 18 00:01:50 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit beb4e20722c51ec9fd476d70f31a79733a90e22c
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Oct 17 22:57:26 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 90fe5234710594018c432d654048487911020897
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Oct 17 00:08:53 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit d5c04bd5cee42f0dd556050b7f726ffb4256f4ae
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Thu Aug 18 09:03:37 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 38a5ad6ab04226d721cd02b0d03f60795cc206b8
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Wed Aug 10 14:07:22 2005 +0000
+
+ Don\'t lose existing CFLAGS in all the input drivers and some of the video
+ drivers
+
+commit 221c1e275de566f572dd5ae282e8431ddd5cc5e0
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Jul 29 21:22:40 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit e53a9095fa9e2fe5df039f707fae149dc86ad37b
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Jul 13 20:03:20 2005 +0000
+
+ Make the module dir configurable
+
+commit 5c832ff7e5665cad91b1a65dd3150fa5be6d3bde
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Jul 13 02:20:57 2005 +0000
+
+ Update all input drivers to pass distcheck
+
+commit e79ff6722d5c764c80ef02ed8af2381091e58e60
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Tue Jul 12 06:15:08 2005 +0000
+
+ Build skeletons for input drivers. Should basically work.
+
+commit cc6d5df52208e532abc919010279d2143d8e82b6
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Jul 11 02:37:58 2005 +0000
+
+ Prep input drivers for modularizing by adding guarded #include "config.h"
+
+commit d942bbdc43faae872e7699bfc378eccd89739797
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sat Jun 25 21:17:00 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit c2a5716bcb661c36fb9c2adf687e2f45cc321f24
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Fri Apr 23 19:54:02 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 649bc72b3b73fefa54a9dc5869c798b3d7e861e9
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Sun Mar 14 08:33:51 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 3221c644e76e0df10a3ef47c999d71d8f3db0192
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Wed Mar 3 12:12:30 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 3377c708df6c81ab69bdd638d0f5afd03f0ea5f9
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 13:36:00 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit d48672f4cfa93907a68bfc5d42c3306551c96167
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 09:23:34 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 955c9cbdced7dcd75b319c41023270db9bcfa028
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:56 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 82141c852d890ca247dde30af3ae016f24494d7c
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:56 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index c93121a..796a7fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-calcomp (1:1.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 21 Mar 2008 18:21:02 +0100
+
xserver-xorg-input-calcomp (1:1.1.1-2) unstable; urgency=low
* Upload to unstable
commit 12033d74d4aae379cad8c0f04e3f01a9abc8a7a7
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 21 18:20:26 2008 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 8b714d3..c9fcac8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
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 mkinstalldirs
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
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
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -119,6 +116,7 @@ DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -130,6 +128,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -143,11 +142,11 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -158,19 +157,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -182,6 +182,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -210,8 +211,11 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
CLEANFILES = ChangeLog
@@ -257,7 +261,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -279,7 +283,6 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -312,8 +315,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -357,8 +359,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -383,8 +385,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in
$(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -394,13 +396,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -415,23 +416,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -445,7 +445,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -453,6 +453,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -460,7 +462,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {}
\; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
@@ -469,6 +471,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -496,6 +502,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -535,7 +543,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -606,12 +614,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -632,24 +648,26 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
