ChangeLog | 47 +++++++++++++++++++++++++++++++++++++++++++++++
debian/changelog | 10 ++++------
debian/control | 2 +-
3 files changed, 52 insertions(+), 7 deletions(-)
New commits:
commit cdc81f6f9d53862da1d19b8461ee4c81278c2ecd
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Dec 19 15:55:33 2008 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 978f68c..5a911fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.2.0-1) UNRELEASED; urgency=low
+libxi (2:1.2.0-1) experimental; urgency=low
[ Timo Aaltonen ]
* New upstream release.
@@ -20,7 +20,7 @@ libxi (2:1.2.0-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add a link to www.X.org in the long description.
- -- Brice Goglin <bgog...@debian.org> Fri, 13 Jun 2008 11:19:59 +0200
+ -- Julien Cristau <jcris...@debian.org> Fri, 19 Dec 2008 15:55:22 +0100
libxi (2:1.1.4-1) unstable; urgency=low
commit 500333aa355f339e21f3fc33b51a93a84c96b957
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Dec 19 15:55:10 2008 +0100
update upstream changelog
diff --git a/ChangeLog b/ChangeLog
index 5568415..90418e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+commit 2d586065649304b2864afddee6f6225a4a61a0c9
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Wed Dec 3 12:50:45 2008 +1000
+
+ libXi 1.2.0
+
+ Requires inputproto 1.5.0 or later.
+
+commit 305d356e43462834a2fdd2cf59d47b055c2416fd
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Mon Nov 17 11:50:06 2008 +1000
+
+ Add support for XI 1.5 device properties.
+
+ This is a manual merge from master onto libXi 1.1.4. The branches have
+ diverged too much to make cherry-picking reasonable and readable.
+
+ This patch includes the property support provided by the combination of the
+ following patches:
+ - 7d5bb99ffce3200f82420c5a5ebac3b445aac633
+ - 0211e3e8277c590349903989f1676f6af4baa44b
+ - bfd2e08f3530091fbcd8c078f684e9aab9057df0
+ - bec02767629ed795582ba3f645299d7036093511
+ - f9a5371d43b2c6023745f766d0e8ceff2acdff60
+ - e179b124aac13387c6f730197b8852c1f69eb9e3
+
+ Man pages are copied from the parsed docbook output from master.
+
+commit 45b73dc157f326785e1022f5476bfc1f9f514d6e
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Mon Nov 17 11:44:31 2008 +1000
+
+ Add XI_JOYSTICK to list of defined types.
+ (cherry picked from commit e5c529813b04327babc20e51ca56006210cb0c37)
+
+ Conflicts:
+
+ man/XI.xml
+
+commit 88e2bf75cc619bb1ddc51e5dc65ddb9d712f69f5
+Author: Peter Hutterer <peter.hutte...@redhat.com>
+Date: Mon Nov 17 11:35:59 2008 +1000
+
+ Bump to 1.1.99.2.
+
+ 1.1.99.1 was used by master for a while.
+
commit f0ecfd1952289f5ff33297e3358552365e047f09
Author: Peter Hutterer <peter.hutte...@redhat.com>
Date: Mon Nov 17 11:12:39 2008 +1000
commit ef696d84a73347593ccc3ff9fd9994335f7c528c
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Dec 19 15:51:40 2008 +0100
Bump libxi-dev's dependency on x11proto-input-dev to 1.5 as well.
Also merge previous unreleased changelog entry
diff --git a/debian/changelog b/debian/changelog
index accfb98..978f68c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,12 @@
libxi (2:1.2.0-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* debian/control:
- Bump x11proto-input-dev build-dep to 1.5.
* debian/rules:
- Bump the shlibs for libxi6.
- -- Timo Aaltonen <tepsipa...@ubuntu.com> Wed, 03 Dec 2008 19:21:26 +0200
-
-libxi (2:1.1.4-2) UNRELEASED; urgency=low
-
[ Julien Cristau ]
* Drop -1 debian revisions from build-deps.
* Bump Standards-Version to 3.7.3.
@@ -18,6 +15,7 @@ libxi (2:1.1.4-2) UNRELEASED; urgency=low
* Wrap build-deps in debian/control.
* Build-depend on automake and libtool, run autoreconf on build, and allow
parallel builds.
+ * Bump libxi-dev's dependency on x11proto-input-dev to 1.5 as well.
[ Brice Goglin ]
* Add a link to www.X.org in the long description.
diff --git a/debian/control b/debian/control
index c4a14bb..a7ddf3b 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Description: X11 Input extension library (debug package)
Package: libxi-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version}),
libx11-dev, libxext-dev, x11proto-input-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version}),
libx11-dev, libxext-dev, x11proto-input-dev (>= 1.5)
Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 Input extension library (development headers)
libXi provides an X Window System client interface to the XINPUT
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
