--- libxklavier-3.6.orig/debian/libxklavier12.shlibs +++ libxklavier-3.6/debian/libxklavier12.shlibs @@ -0,0 +1 @@ +libxklavier 12 libxklavier12 (>= 3.4) --- libxklavier-3.6.orig/debian/control.in +++ libxklavier-3.6/debian/control.in @@ -0,0 +1,48 @@ +Source: libxklavier +Priority: optional +Section: libs +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Filip Van Raemdonck +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs, + debhelper (>= 5), + libglib2.0-dev (>= 2.6.0), + libxml2-dev (>= 2.0.0), + pkg-config, + libxkbfile-dev, + libxt-dev, + gnome-pkg-tools (>= 0.12.3) +Standards-Version: 3.7.3 + +Package: libxklavier12 +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + xkb-data (>= 0.8) | xkb-data-legacy, + x11-xkb-utils | xbase-clients +Replaces: libxklavier7, + libxklavier8, + libxklavier10, + libxklavier11 +Conflicts: libxklavier8 +Description: X Keyboard Extension high-level API + Libxklavier provides programmers an API for high(er) level access to the + X Keyboard Extension, to ease creating XKB related applications. + +# please rename to libxklavier-dev with next SONAME change; in most cases the +# rbdeps will still build and it doesn't make sense to rename the API package +# all the time unless we actually ship two libxklavier sources and -dev +# packages +Package: libxklavier12-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libxklavier12 (= ${binary:Version}), + libglib2.0-dev (>= 2.6.0), + libxml2-dev (>= 2.0.0), + libx11-dev +Replaces: libxklavier-dev, libxklavier11-dev +Conflicts: libxklavier-dev, libxklavier11-dev +Description: Development files for libxklavier + These are headers and other files needed to develop with libxklavier. --- libxklavier-3.6.orig/debian/control +++ libxklavier-3.6/debian/control @@ -0,0 +1,48 @@ +Source: libxklavier +Priority: optional +Section: libs +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Filip Van Raemdonck +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge +Build-Depends: cdbs, + debhelper (>= 5), + libglib2.0-dev (>= 2.6.0), + libxml2-dev (>= 2.0.0), + pkg-config, + libxkbfile-dev, + libxt-dev, + gnome-pkg-tools (>= 0.12.3) +Standards-Version: 3.7.3 + +Package: libxklavier12 +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + xkb-data (>= 0.8) | xkb-data-legacy, + x11-xkb-utils | xbase-clients +Replaces: libxklavier7, + libxklavier8, + libxklavier10, + libxklavier11 +Conflicts: libxklavier8 +Description: X Keyboard Extension high-level API + Libxklavier provides programmers an API for high(er) level access to the + X Keyboard Extension, to ease creating XKB related applications. + +# please rename to libxklavier-dev with next SONAME change; in most cases the +# rbdeps will still build and it doesn't make sense to rename the API package +# all the time unless we actually ship two libxklavier sources and -dev +# packages +Package: libxklavier12-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libxklavier12 (= ${binary:Version}), + libglib2.0-dev (>= 2.6.0), + libxml2-dev (>= 2.0.0), + libx11-dev +Replaces: libxklavier-dev, libxklavier11-dev +Conflicts: libxklavier-dev, libxklavier11-dev +Description: Development files for libxklavier + These are headers and other files needed to develop with libxklavier. --- libxklavier-3.6.orig/debian/rules +++ libxklavier-3.6/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk + +SF_PROJECT := gswitchit + +DEB_CONFIGURE_EXTRA_FLAGS := --with-xkb-base=/usr/share/X11/xkb \ + --with-xkb-bin-base=/usr/bin + +# upstream bug +clean:: + rm -f libxklavier.spec --- libxklavier-3.6.orig/debian/watch +++ libxklavier-3.6/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://sf.net/gswitchit libxklavier-([\d.]*).tar.gz \ + debian uupdate --- libxklavier-3.6.orig/debian/changelog +++ libxklavier-3.6/debian/changelog @@ -0,0 +1,314 @@ +libxklavier (3.6-0ubuntu1) intrepid; urgency=low + + * New upstream version + * debian/control.in: + - updated maintainer information + + -- Sebastien Bacher Fri, 06 Jun 2008 15:52:43 +0200 + +libxklavier (3.5-1) unstable; urgency=low + + [ Loic Minier ] + * Add a note in control.in to please rename libxklavier12-dev to + libxklavier-dev next time the SONAME changes. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/libxklavier12.install: + - Remove directories that were removed. + + -- Sebastian Dröge Tue, 11 Mar 2008 06:11:39 +0100 + +libxklavier (3.4-3) unstable; urgency=low + + * Upload to unstable. + * debian/control.in: + + Let the shared library package replace libxklavier11 (Closes: #468259). + + -- Sebastian Dröge Thu, 28 Feb 2008 09:10:28 +0100 + +libxklavier (3.4-2) experimental; urgency=low + + * debian/control.in: + + Add Conflicts/Replaces for libxklavier11-dev. + + -- Sebastian Dröge Thu, 07 Feb 2008 09:05:07 +0100 + +libxklavier (3.4-1) experimental; urgency=low + + * New upstream release with ABI breakage. + * Change everything for the new soname. + + -- Sebastian Dröge Thu, 31 Jan 2008 10:20:43 +0100 + +libxklavier (3.3-2) unstable; urgency=low + + [ Loic Minier ] + * Fix watch file; closes: #453565. + + [ Sebastian Dröge ] + * debian/control.in: + + Don't depend on the transitional xbase-clients package anymore + but depend on x11-xkb-utils. Patch by Robert Millan (Closes: #455535). + + Update Standards-Version to 3.7.3, no other changes needed. + + -- Sebastian Dröge Sat, 15 Dec 2007 14:10:47 +0100 + +libxklavier (3.3-1) unstable; urgency=low + + [ Alan Baghumian ] + * New upstream release: + - Selecting keyboards per-vendor + * Merged with the previous changelog entry + * Updated watch file to work with SF.Net complex mirror system + * Wrapped deps and build-deps + + [ Sebastian Dröge ] + * debian/libxklavier11.shlibs: + + Bump shlibs to >= 3.3 because of a new property. + * debian/control.in: + + Use ${binary:Version} instead of ${Source-Version} to make lintian happy. + + Let the -dev package depend on libx11-dev as the headers include + . + + -- Sebastian Dröge Thu, 20 Sep 2007 17:39:47 +0200 + +libxklavier (3.2-2) unstable; urgency=low + + * Upload to unstable, remove check-dist include. + + -- Sebastian Dröge Wed, 18 Apr 2007 17:11:19 +0200 + +libxklavier (3.2-1) experimental; urgency=low + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New patch, 10_realloc-layout-names, fixes use of the return value of + realloc; adapted from SourceForge #1463839. + + [ Sebastian Dröge ] + * New upstream release with no API changes. + * Updated 10_realloc-layout-names.patch: cleaned accidentially included + files from the patch. Also fix syntax error to get stuff actually + building. + * Dropped 02_xklconfigfindobject-crashes-when-no-nodes-are-found.patch, + merged upstream. + + -- Sebastian Dröge Wed, 18 Apr 2007 13:53:04 +0200 + +libxklavier (3.1-2) experimental; urgency=low + + * 01_xorg_xkb_path.patch: removed. + * force xkbcomp path using --with-xkb-bin-base instead + (closes: #404756). + + -- Josselin Mouette Wed, 3 Jan 2007 17:01:06 +0100 + +libxklavier (3.1-1) experimental; urgency=low + + * New upstream release. + * 01_xorg_xkb_path.patch: don't rename xfree86.xml to xorg.xml, the + file shipped in the package isn't renamed. + + -- Josselin Mouette Mon, 27 Nov 2006 22:05:41 +0100 + +libxklavier (3.0-2) experimental; urgency=low + + * Merge 2.2-4; update patch + 02_xklconfigfindobject-crashes-when-no-nodes-are-found. + * Fix typo in Replaces; thanks Michael Biebl; closes: #398704. + + -- Loic Minier Wed, 15 Nov 2006 16:10:43 +0100 + +libxklavier (3.0-1) experimental; urgency=low + + * New upstream release. + + [ Ricardo Setti ] + * Adapt to new version: + - updated debian/patches/01_xorg_xkb_path.patch. + - removed build-dep on doxygen, it's no longer necessary. + - updated debehelper build-dep. + - cleaned debian/rules to remove old stuff + - added build-dep in libglib-2.0. + - bump soname to 11. + * Bumped Standards-Version. + + [ Jordi Mallach ] + * debian/control: renamed to control.in. + * debian/control.in: + - bump libglib2.0-dev to >= 2.6.0, libxml2-dev to >= 2.0.0 as per + configure.in. + - add gnome-pkg-tools to Build-Depends. + - rename libxklavier-dev to libxklavier11-dev, as 3.0 is a new, + incompatible API. + - don't make libxklavier11 Conflict: libxklavier10, Replaces is enough. + * debian/rules: include gnome-pkg-tools' uploaders.mk to autogen Uploaders + list. + * debian/copyright: improve copyright notes, add upstream URL. + + [ Loic Minier ] + * Add watch file. + * Add ${misc:Depends} to all packages and ${shlibs:Depends} to the -dev + package. + * Use ${Source-Version} for the -dev package dependency on the shared lib. + * Add CDBS' utils. + * Let the -dev depend on libglib2.0-dev for the .pc file. + * Use clean-la.mk and require gnome-pkg-tools 0.7. + * Clean libxklavier.spec manually as upstream doesn't. + + -- Loic Minier Fri, 6 Oct 2006 14:57:30 +0200 + +libxklavier (2.2-4) unstable; urgency=low + + * Add GNOME team as Uploaders. + * New patch, 02_xklconfigfindobject-crashes-when-no-nodes-are-found, from + the discussion in GNOME #367195; closes: #396492. + + -- Loic Minier Sat, 4 Nov 2006 14:45:00 +0100 + +libxklavier (2.2-3) unstable; urgency=medium + + * debian/patches/01_xorg_xkb_path.patch: add fix by Marcelo Magallon + which fixes the inability of xklavier to find xkbcomp due to the + previous removal of its path and further changes to Xorg 7.0 since + the bug was filed (closes: #363147). + + -- Jordi Mallach Tue, 18 Apr 2006 23:45:24 +0200 + +libxklavier (2.2-2) unstable; urgency=low + + * debian/rules, libxklavier/xklavier_config_xkb.c: apply patch from Denis + Barbier to look for XKB data in the new Xorg 7 path (closes: #358868). + * debian/control: add dependency on xkb-data | xkb-data-legacy (for the + new data) and xbase-clients (for xkbcomp). + + -- Jordi Mallach Thu, 13 Apr 2006 15:46:51 +0200 + +libxklavier (2.2-1) unstable; urgency=low + + * New upstream release. + * debian/control: replace xlibs-static-dev with libxkbfile-dev in + Build-Depends. + * debian/rules: adapt for 2.2 version number. + * debian/patches/01_link_x11.patch: removed, apparently not needed anymore. + * debian/patches/02_xml_comments.patch: removed, fixed upstream. + + -- Jordi Mallach Tue, 28 Mar 2006 00:08:23 +0200 + +libxklavier (2.1-1) unstable; urgency=low + + * Add myself to uploaders. + * GNOME XKB errors appear to be solved in this version (closes: #305987). + * Re-add lost diff from 2.0-1. That was bad timing. :) + * Move xorg.xml comments and linking patches to debian/patches, + add simple-patchsys rules accordingly. + * Conflict with libxklavier8, as it also shipped xfree86.xml + (closes: #348997). + * Update Standards-Version to 2.6.2.1, no changes required. + + -- Jordi Mallach Thu, 9 Feb 2006 21:32:44 +0100 + +libxklavier (2.1-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + * Drop all patches, applied upstream. + + -- Jordi Mallach Fri, 20 Jan 2006 12:34:16 +0100 + +libxklavier (2.0-1) unstable; urgency=low + + * Acknowledge NMUs. (Closes: #285606, #314271, #346245) + * Don't get confused by xorg.xml comments, patch by Sam Morris. + (Closes: #336791) + * Remove xlibs-dev references from builddeps. + + -- Filip Van Raemdonck Tue, 24 Jan 2006 21:24:41 +0100 + +libxklavier (2.0-0.3) unstable; urgency=low + + * NMU. + * Apply patch from Andreas Jochens to fix failure to build with gcc-4.0. + Closes: #314271. + * Drop bogus Build-Depends on xlibs. + + -- Daniel Schepler Fri, 6 Jan 2006 16:50:25 +0100 + +libxklavier (2.0-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Upload to unstable. + * This version fixes a crash due to an invalid pointer return + (closes: #285606). + + -- Jordi Mallach Thu, 9 Jun 2005 23:24:56 +0200 + +libxklavier (2.0-0.1) experimental; urgency=low + + * Non-maintainer upload. + * New upstream release. + * debian/rules: update doc directory. + + -- Jordi Mallach Fri, 29 Apr 2005 05:39:11 +0200 + +libxklavier (1.14-0.2) experimental; urgency=low + + * Oops. soname bump. + + -- Arnaud Patard Mon, 18 Apr 2005 21:58:37 +0200 + +libxklavier (1.14-0.1) experimental; urgency=low + + * New upstream release, needed by GNOME 2.10. + - fixes an invalid pointer return (closes: #285606). + + -- Arnaud Patard Sun, 10 Apr 2005 16:03:16 +0200 + +libxklavier (1.03-1) unstable; urgency=medium + + * New upstream version. + * Explicitly link -lX11. (Closes: #262028) + + -- Filip Van Raemdonck Tue, 03 Aug 2004 21:03:06 +0200 + +libxklavier (1.02-1) unstable; urgency=low + + * New upstream version. + * Acknowledge NMUs. (Closes: #240121, #240467) + + -- Filip Van Raemdonck Fri, 16 Apr 2004 15:45:57 +0200 + +libxklavier (1.00-1.1) experimental; urgency=low + + * NMU to fix Build-Depends from first one (Closes: #240467). + + -- Sebastien Bacher Sun, 28 Mar 2004 03:12:06 +0200 + +libxklavier (1.00-1) experimental; urgency=low + + * NMU with maintainer approval (Closes: #240121). + - new upstream release needed for gnome-control-center 2.6. + * debian/control: + - changed name from libxklavier7 to libxklavier8 due to soname change. + - Build-Depends on libx11-dev and on xlibs instead of xlibs-dev. + * debian/rules: + - added --enable-doxygen for html doc. + + -- Sebastien Bacher Fri, 26 Mar 2004 20:03:46 +0100 + +libxklavier (0.96-1) unstable; urgency=medium + + * New upstream version. + * Rerun autogen to fix FTBFS on arm. (Closes: #227528) + + -- Filip Van Raemdonck Thu, 15 Jan 2004 18:56:08 +0100 + +libxklavier (0.95-1) unstable; urgency=low + + * Initial upload. + + -- Filip Van Raemdonck Sat, 15 Nov 2003 18:35:31 +0100 + --- libxklavier-3.6.orig/debian/libxklavier12-dev.install +++ libxklavier-3.6/debian/libxklavier12-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/ +debian/tmp/usr/lib/libxklavier.so +debian/tmp/usr/lib/libxklavier*a +debian/tmp/usr/lib/pkgconfig/ +debian/tmp/usr/share/gtk-doc/ --- libxklavier-3.6.orig/debian/copyright +++ libxklavier-3.6/debian/copyright @@ -0,0 +1,33 @@ +This package was created by Filip Van Raemdonck +on Sat, 15 Nov 2003 18:35:31 +0100. + +It was downloaded from http://www.freedesktop.org/wiki/Software/LibXklavier + +Upstream author: Sergey V. Udaltsov + +Copyright: + +libxklavier is Copyright © 2003, 2004, 2005, 2006 Sergey V. Udaltsov + +License: + +The libxklavier library can be freely distributed under the terms of the +Lesser GNU General Public Licence. + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library 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 Lesser General Public License + for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. + +On your Debian system, a copy of the Lesser GNU General Public License +can be found in /usr/share/common-licenses/LGPL. --- libxklavier-3.6.orig/debian/compat +++ libxklavier-3.6/debian/compat @@ -0,0 +1 @@ +5 --- libxklavier-3.6.orig/debian/libxklavier12.install +++ libxklavier-3.6/debian/libxklavier12.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libxklavier.so.* --- libxklavier-3.6.orig/debian/patches/10_realloc-layout-names.patch +++ libxklavier-3.6/debian/patches/10_realloc-layout-names.patch @@ -0,0 +1,19 @@ +Adapted from + +diff -Nur libxklavier-3.1/libxklavier/xklavier_props.c libxklavier-3.1.new/libxklavier/xklavier_props.c +--- libxklavier-3.1/libxklavier/xklavier_props.c 2006-10-15 23:39:18.000000000 +0200 ++++ libxklavier-3.1.new/libxklavier/xklavier_props.c 2007-02-22 20:46:52.000000000 +0100 +@@ -374,10 +374,9 @@ + --varlen); + var[varlen] = '\0'; + /* Resize the original layout */ +- ((char *) +- g_realloc(*layout, +- laylen + 1))[laylen] = +- '\0'; ++ *layout = g_realloc(*layout, ++ laylen + 1); ++ ((char *)*layout)[laylen] = '\0'; + } + } + layout++;