--- kiwi-1.9.22.orig/debian/bzr-builder.manifest +++ kiwi-1.9.22/debian/bzr-builder.manifest @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debupstream}-0~18 +lp:ubuntu/trusty/kiwi revid:james.westby@ubuntu.com-20100305192242-mmiisaeal7zkw2gr --- kiwi-1.9.22.orig/debian/changelog +++ kiwi-1.9.22/debian/changelog @@ -1,112 +1,145 @@ -kiwi (1.9.22) intrepid; urgency=low +kiwi (1.9.22-0~18~ubuntu14.04.1) trusty; urgency=low - * New Release + * Auto build. - -- George Y. Kussumoto Thu, 29 May 2008 14:44:01 -0300 + -- Norbert Mon, 04 May 2020 18:31:28 +0000 -kiwi (1.9.21) gutsy; urgency=low +kiwi (1.9.22-2) unstable; urgency=low - * Non maintainer upload - * New Release - - -- George Y. Kussumoto Fri, 14 Mar 2008 14:52:14 -0300 - -kiwi (1.9.20) gutsy; urgency=low - - * New release - - -- Fabio Morbec Thu, 31 Jan 2008 11:37:12 -0300 - -kiwi (1.9.19) gutsy; urgency=low + [ Sandro Tosi ] + * debian/control + - switch Vcs-Browser field to viewsvn + - bump python-pydoctor to requre >= 0.2-4.1, this version is needed to build + kiwi with Python 2.6 as default; thanks to Jakub Wilk for the report; + Closes: #571492 + - replace b-d-i on python-all-dev with python-all, since building arch:all + - added misc:Depends to binary package Depends + * debian/python-kiwi.doc-base.api + - set section to Programming/Python + * debian/compat + - set compat version to 5 + * debian/preinst + - 'set -e' explicitly + + -- Debian Python Modules Team Fri, 05 Mar 2010 19:22:42 +0100 + +kiwi (1.9.22-1) unstable; urgency=low + + * New upstream release + * debian/patches/03_fix_gazpacholoader.diff: removed patch + applied upstream. + * debian/control: + - removed unneeded -1 from some build-depency versions + - removed build-dependency on xbase-clients - * New release + -- Goedson Teixeira Paixao Mon, 07 Jul 2008 17:12:00 -0300 - -- Fabio Morbec Thu, 06 Nov 2007 09:22:12 -0300 +kiwi (1.9.21-1) unstable; urgency=low -kiwi (1.9.18) feisty; urgency=low + [ Sandro Tosi ] + * debian/control + - uniforming Vcs-Browser field - * New release + [ Goedson Teixeira Paixao ] + * New upstream release + * debian/control: depend on python-pkg-resources instead of + python-setuptools (Closes: #468717). - -- Fabio Morbec Thu, 11 Sep 2007 11:13:12 -0300 + -- Goedson Teixeira Paixao Mon, 07 Apr 2008 10:17:44 -0300 -kiwi (1.9.17-2) feisty; urgency=low +kiwi (1.9.19-2) unstable; urgency=low - * Fix in ObjectList + * debian/rules: Move API documentation from /usr/share/doc/kiwi to + /usr/share/doc/python-kiwi + * debian/python-kiwi.doc-base.api: Fix path of index file. + * debian/dirs: Added /usr/share/doc/python-kiwi - -- Fabio Morbec Thu, 30 Aug 2007 21:55:04 -0300 + -- Goedson Teixeira Paixao Tue, 13 Nov 2007 11:26:32 -0200 -kiwi (1.9.17-1) feisty; urgency=low +kiwi (1.9.19-1) unstable; urgency=low - - Gazpacho: - - Add gazpacho support for a scale widgets too. - - ObjectList: - - Remove the cache property. - - Refactor column and renderer handling to the Column. - - Add basic DND support. - - Call format_func before checking the format and the datatype. - - Add ellipsize and font-desc properties. - - Handle list without selection. - - Add a font-desc parameter to ListLabel/SummaryLabel. - - Prefill::Handle duplicate entries by adding (n) to the end of the name - - Dialogs: New function based around gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER. - (Based on patch by Paul Eipper (#3490)) + [ Piotr Ożarowski ] + [ Piotr Ozarowski ] + * Homepage field added + * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now) - -- Fabio Morbec Mon, 29 Aug 2007 19:21:57 -0300 + [ Goedson Teixeira Paixao ] + * New upstream release. + * debian/rules: rebuild documentation. + * debian/control: added python-pydoctor to Build-Depends-Indep + * debian/patches/02_disable_pydoctor.diff: Added empty patch to override + unneded patch present in upstream tarball. + * debian/patches/03_fix_gazpacholoader.diff: Fix upstream bug #3586. Thanks + Brad Crittenden for the patch. -kiwi (1.9.16-1) feisty; urgency=low + -- Goedson Teixeira Paixao Mon, 12 Nov 2007 20:35:41 -0200 - * New release +kiwi (1.9.16-1) unstable; urgency=low - -- Johan Dahlin Mon, 16 Jul 2007 11:01:57 -0300 + * New upstream release. -kiwi (1.9.15-6) feisty; urgency=low + -- Goedson Teixeira Paixao Wed, 18 Jul 2007 15:21:32 -0300 - * New package with a few more bug fixes included +kiwi (1.9.15-1) unstable; urgency=low - -- Johan Dahlin Wed, 23 May 2007 13:26:29 -0300 + [ Piotr Ozarowski ] + * New python-support handles egg's directory name correctly + - bump python-support required version + - remove mv part from debian/rules -kiwi (1.9.15-5) feisty; urgency=low + [ Goedson Paixao ] + * New upstream release. + * New Maintainer (Closes: #414259) + * Added Python Modules Team to Uploaders. + * debian/patches/04_avoid_building_helper_module.diff: + - updated + * debian/patches/02_avoid_version_checking.diff: + - updated + * debian/patches/03_epyrun_use_local_modules.diff: + - removed since it's not needed anymore + * Updated the watch file + * Do not rebuild the api documentation since it uses + pydoctor for this + * debian/control: + - Removed obsolete XS-Python-Version and XB-Python-Version fields - * Save the prefix from the module and use it to find the - externals when we're in uninstalled mode. + -- Goedson Teixeira Paixao Wed, 30 May 2007 16:10:21 -0300 - -- Johan Dahlin Tue, 22 May 2007 16:25:06 -0300 +kiwi (1.9.13-4) unstable; urgency=medium -kiwi (1.9.15-4) feisty; urgency=low + * QA upload. + * debian/rules: Renaming .egg-info is no longer necessary. + Closes: #423975. - * Redo for feisty + -- Matej Vela Tue, 15 May 2007 10:41:47 +0200 - -- Johan Dahlin Tue, 22 May 2007 09:49:28 -0300 +kiwi (1.9.13-3) unstable; urgency=medium -kiwi (1.9.13-0ubuntu1) feisty; urgency=low + * QA upload. + * Remove duplicate docs from /usr/share/doc/kiwi. Closes: #419166. + * Remove Uploaders. - * New upstream release: - - Workaround GtkEntry bug when resizing the size of its GtkWindows. - - Include _kiwi.c in tarball, fixes build. - - Use pkg-config to find pygtk version. - * debian/control: - - added pkg-config to Build-Depends. - * debian/patches/02_avoid_version_checking.diff: - - updated. + -- Matej Vela Sat, 14 Apr 2007 11:45:08 +0200 - -- Daniel Holbach Tue, 6 Feb 2007 09:42:28 +0100 +kiwi (1.9.13-2) unstable; urgency=low -kiwi (1.9.12-0ubuntu1) feisty; urgency=low + * Orphaning package. - * New upstream release. - * debian/patches/03_epyrun_use_local_modules.patch: - - updated. - * debian/control: - - moved python-support from Build-Depends to Build-Depends-Indep. + -- Gustavo Noronha Silva Sat, 3 Mar 2007 13:15:34 -0300 - -- Daniel Holbach Tue, 30 Jan 2007 09:52:28 +0100 +kiwi (1.9.13-1) unstable; urgency=low -kiwi (1.9.9-2ubuntu1) feisty; urgency=low + [ Piotr Ozarowski ] + * Added XS-Vcs-Svn field - * debian/control: - - Replaces: kiwi. + [ Gustavo Noronha ] + * New upstream release + * debian/patches/03_epyrun_use_local_modules.diff: + - updated + * debian/patches/04_avoid_building_helper_module.diff: + - added, to make the _kiwi arch-dependant module not be built - -- Daniel Holbach Wed, 20 Dec 2006 13:00:09 +0100 + -- Gustavo Noronha Silva Wed, 14 Feb 2007 23:40:38 -0200 kiwi (1.9.9-2) unstable; urgency=high --- kiwi-1.9.22.orig/debian/compat +++ kiwi-1.9.22/debian/compat @@ -1 +1 @@ -4 +5 --- kiwi-1.9.22.orig/debian/control +++ kiwi-1.9.22/debian/control @@ -1,18 +1,19 @@ Source: kiwi Section: python Priority: optional -Maintainer: George Y. Kussumoto -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-setuptools (>= 0.6b3-1), python-support (>= 0.3) -Build-Depends-Indep: python-all-dev (>= 2.3.5-10), python-glade2 (>= 2.8.6-1), python-gtk2 (>= 2.8.2-3.1), python-epydoc (>= 2.1-11), python-twisted-core (>= 2.4.0-1), xvfb, xbase-clients, xfonts-base, pkg-config -XS-Python-Version: >= 2.4 -Standards-Version: 3.7.3 +Maintainer: Goedson Teixeira Paixao +Uploaders: Debian Python Modules Team +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-setuptools (>= 0.6b3) +Build-Depends-Indep: python-all (>= 2.3.5-10), python-glade2 (>= 2.8.6), python-gtk2 (>= 2.8.2-3.1), python-support (>= 0.6.4), python-epydoc (>= 2.1-11), python-twisted-core (>= 2.4.0), xvfb, xfonts-base, python-pydoctor (>= 0.2-4.1) +Homepage: http://www.async.com.br/projects/kiwi/ +Vcs-Svn: svn://svn.debian.org/python-modules/packages/kiwi/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/kiwi/trunk/ +Standards-Version: 3.7.2 Package: python-kiwi Architecture: all -Depends: ${python:Depends}, python-gtk2 (>= 2.8.2-3.1), python-setuptools (>= 0.6b3-1) +Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.8.2-3.1), python-pkg-resources (>= 0.6b3) Enhances: gazpacho -Replaces: kiwi -XB-Python-Version: ${python:Versions} Description: a graphical framework to construct simple UI Kiwi is a framework and a set of enhanced PyGTK widgets designed to make building programs with graphical interfaces both easy to write @@ -25,5 +26,3 @@ access and display your object data. . Kiwi is inspired by Allen Holub's Visual Proxy. - . - Homepage: http://www.async.com.br/projects/kiwi/ --- kiwi-1.9.22.orig/debian/dirs +++ kiwi-1.9.22/debian/dirs @@ -0,0 +1 @@ +/usr/share/doc/python-kiwi --- kiwi-1.9.22.orig/debian/patches/02_avoid_version_checking.diff +++ kiwi-1.9.22/debian/patches/02_avoid_version_checking.diff @@ -0,0 +1,58 @@ +diff -ru kiwi-1.9.15.orig/bin/kiwi-i18n kiwi-1.9.15/bin/kiwi-i18n +--- kiwi-1.9.15.orig/bin/kiwi-i18n 2007-05-11 12:45:39.000000000 -0300 ++++ kiwi-1.9.15/bin/kiwi-i18n 2007-05-28 20:28:38.000000000 -0300 +@@ -20,7 +20,7 @@ + import sys + + # Required version of Python +-REQUIRED_VERSION = (2, 1) ++#REQUIRED_VERSION = (2, 1) + + # Directory name, defaults to name of binary, it is relative to .. + # a, __init__.py and main.py is expected to be found there. +@@ -33,11 +33,11 @@ + dirname = DIRNAME or os.path.split(sys.argv[0])[1] + appname = APPNAME or dirname.capitalize() + +-if sys.hexversion < int('%02x%02x0000' % REQUIRED_VERSION, 16): +- raise SystemExit("ERROR: Python %s or higher is required to run %s, " +- "%s found" % ('.'.join(map(str, REQUIRED_VERSION)), +- appname, +- sys.version.split()[0])) ++# if sys.hexversion < int('%02x%02x0000' % REQUIRED_VERSION, 16): ++# raise SystemExit("ERROR: Python %s or higher is required to run %s, " ++# "%s found" % ('.'.join(map(str, REQUIRED_VERSION)), ++# appname, ++# sys.version.split()[0])) + + # Figure out the directy which is the prefix + # path-of-current-file/.. +diff -ru kiwi-1.9.15.orig/bin/kiwi-ui-test kiwi-1.9.15/bin/kiwi-ui-test +--- kiwi-1.9.15.orig/bin/kiwi-ui-test 2007-03-02 17:08:12.000000000 -0300 ++++ kiwi-1.9.15/bin/kiwi-ui-test 2007-05-28 20:28:58.000000000 -0300 +@@ -20,7 +20,7 @@ + import sys + + # Required version of Python +-REQUIRED_VERSION = (2, 3) ++#REQUIRED_VERSION = (2, 3) + + # Directory name, defaults to name of binary, it is relative to .. + # a, __init__.py and main.py is expected to be found there. +@@ -33,11 +33,11 @@ + dirname = DIRNAME or os.path.split(sys.argv[0])[1] + appname = APPNAME or dirname.capitalize() + +-if sys.hexversion < int('%02x%02x0000' % REQUIRED_VERSION, 16): +- raise SystemExit("ERROR: Python %s or higher is required to run %s, " +- "%s found" % ('.'.join(map(str, REQUIRED_VERSION)), +- appname, +- sys.version.split(' ', 1)[0])) ++# if sys.hexversion < int('%02x%02x0000' % REQUIRED_VERSION, 16): ++# raise SystemExit("ERROR: Python %s or higher is required to run %s, " ++# "%s found" % ('.'.join(map(str, REQUIRED_VERSION)), ++# appname, ++# sys.version.split(' ', 1)[0])) + + # Figure out the directy which is the prefix + # path-of-current-file/.. --- kiwi-1.9.22.orig/debian/patches/02_disable_pydoctor.diff +++ kiwi-1.9.22/debian/patches/02_disable_pydoctor.diff @@ -1,14 +0,0 @@ -Index: doc/Makefile -=================================================================== ---- doc/Makefile (revisão 6595) -+++ doc/Makefile (cópia de trabalho) -@@ -46,8 +46,7 @@ - - api: - @echo Creating API documentation -- @cd .. && pydoctor --project-name="Kiwi" --add-package=kiwi --make-html -- @mv ../apidocs api -+ @mkdir api - - clean: - rm -rf api/ howto/ *.log *.aux *.l2h *.dvi *.ps *.bak *~ --- kiwi-1.9.22.orig/debian/patches/04_avoid_building_helper_module.diff +++ kiwi-1.9.22/debian/patches/04_avoid_building_helper_module.diff @@ -0,0 +1,12 @@ +diff -ur kiwi-1.9.15.orig/setup.py kiwi-1.9.15/setup.py +--- kiwi-1.9.15.orig/setup.py 2007-02-28 12:00:57.000000000 -0300 ++++ kiwi-1.9.15/setup.py 2007-05-23 15:25:04.000000000 -0300 +@@ -25,7 +25,7 @@ + # Build a helper module for testing on gtk+ versions lower than 2.10. + # Don't build it on windows due to easy availability compilers and + # the lack of pkg-config. +-if sys.platform != 'win32' and not 'bdist_wininst' in sys.argv: ++if False: + exists = commands.getstatusoutput('pkg-config pygtk-2.0 --exists')[0] == 0 + version = commands.getoutput('pkg-config pygtk-2.0 --modversion') + if exists and version and map(int, version.split('.')) < [2, 10]: --- kiwi-1.9.22.orig/debian/preinst +++ kiwi-1.9.22/debian/preinst @@ -0,0 +1,25 @@ +#!/bin/sh -e + +set -e + +#DEBHELPER# + +# handle problem caused probably by an earlier version of python-setuptools +# which was buggy (not sure) +case $1 in + install|upgrade) + for pyversion in 2.3 2.4 2.5; do + test -d /var/lib/python-support/python${pyversion}/kiwi-1.9.8.egg-info && \ + rm -rf /var/lib/python-support/python${pyversion}/kiwi-1.9.8.egg-info || \ + true + test -d /var/lib/python-support/python${pyversion}/kiwi && \ + rm -rf /var/lib/python-support/python${pyversion}/kiwi || \ + true + test -L /var/lib/python-support/python${pyversion}/gazpacho/widgets/kiwiwidgets.py && \ + rm -f /var/lib/python-support/python${pyversion}/gazpacho/widgets/kiwiwidgets.py || \ + true + done + ;; + *) + ;; +esac --- kiwi-1.9.22.orig/debian/python-kiwi.doc-base.api +++ kiwi-1.9.22/debian/python-kiwi.doc-base.api @@ -0,0 +1,11 @@ +Document: kiwiapi +Title: Kiwi API Reference +Author: Christian Reis , Johan Dahlin +Abstract: Kiwi is a framework and a set of enhanced PyGTK widgets designed to + make building programs with graphical interfaces both easy to write + and easy to maintain. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-kiwi/api/kiwi.html +Files: /usr/share/doc/python-kiwi/api/*.html --- kiwi-1.9.22.orig/debian/python-kiwi.examples +++ kiwi-1.9.22/debian/python-kiwi.examples @@ -0,0 +1 @@ +examples/* --- kiwi-1.9.22.orig/debian/pyversions +++ kiwi-1.9.22/debian/pyversions @@ -1 +1 @@ -2.3- +2.4- --- kiwi-1.9.22.orig/debian/rules +++ kiwi-1.9.22/debian/rules @@ -10,12 +10,12 @@ DEB_COMPRESS_EXCLUDE += .py .glade .gladep DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed -binary-post-install/python-kiwi:: -# mv debian/python-kiwi/usr/share/python-support/python-kiwi/kiwi-${DEB_UPSTREAM_VERSION}-py*.egg-info \ -# debian/python-kiwi/usr/share/python-support/python-kiwi/kiwi-${DEB_UPSTREAM_VERSION}.egg-info - build/python-kiwi:: - cd doc && $(MAKE) + cd doc && $(MAKE) api + +install/python-kiwi:: + mv debian/python-kiwi/usr/share/doc/kiwi/api debian/python-kiwi/usr/share/doc/python-kiwi/api + rm -rf debian/python-kiwi/usr/share/doc/kiwi clean:: cd doc && $(MAKE) clean --- kiwi-1.9.22.orig/debian/watch +++ kiwi-1.9.22/debian/watch @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-(.*)\.tar\.gz +http://ftp.gnome.org/pub/GNOME/sources/kiwi/([\d\.]+)/kiwi-(.*)\.tar\.gz