xcb-util-keysyms: Changes to 'debian-unstable'
Makefile.am | 2
NEWS | 5 ++
configure.ac | 2
debian/changelog | 11 ++++
debian/compat | 2
debian/control | 11 ++--
debian/copyright | 90 ++++++++++++++++++++-----------------
debian/libxcb-keysyms1-dev.install | 6 +-
debian/libxcb-keysyms1.install | 2
debian/rules | 4 -
keysyms/keysyms.c | 2
11 files changed, 85 insertions(+), 52 deletions(-)
New commits:
commit f1967d42456bbfb6d12d899691820be4f4e860bc
Author: Arnaud Fontaine <arnau@debian.org>
Date: Fri Jun 8 11:20:01 2012 +0900
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index dbd62a9..88997fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xcb-util-keysyms (0.3.9-1) UNRELEASED; urgency=low
+xcb-util-keysyms (0.3.9-1) unstable; urgency=low
* New upstream release.
+ debian/rules: do not delete autogen.sh for git as it is now shipped.
@@ -7,7 +7,7 @@ xcb-util-keysyms (0.3.9-1) UNRELEASED; urgency=low
* debian/control: bump Standards-Version to 3.9.3.
+ debian/copyright: switch to machine-readable format.
- -- Arnaud Fontaine <arnau@debian.org> Thu, 07 Jun 2012 22:59:30 +0900
+ -- Arnaud Fontaine <arnau@debian.org> Fri, 08 Jun 2012 11:19:50 +0900
xcb-util-keysyms (0.3.8-1) unstable; urgency=low
commit e5c1e930b3f1b5b1f8e10ae1eae10a7dad661c21
Author: Arnaud Fontaine <arnau@debian.org>
Date: Fri Jun 8 10:31:45 2012 +0900
Fix duplicated short description on development package.
diff --git a/debian/changelog b/debian/changelog
index 8be02e8..dbd62a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xcb-util-keysyms (0.3.9-1) UNRELEASED; urgency=low
* New upstream release.
+ debian/rules: do not delete autogen.sh for git as it is now shipped.
* Convert to multiarch.
+ * debian/control: fix duplicated short description on development package.
* debian/control: bump Standards-Version to 3.9.3.
+ debian/copyright: switch to machine-readable format.
diff --git a/debian/control b/debian/control
index f6dca16..67811cc 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Multi-Arch: same
Depends: libxcb-keysyms1 (= ${binary:Version}),
libxcb1-dev,
${misc:Depends}
-Description: utility libraries for X C Binding -- keysyms
+Description: utility libraries for X C Binding -- keysyms, development files
This package contains the header and library files needed to build software
using libxcb-keysyms, providing standard X key constants and conversion to/from
keycodes.
commit bad20035acc8fe68dd42ef96d7e189cc553ddea1
Author: Arnaud Fontaine <arnau@debian.org>
Date: Fri Jun 8 10:25:50 2012 +0900
Bump Standards-Version to 3.9.3.
diff --git a/debian/changelog b/debian/changelog
index d28c5dc..8be02e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xcb-util-keysyms (0.3.9-1) UNRELEASED; urgency=low
* New upstream release.
+ debian/rules: do not delete autogen.sh for git as it is now shipped.
- * debian/copyright: switch to machine-readable format.
* Convert to multiarch.
+ * debian/control: bump Standards-Version to 3.9.3.
+ + debian/copyright: switch to machine-readable format.
-- Arnaud Fontaine <arnau@debian.org> Thu, 07 Jun 2012 22:59:30 +0900
diff --git a/debian/control b/debian/control
index b5bf02f..f6dca16 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: cdbs (>= 0.4.93~),
autoconf,
automake,
xutils-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://xcb.freedesktop.org
Vcs-Git: git://git.debian.org/pkg-xorg/lib/xcb-util-keysyms.git
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xcb-util-keysyms.git
commit a26f06c145ece97ef3ce8b5a011800a7d3a2d793
Author: Arnaud Fontaine <arnau@debian.org>
Date: Fri Jun 8 10:23:33 2012 +0900
Convert to multiarch.
diff --git a/debian/changelog b/debian/changelog
index fd3a500..d28c5dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xcb-util-keysyms (0.3.9-1) UNRELEASED; urgency=low
* New upstream release.
+ debian/rules: do not delete autogen.sh for git as it is now shipped.
* debian/copyright: switch to machine-readable format.
+ * Convert to multiarch.
-- Arnaud Fontaine <arnau@debian.org> Thu, 07 Jun 2012 22:59:30 +0900
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index ef3abe7..b5bf02f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Julien Danjou <acid@debian.org>,
Arnaud Fontaine <arnau@debian.org>
-Build-Depends: cdbs,
- debhelper (>= 5),
+Build-Depends: cdbs (>= 0.4.93~),
+ debhelper (>= 8.1.3),
libxcb1-dev (>= 1.6),
pkg-config,
libtool,
@@ -22,6 +22,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xcb-util-keysyms.git
Package: libxcb-keysyms1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: utility libraries for X C Binding -- keysyms
This package contains the library files needed to run software using
@@ -37,6 +39,7 @@ Description: utility libraries for X C Binding -- keysyms
Package: libxcb-keysyms1-dev
Architecture: any
+Multi-Arch: same
Depends: libxcb-keysyms1 (= ${binary:Version}),
libxcb1-dev,
${misc:Depends}
diff --git a/debian/libxcb-keysyms1-dev.install b/debian/libxcb-keysyms1-dev.install
index f653b2b..145bb46 100644
--- a/debian/libxcb-keysyms1-dev.install
+++ b/debian/libxcb-keysyms1-dev.install
@@ -1,4 +1,4 @@
usr/include/xcb/xcb_keysyms.h
-usr/lib/libxcb-keysyms.a
-usr/lib/libxcb-keysyms.so
-usr/lib/pkgconfig/xcb-keysyms.pc
+usr/lib/*/libxcb-keysyms.a
+usr/lib/*/libxcb-keysyms.so
+usr/lib/*/pkgconfig/xcb-keysyms.pc
diff --git a/debian/libxcb-keysyms1.install b/debian/libxcb-keysyms1.install
index c9f9aaf..5ffaab1 100644
--- a/debian/libxcb-keysyms1.install
+++ b/debian/libxcb-keysyms1.install
@@ -1 +1 @@
-usr/lib/libxcb-keysyms.so.*
+usr/lib/*/libxcb-keysyms.so.*
diff --git a/debian/rules b/debian/rules
index 0337ebe..7f72731 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ DEB_DH_INSTALL_SOURCEDIR=debian/tmp
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
DEB_DH_MAKESHLIBS_ARGS=-V
ORIG_MAJOR=$(shell git describe upstream | cut -d- -f1)
commit 3a88e18247a2235b08147ddc439a0da73b65fccf
Author: Arnaud Fontaine <arnau@debian.org>
Date: Thu Jun 7 23:05:07 2012 +0900
Switch debian/copyright to machine-readable format.
diff --git a/debian/changelog b/debian/changelog
index adab22a..fd3a500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xcb-util-keysyms (0.3.9-1) UNRELEASED; urgency=low
* New upstream release.
+ debian/rules: do not delete autogen.sh for git as it is now shipped.
+ * debian/copyright: switch to machine-readable format.
-- Arnaud Fontaine <arnau@debian.org> Thu, 07 Jun 2012 22:59:30 +0900
diff --git a/debian/copyright b/debian/copyright
index 834a63a..655e1a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,41 +1,53 @@
-This package was debianized by Julien Danjou <acid@debian.org> on Tue, 25 Mar
-2008 19:14:42 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xcb-util-keysyms
+Upstream-Contact: XCB Mailing List <xcb@lists.freedesktop.org>
+Source: http://xcb.freedesktop.org
-It was downloaded from <http://xcb.freedesktop.org>
+Files: *
+Copyright: 2008 Josh Triplett <josh@freedesktop.org>
+ 2008 Ulrich Eckhardt <doomster@knuut.de>
+ 2008 Ian Osgood <iano@quirkster.com>
+ 2008 Jamey Sharp <jamey@minilop.net>
+License: MIT/X Consortium License
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS 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.
+ .
+ Except as contained in this notice, the names of the authors or their
+ institutions shall not be used in advertising or otherwise to promote the
+ sale, use or other dealings in this Software without prior written
+ authorization from the authors.
-Upstream Authors: Ian Osgood, Jamey Sharp, Josh Triplett and Ulrich Eckhardt.
-
-Copyright:
-
- Copyright © 2008 Ian Osgood <iano@quirkster.com>
- Copyright © 2008 Jamey Sharp <jamey@minilop.net>
- Copyright © 2008 Josh Triplett <josh@freedesktop.org>
- Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de>
-
-License:
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS 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.
-
- Except as contained in this notice, the names of the authors or their
- institutions shall not be used in advertising or otherwise to promote the
- sale, use or other dealings in this Software without prior written
- authorization from the authors.
-
-The Debian packaging is © 2008-2011, Julien Danjou <acid@debian.org> and ©
-2011, Arnaud Fontaine <arnau@debian.org>, and is licensed under the GPL, see
-`/usr/share/common-licenses/GPL-2'.
+Files: debian/*
+Copyright: 2008-2012, Julien Danjou <acid@debian.org>
+ 2011-2012, Arnaud Fontaine <arnau@debian.org>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.
commit 231a34bc584d805d85411c948964e28a6336e429
Author: Arnaud Fontaine <arnau@debian.org>
Date: Thu Jun 7 23:02:53 2012 +0900
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 9c2df93..adab22a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xcb-util-keysyms (0.3.9-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + debian/rules: do not delete autogen.sh for git as it is now shipped.
+
+ -- Arnaud Fontaine <arnau@debian.org> Thu, 07 Jun 2012 22:59:30 +0900
+
xcb-util-keysyms (0.3.8-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 6dcecaf..0337ebe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,7 @@ cleanbuilddir::
rm -f configure-stamp
# Specific to Git Debian package
- rm -f Doxyfile .gitmodules autogen.sh \
- m4/xcb_util_m4_with_include_path.m4
+ rm -f Doxyfile .gitmodules m4/xcb_util_m4_with_include_path.m4
get-orig-source:
git archive upstream | gzip -9 > ../xcb-util-keysyms_$(ORIG_MAJOR)+git$(ORIG_GIT).orig.tar.gz
commit 12fc61fbbdf1ca2df25281a7d8e00f2dab75d1c2
Author: Arnaud Fontaine <arnau@debian.org>
Date: Wed May 30 21:07:38 2012 +0900
Release 0.3.9
Signed-off-by: Arnaud Fontaine <arnau@debian.org>
diff --git a/NEWS b/NEWS
index 24ed439..0221d76 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Release 0.3.9 (2012-05-30)
+==========================
+
+- Recognise ISO_Level5-keysyms as modifiers in xcb_is_modifier_key #39177.
+
Release 0.3.8 (2010-04-25)
==========================
diff --git a/configure.ac b/configure.ac
index 13564f2..fd0700c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59c)
-AC_INIT([xcb-util-keysyms],0.3.8,[xcb@lists.freedesktop.org])
+AC_INIT([xcb-util-keysyms],0.3.9,[xcb@lists.freedesktop.org])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 5a3906f700a975653da7f64a2d66ebdbea8b8b34
Author: Arnaud Fontaine <arnau@debian.org>
Date: Mon May 21 11:11:12 2012 +0900
Add autogen.sh to EXTRA_DIST.
diff --git a/Makefile.am b/Makefile.am
index c63b269..6394bcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,3 +13,5 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
SUBDIRS = keysyms
+
+EXTRA_DIST = autogen.sh
commit 2b3188d700bac5b8d32fffd8d1090ef4bb8707c3
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Sun Aug 7 19:33:21 2011 +0000
Recognise ISO_Level5-keysyms as modifiers in xcb_is_modifier_key #39177
xcb_is_modifier_key did not regecognise ISO_Level5_Shift,
ISO_Level5_Latch, and ISO_Level5_Lock as modifiers. See bug
39177, https://bugs.freedesktop.org/show_bug.cgi?id=39177
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
diff --git a/keysyms/keysyms.c b/keysyms/keysyms.c
index 3ea0e13..7584ccc 100644
--- a/keysyms/keysyms.c
+++ b/keysyms/keysyms.c
@@ -363,7 +363,7 @@ int
xcb_is_modifier_key (xcb_keysym_t keysym)
{
return (((keysym >= XK_Shift_L) && (keysym <= XK_Hyper_R)) ||
- ((keysym >= XK_ISO_Lock) && (keysym <= XK_ISO_Last_Group_Lock)) ||
+ ((keysym >= XK_ISO_Lock) && (keysym <= XK_ISO_Level5_Lock)) ||
(keysym == XK_Mode_switch) ||
(keysym == XK_Num_Lock));
}
Reply to: