r10131 - in /desktop/unstable/libxklavier/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed Apr 18 15:19:02 UTC 2007
Author: slomo
Date: Wed Apr 18 15:19:02 2007
New Revision: 10131
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10131
Log:
* Import experimental branch
* Upload to unstable, remove check-dist include.
Added:
desktop/unstable/libxklavier/debian/libxklavier11-dev.install
desktop/unstable/libxklavier/debian/libxklavier11.install
desktop/unstable/libxklavier/debian/watch
Removed:
desktop/unstable/libxklavier/debian/libxklavier-dev.install
desktop/unstable/libxklavier/debian/libxklavier10.install
desktop/unstable/libxklavier/debian/patches/01_xorg_xkb_path.patch
desktop/unstable/libxklavier/debian/patches/02_xklconfigfindobject-crashes-when-no-nodes-are-found.patch
Modified:
desktop/unstable/libxklavier/debian/changelog
desktop/unstable/libxklavier/debian/compat
desktop/unstable/libxklavier/debian/control
desktop/unstable/libxklavier/debian/control.in
desktop/unstable/libxklavier/debian/copyright
desktop/unstable/libxklavier/debian/patches/10_realloc-layout-names.patch
desktop/unstable/libxklavier/debian/rules
Modified: desktop/unstable/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/changelog?rev=10131&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/changelog (original)
+++ desktop/unstable/libxklavier/debian/changelog Wed Apr 18 15:19:02 2007
@@ -1,10 +1,90 @@
-libxklavier (2.2-5) unstable; urgency=high
-
+libxklavier (3.2-2) unstable; urgency=low
+
+ * Upload to unstable, remove check-dist include.
+
+ -- Sebastian Dröge <slomo at debian.org> 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.
- -- Loic Minier <lool at dooz.org> Thu, 22 Feb 2007 21:12:59 +0100
+ [ 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 <slomo at debian.org> 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 <joss at debian.org> 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 <joss at debian.org> 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 <lool at dooz.org> 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 <lool at dooz.org> Fri, 6 Oct 2006 14:57:30 +0200
libxklavier (2.2-4) unstable; urgency=low
Modified: desktop/unstable/libxklavier/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/compat?rev=10131&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/compat (original)
+++ desktop/unstable/libxklavier/debian/compat Wed Apr 18 15:19:02 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: desktop/unstable/libxklavier/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/control?rev=10131&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/control (original)
+++ desktop/unstable/libxklavier/debian/control Wed Apr 18 15:19:02 2007
@@ -2,23 +2,24 @@
Priority: optional
Section: libs
Maintainer: Filip Van Raemdonck <mechanix at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs, debhelper (>> 4), doxygen, libxml2-dev, pkg-config, libxkbfile-dev, libxt-dev, gnome-pkg-tools
-Standards-Version: 3.6.2.2
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+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.10)
+Standards-Version: 3.7.2
-Package: libxklavier10
+Package: libxklavier11
Architecture: any
-Depends: ${shlibs:Depends}, xkb-data (>= 0.8) | xkb-data-legacy, xbase-clients
-Replaces: libxklavier7, libxklavier8
+Depends: ${misc:Depends}, ${shlibs:Depends}, xkb-data (>= 0.8) | xkb-data-legacy, xbase-clients
+Replaces: libxklavier7, libxklavier8, libxklavier10
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.
-Package: libxklavier-dev
+Package: libxklavier11-dev
Section: libdevel
Architecture: any
-Depends: libxklavier10, libxml2-dev
+Depends: ${misc:Depends}, ${shlibs:Depends}, libxklavier11 (= ${Source-Version}), libglib2.0-dev (>= 2.6.0), libxml2-dev (>= 2.0.0)
+Replaces: libxklavier-dev
+Conflicts: libxklavier-dev
Description: Development files for libxklavier
These are headers and other files needed to develop with libxklavier.
-
Modified: desktop/unstable/libxklavier/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/control.in?rev=10131&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/control.in (original)
+++ desktop/unstable/libxklavier/debian/control.in Wed Apr 18 15:19:02 2007
@@ -3,22 +3,23 @@
Section: libs
Maintainer: Filip Van Raemdonck <mechanix at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, debhelper (>> 4), doxygen, libxml2-dev, pkg-config, libxkbfile-dev, libxt-dev, gnome-pkg-tools
-Standards-Version: 3.6.2.2
+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.10)
+Standards-Version: 3.7.2
-Package: libxklavier10
+Package: libxklavier11
Architecture: any
-Depends: ${shlibs:Depends}, xkb-data (>= 0.8) | xkb-data-legacy, xbase-clients
-Replaces: libxklavier7, libxklavier8
+Depends: ${misc:Depends}, ${shlibs:Depends}, xkb-data (>= 0.8) | xkb-data-legacy, xbase-clients
+Replaces: libxklavier7, libxklavier8, libxklavier10
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.
-Package: libxklavier-dev
+Package: libxklavier11-dev
Section: libdevel
Architecture: any
-Depends: libxklavier10, libxml2-dev
+Depends: ${misc:Depends}, ${shlibs:Depends}, libxklavier11 (= ${Source-Version}), libglib2.0-dev (>= 2.6.0), libxml2-dev (>= 2.0.0)
+Replaces: libxklavier-dev
+Conflicts: libxklavier-dev
Description: Development files for libxklavier
These are headers and other files needed to develop with libxklavier.
-
Modified: desktop/unstable/libxklavier/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/copyright?rev=10131&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/copyright (original)
+++ desktop/unstable/libxklavier/debian/copyright Wed Apr 18 15:19:02 2007
@@ -1,11 +1,33 @@
-This package was created by Filip Van Raemdonck <mechanix at debian.org> from
-sources obtained through http://gswitchit.sourceforge.net/
+This package was created by Filip Van Raemdonck <mechanix at debian.org>
+on Sat, 15 Nov 2003 18:35:31 +0100.
-Upstream Author: Sergey V. Udaltsov <svu at users.sourceforge.net>
+It was downloaded from http://www.freedesktop.org/wiki/Software/LibXklavier
+
+Upstream author: Sergey V. Udaltsov <svu at users.sourceforge.net>
Copyright:
-Libxklavier can be freely distributed under the terms of the GNU General
-Public License.
-On your Debian system, a copy of the GNU General Public License can be
-found in /usr/share/common-licenses/GPL.
+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.
Added: desktop/unstable/libxklavier/debian/libxklavier11-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/libxklavier11-dev.install?rev=10131&op=file
==============================================================================
--- desktop/unstable/libxklavier/debian/libxklavier11-dev.install (added)
+++ desktop/unstable/libxklavier/debian/libxklavier11-dev.install Wed Apr 18 15:19:02 2007
@@ -1,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/
Added: desktop/unstable/libxklavier/debian/libxklavier11.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/libxklavier11.install?rev=10131&op=file
==============================================================================
--- desktop/unstable/libxklavier/debian/libxklavier11.install (added)
+++ desktop/unstable/libxklavier/debian/libxklavier11.install Wed Apr 18 15:19:02 2007
@@ -1,0 +1,2 @@
+debian/tmp/usr/lib/libxklavier.so.*
+debian/tmp/usr/share/libxklavier/
Modified: desktop/unstable/libxklavier/debian/patches/10_realloc-layout-names.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/patches/10_realloc-layout-names.patch?rev=10131&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/patches/10_realloc-layout-names.patch (original)
+++ desktop/unstable/libxklavier/debian/patches/10_realloc-layout-names.patch Wed Apr 18 15:19:02 2007
@@ -1,15 +1,19 @@
-Adapted from SourceForge #1463839; <http://sourceforge.net/tracker/index.php?func=detail&aid=1463839&group_id=319&atid=300319>
+Adapted from <http://sourceforge.net/tracker/index.php?func=detail&aid=1463839&group_id=319&atid=300319>
-diff -Nur libxklavier-2.2/libxklavier/xklavier_props.c libxklavier-2.2.new/libxklavier/xklavier_props.c
---- libxklavier-2.2/libxklavier/xklavier_props.c 2006-02-14 02:09:16.000000000 +0100
-+++ libxklavier-2.2.new/libxklavier/xklavier_props.c 2007-02-22 21:12:27.000000000 +0100
-@@ -319,7 +319,8 @@
- memcpy( var, varstart + 1, --varlen );
- var[varlen] = '\0';
-
-- ( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0';
-+ *theLayout = realloc (*theLayout, laylen + 1);
-+ (*theLayout)[laylen] = '\0';
- }
- }
- }
+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++;
Modified: desktop/unstable/libxklavier/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/rules?rev=10131&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/rules (original)
+++ desktop/unstable/libxklavier/debian/rules Wed Apr 18 15:19:02 2007
@@ -2,16 +2,17 @@
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/gnome-get-source.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 \
- --enable-doxygen
+ --with-xkb-bin-base=/usr/bin
+# upstream bug
clean::
- -make -C doc/html maintainer-clean
-
-binary-post-install/libxklavier-dev::
- mv debian/libxklavier-dev/usr/share/doc/libxklavier-2.2/html/ debian/libxklavier-dev/usr/share/doc/libxklavier-dev/
- rm -r debian/libxklavier-dev/usr/share/doc/libxklavier-2.2/
+ rm -f libxklavier.spec
Added: desktop/unstable/libxklavier/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/watch?rev=10131&op=file
==============================================================================
--- desktop/unstable/libxklavier/debian/watch (added)
+++ desktop/unstable/libxklavier/debian/watch Wed Apr 18 15:19:02 2007
@@ -1,0 +1,3 @@
+version=3
+http://prdownloads.sourceforge.net/gswitchit/libxklavier-(.*)\.tar\.gz \
+ debian uupdate
More information about the pkg-gnome-commits
mailing list