diff -Nru python-xklavier-0.4/debian/changelog python-xklavier-0.4/debian/changelog --- python-xklavier-0.4/debian/changelog 2011-12-31 02:13:04.000000000 +0000 +++ python-xklavier-0.4/debian/changelog 2012-03-15 14:18:05.000000000 +0000 @@ -1,8 +1,51 @@ -python-xklavier (0.4-2build1) precise; urgency=low +python-xklavier (0.4-4) unstable; urgency=low - * Rebuild to drop python2.6 dependencies. + * Sort and newline-delimit uploaders. + * Declare build-dependencies in rules file. + * Fix article in short description: an X (not a X). + * Newline-delimit binary dependencies. + * Drop DM-Upload-Allowed field: No longer needed. + * Add Vcs-* fields for git maintenance at Alioth. + * Update package relations: + + Build-depend unversioned on libgtk2.0-dev and python-gobject-dev: + Needed versions satisfied even in oldstable. + + Depend unversioned (not python-depend versioned) on + python-gobject: Needed version satisfied even in oldstable, and + apparently python-depends is ignored with python2 install helper. + + Build-depend on pkg-config: Needed by upstream build (and pulled + in by other dependendencies, but we must not rely on that). + + Tighten build-dependency on cdbs: Needed for python2 helper. + + Relax build-depend unversioned on debhelper and devscripts: Needed + versions satisfied even in oldstable. + * Drop obsolete pycompat file. + * Install example files as such (not just as docs, although result + possible is the same). + * Update copyright file: + + Fix double-indent in Copyright fields as per Policy ยง5.6.13. + + Quote license strings and include license version in comments. + + Include disclaimer in license paragraph GAP~Makefile.in. + + Fix turn second paragraph into a proper format 1.0 catch-all Files + paragraph. + * Fix typo in past changelog entry. + Thanks to lintian. + + -- Jonas Smedegaard Thu, 15 Mar 2012 15:18:04 +0100 + +python-xklavier (0.4-3) unstable; urgency=low + + * Import examples to include in package. (Closes: #633260) + * Bump standards version, no changes needed. + * Update copyright file for standard. + * Acknowledge NMU. - -- Matthias Klose Sat, 31 Dec 2011 02:13:04 +0000 + -- Luke Faraone Sun, 11 Mar 2012 00:48:34 -0500 + +python-xklavier (0.4-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove unneeded .la files (Closes: #633260). + + -- Aron Xu Mon, 05 Mar 2012 00:48:04 +0800 python-xklavier (0.4-2) unstable; urgency=low diff -Nru python-xklavier-0.4/debian/control python-xklavier-0.4/debian/control --- python-xklavier-0.4/debian/control 2011-04-24 01:24:08.000000000 +0000 +++ python-xklavier-0.4/debian/control 2012-03-15 14:03:56.000000000 +0000 @@ -2,24 +2,32 @@ Section: python Priority: optional Maintainer: Debian OLPC -Uploaders: Luke Faraone , Jonas Smedegaard -DM-Upload-Allowed: yes +Uploaders: Jonas Smedegaard , + Luke Faraone Build-Depends: autotools-dev, - debhelper (>= 7.0.1), + debhelper, dh-buildinfo, python (>= 2.6.5), - cdbs (>= 0.4.90~), + cdbs (>= 0.4.97~), python-all-dev, - devscripts (>= 2.10.7~), libgtk2.0-dev (>= 2.2.0), libxklavier-dev (>= 5.0), python-gobject-dev (>= 2.6.2) -Standards-Version: 3.9.2 + devscripts, + libgtk2.0-dev, + libxklavier-dev (>= 5.0), + python-gobject-dev, + pkg-config +Standards-Version: 3.9.3 +Vcs-Git: git://git.debian.org/git/collab-maint/python-xklavier +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/python-xklavier.git Homepage: http://devel.randomink.org/projects/python-xklavier Package: python-xklavier Architecture: any -Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends} -Python-Depends: python-gobject (>= 2.6.2) +Depends: ${python:Depends}, + ${cdbs:Depends}, + ${misc:Depends}, + ${shlibs:Depends} Provides: ${python:Provides} -Description: Python binding for libxklavier, a X Keyboard Extension API +Description: Python binding for libxklavier, an X Keyboard Extension API Libxklavier provides programmers an API for high(er) level access to the X Keyboard Extension, to ease creating XKB related applications. . diff -Nru python-xklavier-0.4/debian/control.in python-xklavier-0.4/debian/control.in --- python-xklavier-0.4/debian/control.in 2011-04-24 00:54:24.000000000 +0000 +++ python-xklavier-0.4/debian/control.in 2012-03-15 13:24:33.000000000 +0000 @@ -2,18 +2,22 @@ Section: python Priority: optional Maintainer: Debian OLPC -Uploaders: Luke Faraone , Jonas Smedegaard -DM-Upload-Allowed: yes -Build-Depends: @cdbs@, libgtk2.0-dev (>= 2.2.0), libxklavier-dev (>= 5.0), python-gobject-dev (>= 2.6.2) -Standards-Version: 3.9.2 +Uploaders: Jonas Smedegaard , + Luke Faraone +Build-Depends: @cdbs@ +Standards-Version: 3.9.3 +Vcs-Git: git://git.debian.org/git/collab-maint/python-xklavier +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/python-xklavier.git Homepage: http://devel.randomink.org/projects/python-xklavier Package: python-xklavier Architecture: any -Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends} -Python-Depends: python-gobject (>= 2.6.2) +Depends: ${python:Depends}, + ${cdbs:Depends}, + ${misc:Depends}, + ${shlibs:Depends} Provides: ${python:Provides} -Description: Python binding for libxklavier, a X Keyboard Extension API +Description: Python binding for libxklavier, an X Keyboard Extension API Libxklavier provides programmers an API for high(er) level access to the X Keyboard Extension, to ease creating XKB related applications. . diff -Nru python-xklavier-0.4/debian/copyright python-xklavier-0.4/debian/copyright --- python-xklavier-0.4/debian/copyright 2011-04-24 00:52:55.000000000 +0000 +++ python-xklavier-0.4/debian/copyright 2012-03-15 13:46:33.000000000 +0000 @@ -1,8 +1,9 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: python-xklavier Upstream-Contact: Sayamindu Dasgupta Source: http://devel.randomink.org/projects/python-xklavier +Files: * Copyright: 2009, Sayamindu Dasgupta License: LGPL-2.1+ @@ -20,7 +21,7 @@ depcomp missing Copyright: 1992-2009, Free Software Foundation, Inc. - 2004, Scott James Remnant + 2004, Scott James Remnant License: GPL-2+ with Autoconf exception As a special exception to the GNU General Public License, if you distribute this file as part of a program that contains a configuration @@ -34,7 +35,7 @@ Files: configure Copyright: 1992-2009, Free Software Foundation, Inc. - 2009 Sayamindu Dasgupta + 2009 Sayamindu Dasgupta License: GAP~configure Files: ltmain.sh @@ -55,7 +56,7 @@ Files: debian/* Copyright: 2009, Aleksey Lim - 2010, Luke Faraone + 2010, 2012, Luke Faraone License: LGPL-2.1+ License: LGPL-2.1+ @@ -69,11 +70,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. Comment: - On Debian systems the GNU Lesser General Public License is located in - '/usr/share/commmon-licenses/LGPL-2.1'. + On Debian systems the 'GNU Lesser General Public License' version 2.1 + is located in '/usr/share/commmon-licenses/LGPL-2.1'. . - You should have received a copy of the GNU Lesser General Public - License along with this program. If not, see + You should have received a copy of the 'GNU Lesser General Public + License' along with this program. If not, see . License: GPL-2+ @@ -87,16 +88,21 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. Comment: - On Debian systems the GNU General Public License version 2 is located + On Debian systems the 'GNU General Public License' version 2 is located in '/usr/share/common-licenses/GPL-2'. . - You should have received a copy of the GNU General Public License along - with this program. If not, see . + You should have received a copy of the 'GNU General Public License' + along with this program. If not, see . License: GAP~Makefile.in 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. License: GAP~configure This configure script is free software; the Free Software Foundation diff -Nru python-xklavier-0.4/debian/copyright_hints python-xklavier-0.4/debian/copyright_hints --- python-xklavier-0.4/debian/copyright_hints 2011-04-24 00:28:07.000000000 +0000 +++ python-xklavier-0.4/debian/copyright_hints 2012-03-15 13:58:59.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: FIXME Upstream-Contact: FIXME Source: FIXME @@ -15,8 +15,13 @@ debian/control debian/control.in debian/gbp.conf - debian/pycompat debian/rules + debian/samples/get_country_variants.py + debian/samples/get_current_config.py + debian/samples/get_language_variants.py + debian/samples/get_layout_variants.py + debian/samples/get_models.py + debian/samples/get_options.py debian/source/format debian/watch m4/python.m4 @@ -26,72 +31,69 @@ License: UNKNOWN FIXME +Files: config.guess + config.sub + missing +Copyright: 1992-1999, + 1992-2001 + 1996-1997, 1999-2000, 2002-2006 +License: GPL-2+ + FIXME + Files: INSTALL Makefile.in xklavier/Makefile.in Copyright: 1994-1996, 1999-2002, 2004-2005 - 1994-2002 + 1994-2002 License: UNKNOWN FIXME -Files: config.guess - config.sub -Copyright: 1992-1999, - 1992-2001 -License: GPL-2+ - FIXME - Files: xklavier/xklavier.override xklavier/xklaviermodule.c Copyright: 2009, One Laptop Per Child Association Inc License: LGPL-2.1+ FIXME -Files: missing -Copyright: 1996-1997, 1999-2000, 2002-2006 -License: GPL - FIXME - -Files: depcomp -Copyright: 1999-2000, 2003-2007, 2009 Free -License: GPL - FIXME - Files: configure Copyright: (ISLOWER ? 'A' + ( - 'a') : ) - (ISLOWER ? ( | 0x40) : ) - 1992-1996, 1998-2001, - 1996-2001, 2003-2005 - 2009, Free Software Foundation, Inc - 2009, Sayamindu Dasgupta + (ISLOWER ? ( | 0x40) : ) + 1992-1996, 1998-2001, + 1996-2001, 2003-2005 + 2009, Free Software Foundation, Inc + 2009, Sayamindu Dasgupta License: GPL-2+ FIXME Files: aclocal.m4 Copyright: 1996, 1998, 2000-2005, 2008 - 1996-1997, 2000-2001, 2003, 2005, - 1996-1997, 2000-2001, 2003, 2005, 2008 - 1996-2001, 2003-2005 - 1996-2004, - 1997, 1999-2001, 2003-2005, 2008 - 1997, 2000-2001, 2003-2006, 2008 - 1999-2005, 2008 - 1999-2005, 2008-2009, - 1999-2006, 2009 - 2001, 2003, 2005, 2008 Free Software Foundation, Inc - 2001, 2003, 2005, Free Software Foundation, Inc - 2001-2003, 2005, 2008, Free Software Foundation, Inc - 2001-2003, 2005, 2009, Free Software Foundation, Inc - 2002-2003, 2005-2008, Free Software Foundation, Inc - 2003, 2005 Free Software Foundation, Inc - 2003-2006, Free Software Foundation, Inc - 2004, Free Software Foundation, Inc - 2004, Scott James Remnant - 2004-2005, 2007 Free Software Foundation, Inc - 2004-2005, 2007-2008, Free Software Foundation, Inc - 2004-2005, Free Software Foundation, Inc - 2006, 2008 Free Software Foundation, Inc - 2008, Free Software Foundation, Inc + 1996-1997, 2000-2001, 2003, 2005, + 1996-1997, 2000-2001, 2003, 2005, 2008 + 1996-2001, 2003-2005 + 1996-2004, + 1997, 1999-2001, 2003-2005, 2008 + 1997, 2000-2001, 2003-2006, 2008 + 1999-2005, 2008 + 1999-2005, 2008-2009, + 1999-2006, 2009 + 2001, 2003, 2005, 2008 Free Software Foundation, Inc + 2001, 2003, 2005, Free Software Foundation, Inc + 2001-2003, 2005, 2008, Free Software Foundation, Inc + 2001-2003, 2005, 2009, Free Software Foundation, Inc + 2002-2003, 2005-2008, Free Software Foundation, Inc + 2003, 2005 Free Software Foundation, Inc + 2003-2006, Free Software Foundation, Inc + 2004, Free Software Foundation, Inc + 2004, Scott James Remnant + 2004-2005, 2007 Free Software Foundation, Inc + 2004-2005, 2007-2008, Free Software Foundation, Inc + 2004-2005, Free Software Foundation, Inc + 2006, 2008 Free Software Foundation, Inc + 2008, Free Software Foundation, Inc +License: GPL-2+ + FIXME + +Files: depcomp +Copyright: 1999-2000, 2003-2007, 2009 Free License: GPL-2+ FIXME @@ -102,16 +104,16 @@ Files: COPYING Copyright: 1991, 1999 Free Software Foundation, Inc - - HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - HOLDERS AND/OR - disclaimer" for the library, if - holder or - holder who places the Library under this License may add - interest in the - law: that is to say, a work containing the Library or a - notices, you must include the - the + + HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY + HOLDERS AND/OR + disclaimer" for the library, if + holder or + holder who places the Library under this License may add + interest in the + law: that is to say, a work containing the Library or a + notices, you must include the + the License: LGPL-2.1+ FIXME diff -Nru python-xklavier-0.4/debian/pycompat python-xklavier-0.4/debian/pycompat --- python-xklavier-0.4/debian/pycompat 2010-08-22 20:02:20.000000000 +0000 +++ python-xklavier-0.4/debian/pycompat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2 diff -Nru python-xklavier-0.4/debian/rules python-xklavier-0.4/debian/rules --- python-xklavier-0.4/debian/rules 2011-04-24 00:27:18.000000000 +0000 +++ python-xklavier-0.4/debian/rules 2012-03-15 14:06:53.000000000 +0000 @@ -6,6 +6,14 @@ include /usr/share/cdbs/1/class/python-autotools.mk include /usr/share/cdbs/1/rules/utils.mk +binary-install/python-xklavier:: + find . -name *.la -delete + # TODO: adjust URL for each upstream release (weird upstream URL scheme!) DEB_UPSTREAM_URL = http://devel.randomink.org/attachments/download/6 DEB_UPSTREAM_TARBALL_MD5 = 25c922c12bff8eb03de56e1cf914b1f4 + +CDBS_BUILD_DEPENDS += , libgtk2.0-dev, libxklavier-dev (>= 5.0), python-gobject-dev, pkg-config +CDBS_DEPENDS_DEFAULT += , python-gobject + +DEB_INSTALL_EXAMPLES_DEFAULT += debian/samples/* diff -Nru python-xklavier-0.4/debian/samples/get_country_variants.py python-xklavier-0.4/debian/samples/get_country_variants.py --- python-xklavier-0.4/debian/samples/get_country_variants.py 1970-01-01 00:00:00.000000000 +0000 +++ python-xklavier-0.4/debian/samples/get_country_variants.py 2012-03-15 12:22:24.000000000 +0000 @@ -0,0 +1,25 @@ +#!/usr/bin/env python +# +# I, Sayamindu Dasgupta