x11proto-input: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor:
commit eb62b09673db50ddcb8a3dc40a34eb1bf30003ed
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Dec 19 15:27:38 2008 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index efa96e1..96f1427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11proto-input (1.5.0-1) UNRELEASED; urgency=low
+x11proto-input (1.5.0-1) experimental; urgency=low
* New upstream release.
* Drop unused build-dep on libtool.
- -- Julien Cristau <jcristau@debian.org> Fri, 19 Dec 2008 15:14:43 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 19 Dec 2008 15:27:32 +0100
x11proto-input (1.4.4-1) unstable; urgency=low
commit 60d8756526778f0b80f20a3dcee6155a1dfd3fc8
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Dec 19 15:25:17 2008 +0100
add upstream changelog
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..c04e4d6
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,377 @@
+commit d38e79ca3ddd6031ca4a335eb2faf99294a6731f
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Wed Nov 26 21:37:06 2008 +1000
+
+ inputproto 1.5.0
+
+commit 5829370cafb112e488156e7ac1dd7902cfd1659a
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Mon Nov 17 10:58:31 2008 +1000
+
+ Remove Configure/QueryDeviceProperty.
+ (cherry picked from commit 18ef04f8a2026cca5d2d2b796ec2ea1c949bad36)
+
+ Removing Configure/QueryDevice property from XInput.h as well.
+ Not cherry-picked as XInput.h is moved to libXi in master.
+
+ Conflicts:
+
+ XIproto.h
+
+commit 6a4aefa04bb95c05d223027cebbe83c4117829f0
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Thu Sep 18 16:28:09 2008 +0930
+
+ Add XI_JOYSTICK type.
+ (cherry picked from commit c9454a8e84b2dce54bb346ff1aafb32e3c0ac5b9)
+
+commit 6af8447fab4a06d943398e6540e6b869d8a714ae
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Mon Nov 17 10:13:15 2008 +1000
+
+ Undef Atom after we're done so we don't pollute users of XIproto.h
+ (cherry picked from commit 36c8a6f3faf56a8f8ca31455812c9132b379b1b3)
+
+ Conflicts:
+
+ XIproto.h
+
+commit 72fb0941fff83f00fb039f865edcf5d25584757c
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Mon Nov 17 10:12:50 2008 +1000
+
+ Make sure Atoms are defined as CARD32.
+ (cherry picked from commit c919917e375aefaf473570c1b25b3c22231e858d)
+
+ Conflicts:
+
+ XIproto.h
+
+commit 6ee1ad8951ff811dc2618c9bd26cd42096ab2ecc
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Fri Aug 15 14:21:24 2008 +0930
+
+ Remove RCS tags, typo fix.
+ (cherry picked from commit c2d47b04c55cf72aef6c13a9e2cc4b41abfca673)
+
+commit d81ca85c4bcdcab208e4731a5d0f7d9bffbfab67
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Fri Oct 31 17:53:39 2008 +1030
+
+ PropertyNotify, move deviceid back to last byte.
+
+ This way, it can be type-cast to deviceKeyButtonPointer to extract the
+ deviceid, which is (aside from time) the only thing it has in common with
+ those anyway.
+ (cherry picked from commit f8064629496c6061bedb7a99b788fb9d3a170f11)
+
+commit e22b0ace88447a87c0b19d062a678880529b1b3b
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Mon Aug 25 11:34:47 2008 +0930
+
+ Add libXi's property interfaces.
+
+ XInput.h was removed from inputproto, hence this commit is not a cherry-pick
+ but a copy of the changes to XInput.h in libXi.
+
+commit 0a87cb3aac72adbbb81c7ac7ac04551547bf8b56
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Fri Aug 15 14:50:23 2008 +0930
+
+ Protect against C++ includes.
+ (cherry picked from commit fabe087cebb11c6a2600e57c6f7a52fda2efea29)
+
+commit e507aaaa74eeb02896843eb1815b614adf47a24a
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Mon Aug 25 10:19:37 2008 +0930
+
+ Back out Device Properties from XI 2, push into XI 1.5.
+ (cherry picked from commit 7c9620d8232e5c05115746055a832363a528ac2d)
+
+ Conflicts:
+
+ XI.h
+ XIproto.h
+
+commit c109e2ddb9cab22f185a877ab7e48002d1087400
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jul 29 09:10:09 2008 +0930
+
+ inputproto 1.4.4
+
+commit f41d153886c3519ebaf767f9c0d3281b6adce030
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jul 29 08:58:53 2008 +0930
+
+ Add DeviceControlChanged define.
+
+ This value is used for the devchange field in the DevicePresenceNotify event
+ when a device's control has been modified.
+ (cherry picked from commit 0daf8328cfa90b038753fc409c5eb05ba3fac6d5)
+
+commit 852568991b251e9366da167f1b746a0a1db6adf0
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Mar 10 09:31:51 2008 -0400
+
+ Typo fix.
+
+commit b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Mar 10 09:08:21 2008 -0400
+
+ C sucks: define XEventClass in terms of unsigned int, not CARD32.
+
+ Apparently pulling in Xmd.h here breaks qt, since they both define an
+ INT32 type (and incompatible ones even, since Xmd's is unsigned long on
+ ILP32 because whoever wrote Xmd.h is a C novice).
+
+commit 3edc1bf23b07ea47d7e1e32047e15c67333c663e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 5 22:06:19 2008 -0500
+
+ inputproto 1.4.3
+
+commit 096b20bf5492d248b5c8ff0c1c28e221d59db724
+Author: Jesse Barnes <jesse.barnes@intel.com>
+Date: Mon Jan 21 15:28:49 2008 -0800
+
+ Use Xmd.h instead of X.h to pull in CARD32 definition
+
+ On 64 bit hosts, CARD32 may be undefined unless we use Xmd.h to define it for
+ us. Apparently X.h is no longer sufficient.
+
+commit 9359e625787761e6b3df15f29bbf842c67a9516d
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:39:02 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 4b22047f347d8fd65a36b2fc90e1a87dff8e93e3
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Thu Sep 27 12:27:19 2007 -0400
+
+ XI.h needs X.h for CARD32 on 64-bit systems.
+
+commit f033750780b74d72056da93fd9a91140a978891b
+Merge: 369dd28... 96b0c13...
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 06:17:20 2007 -0400
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/inputproto
+
+commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:54:06 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 96b0c13a5a689b3a6dbc4249ca4ef364f778c003
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Fri Aug 31 17:58:27 2007 +0930
+
+ Bump to 1.4.2.1
+
+ No source changes, the 1.4.2 tarball had a busted configure script.
+
+commit 310a93f8e194aa070b0f1d40c8fd5ae941908dbe
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Apr 26 11:06:18 2007 +0930
+
+ bump to 1.4.2
+
+commit c9bed7d4750c314002c16430a4dd75f95cc2f78d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Apr 24 22:53:27 2007 +0930
+
+ Add flags to be used for DevicePrensence's devchange field.
+
+commit c608d82c6b5b87ddc8d14862f528bdd69f5f5b72
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Feb 15 16:33:07 2007 +0200
+
+ bump to 1.4.1
+
+commit ad2edb61ffd8baf87b9ab249aa36b0c04a765f79
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jan 9 13:32:39 2007 +1030
+
+ Fix typo in DevicePresence() macro
+
+commit a0be30da79e35e7d503c6eeb9021c2f63beb2176
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Oct 22 16:40:11 2006 +0300
+
+ DeviceAbs{Area,Calib}: properly align 32-bit types
+ Decorate CARD32s and INT32s with B32.
+
+commit b1b3dbfd9b00d47c84c213bc6b7d61c5e8c80466
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Oct 22 16:30:56 2006 +0300
+
+ DevicePresenceNotify: add deviceid field, with explanation
+ Add deviceid field, and an explanation of same in XInput.h.
+ deviceid is only used if a specific device changed, and control
+ is non-zero if a specific control on that device changed.
+
+commit 06ffd1e6b600d4e3f55ce7da69448a284ff5dac6
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date: Sat Oct 21 03:58:53 2006 -0400
+
+ DEVICE_TOUCHPAD -> DEVICE_ABS_CALIB.
+
+ As it's really calibration for absolute devices, add some stuff.
+
+ DEVICE_ABS_AREA
+
+ Defines the area of the screen that an absolute device covers if it is sending
+ core events.
+
+commit 1fab95863efc2bbf9a5b836b3de31da4a956b4bd
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Oct 20 00:33:13 2006 +0300
+
+ add DEVICE_ENABLE control, add core indication
+ Add DEVICE_ENABLE control, which allows specific devices to be
+ enabled or disabled at runtime.
+ Add 'iscore' flag to DEVICE_CORE, which indicates whether or not the
+ device is a virtual core device.
+
+commit 926251a486b57197d735a426887acad6fdfd7dc6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 18 11:56:37 2006 -0400
+
+ add XExtensionKeyboard and XExtensionPointer classes
+ Add two new classes of device, XExtensionKeyboard, and XExtensionPointer.
+
+commit 7a4a2a3e733378abced0a184627adfda4ed387b9
+Author: Daniel Stone <daniel.stone@nokia.com>
+Date: Mon Jul 17 19:34:45 2006 -0400
+
+ add DevicePresenceNotify event, clean up
+ Add DevicePresenceNotify event, which indicates that something in the device
+ list changed (Kristian Høgsberg, Red Hat).
+ Add a core event control, which toggles the sending or not of core events by
+ an extended device.
+ Clean up some random detritus from the MetroLink merge.
+
+commit 6767671f502964d385aa41de3a45fb479c6330c0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jul 14 18:56:18 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 4cc2697880ae61723094dacf78ffe77d81f6e0ee
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:37 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 3ade2fe8443f572abeee73b4fa8e986e4a054017
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 67498db2df7435d9d59eda4ac444c6560da839b3
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Tue Aug 2 19:19:38 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 742a1eb222d662fc9247ab7c1bd337ffef01eafb
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:55 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 9161a356397a07002e03cf1846d212c7154f4c52
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat May 21 04:04:21 2005 +0000
+
+ Set version to 1.3.
+
+commit 492f0a9e16bfe9cfb2c7b888b5b5e511db2bf83b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu May 19 00:22:39 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit ec71e17293b90ff5eeaa97566751fc5c3955904a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu May 19 00:10:18 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 242316c65e53d1bba244e4f35e5a93718b0ea8d0
+Author: Josh Triplett <josh@speakeasy.net>
+Date: Mon May 16 03:30:03 2005 +0000
+
+ Add COPYING file for Input.
+
+commit 5c5945a47990b7bc077bcfdbabb6e0003cbf1659
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon May 9 18:20:04 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 518f527ab685d2d082796460113bb7a9ea9bfe15
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri May 6 01:46:30 2005 +0000
+
+ Initial build system files for proto module.
+
+commit 4254b2967e3c5f256138f35de1ab49efff87220c
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit ca910a158bdc060d17cf3c00f93c82c3a6ee6f05
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:31:35 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 08e413c25f385e51466ef3309d880c1f63bf0a73
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 1b98dbf2eab5a8ef74afda0c669c9fdfc6461cda
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:11 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit f276a601f272742ea8570fae4326c172cf4b8723
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:22:27 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 47d36cccfdf0e65848bb2e9595779501a76d6000
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 4383a95e0bbc2f09394deefc453c2edd1c813d0f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 51468f1607f0b88576628c89e85d159afbb4628e
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:35 2003 +0000
+
+ R6.6 is the Xorg base-line
commit 977d3d6cf29ed2d884485e01c51fe3339b707131
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Dec 19 15:21:57 2008 +0100
Drop unused build-dep on libtool.
And remove one more generated file
diff --git a/debian/changelog b/debian/changelog
index 9cfc54a..efa96e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-input (1.5.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Drop unused build-dep on libtool.
-- Julien Cristau <jcristau@debian.org> Fri, 19 Dec 2008 15:14:43 +0100
diff --git a/debian/control b/debian/control
index b349609..80ef51c 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 <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5), automake, libtool, xutils-dev
+Build-Depends: debhelper (>= 5), automake, xutils-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-input
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-input.git
diff --git a/debian/rules b/debian/rules
index 72a6933..8dcf7de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ clean: xsfclean
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
rm -f $$(find -name Makefile.in)
- rm -f configure install-sh missing aclocal.m4
+ rm -f configure install-sh missing aclocal.m4 mkinstalldirs
dh_clean
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index ef7e16f..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,161 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2006-05-11.19
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-IFS=" "" $nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
commit ddf87bf0c17b334e4113431430fc64384793f03a
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Dec 19 15:17:21 2008 +0100
update changelog
diff --git a/debian/changelog b/debian/changelog
index e2e8666..9cfc54a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-input (1.5.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 19 Dec 2008 15:14:43 +0100
+
x11proto-input (1.4.4-1) unstable; urgency=low
[ Timo Aaltonen ]
commit e8d7ca83067cf37b07b21a12e6aaa3c181762fc1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 28 00:08:37 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 455a242..e2e8666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-input (1.4.4-1) UNRELEASED; urgency=low
+x11proto-input (1.4.4-1) unstable; urgency=low
[ Timo Aaltonen ]
* New upstream release.
@@ -8,7 +8,7 @@ x11proto-input (1.4.4-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* debian/rules: allow parallel builds.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 15 Aug 2008 15:27:35 +0300
+ -- Julien Cristau <jcristau@debian.org> Thu, 28 Aug 2008 00:06:54 +0200
x11proto-input (1.4.3-2) unstable; urgency=low
commit 53dbb5efb204c94377275025fbf76e0e8718a0d1
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 16 05:28:52 2008 +0200
debian/rules: allow parallel builds, and don't try to apply patches
diff --git a/debian/changelog b/debian/changelog
index b21986b..455a242 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
x11proto-input (1.4.4-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Switch to running autoreconf at build time, and build-depend on automake,
libtool and xutils-dev.
+ [ Julien Cristau ]
+ * debian/rules: allow parallel builds.
+
-- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 15 Aug 2008 15:27:35 +0300
x11proto-input (1.4.3-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 4ca5361..72a6933 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,14 @@ PACKAGE = x11proto-input-dev
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)
@@ -30,7 +31,7 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-configure: $(STAMP_DIR)/patch
+configure:
dh_testdir
autoreconf -vfi
commit 0324710155277863e7cba189274a105eac741237
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Aug 15 15:40:47 2008 +0300
Switch to running autoreconf at build time
build-depend on automake, libtool and xutils-dev
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 3c60fc6..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,522 +0,0 @@
-# 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, 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(am__configure_deps) $(input_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/inputproto.pc.in $(top_srcdir)/configure COPYING \
- ChangeLog install-sh missing mkinstalldirs
-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 config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = inputproto.pc
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(inputdir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA)
-inputHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(input_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-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@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-inputdir = $(includedir)/X11/extensions
-input_HEADERS = \
- XI.h \
- XInput.h \
- XIproto.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = inputproto.pc
-EXTRA_DIST = autogen.sh inputproto.pc.in ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-all: all-am
-
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-inputproto.pc: $(top_builddir)/config.status $(srcdir)/inputproto.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-install-pkgconfigDATA: $(pkgconfig_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
-
-uninstall-pkgconfigDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
-install-inputHEADERS: $(input_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(inputdir)" || $(MKDIR_P) "$(DESTDIR)$(inputdir)"
- @list='$(input_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(inputHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(inputdir)/$$f'"; \
- $(inputHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(inputdir)/$$f"; \
- done
-
-uninstall-inputHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(input_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(inputdir)/$$f'"; \
- rm -f "$(DESTDIR)$(inputdir)/$$f"; \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(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; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(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; 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) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
Reply to: