[Python-modules-commits] r2473 - in /packages/kiwi/trunk/debian: changelog control patches/02_avoid_version_checking.diff patches/03_epyrun_use_local_modules.diff patches/04_avoid_building_helper_module.diff rules watch
goedson at users.alioth.debian.org
goedson at users.alioth.debian.org
Mon May 28 23:42:59 UTC 2007
Author: goedson
Date: Mon May 28 23:42:59 2007
New Revision: 2473
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2473
Log:
* 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
Removed:
packages/kiwi/trunk/debian/patches/03_epyrun_use_local_modules.diff
Modified:
packages/kiwi/trunk/debian/changelog
packages/kiwi/trunk/debian/control
packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff
packages/kiwi/trunk/debian/patches/04_avoid_building_helper_module.diff
packages/kiwi/trunk/debian/rules
packages/kiwi/trunk/debian/watch
Modified: packages/kiwi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/changelog?rev=2473&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/changelog (original)
+++ packages/kiwi/trunk/debian/changelog Mon May 28 23:42:59 2007
@@ -1,10 +1,39 @@
-kiwi (1.9.13-3) UNRELEASED; urgency=low
+kiwi (1.9.15-1) unstable; urgency=low
+ [ Piotr Ozarowski ]
* New python-support handles egg's directory name correctly
- bump python-support required version
- remove mv part from debian/rules
- -- Piotr Ożarowski <piotr at debian.org> Sun, 13 May 2007 00:27:05 +0200
+ [ 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
+
+ -- Goedson Teixeira Paixao <goedson at debian.org> Mon, 28 May 2007 20:37:51 -0300
+
+kiwi (1.9.13-4) unstable; urgency=medium
+
+ * QA upload.
+ * debian/rules: Renaming .egg-info is no longer necessary.
+ Closes: #423975.
+
+ -- Matej Vela <vela at debian.org> Tue, 15 May 2007 10:41:47 +0200
+
+kiwi (1.9.13-3) unstable; urgency=medium
+
+ * QA upload.
+ * Remove duplicate docs from /usr/share/doc/kiwi. Closes: #419166.
+ * Remove Uploaders.
+
+ -- Matej Vela <vela at debian.org> Sat, 14 Apr 2007 11:45:08 +0200
kiwi (1.9.13-2) unstable; urgency=low
Modified: packages/kiwi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/control?rev=2473&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/control (original)
+++ packages/kiwi/trunk/debian/control Mon May 28 23:42:59 2007
@@ -1,7 +1,7 @@
Source: kiwi
Section: python
Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
+Maintainer: Goedson Teixeira Paixao <goedson at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-setuptools (>= 0.6b3-1)
Build-Depends-Indep: python-all-dev (>= 2.3.5-10), python-glade2 (>= 2.8.6-1), python-gtk2 (>= 2.8.2-3.1), python-support (>= 0.6.4), python-epydoc (>= 2.1-11), python-twisted-core (>= 2.4.0-1), xvfb, xbase-clients, xfonts-base
Modified: packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff?rev=2473&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff (original)
+++ packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff Mon May 28 23:42:59 2007
@@ -1,5 +1,6 @@
---- bin/kiwi-i18n~ 2006-04-25 12:09:01.000000000 -0300
-+++ bin/kiwi-i18n 2006-06-15 20:40:05.000000000 -0300
+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
@@ -9,29 +10,26 @@
# Directory name, defaults to name of binary, it is relative to ..
# a, __init__.py and main.py is expected to be found there.
-@@ -33,13 +33,13 @@
+@@ -33,11 +33,11 @@
dirname = DIRNAME or os.path.split(sys.argv[0])[1]
appname = APPNAME or dirname.capitalize()
--version_string = sys.version.split(' ')[0]
--majmin = tuple(map(int, version_string.split('.')))
--if majmin < REQUIRED_VERSION:
+-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,
-- version_string))
-+#version_string = sys.version.split(' ')[0]
-+#majmin = tuple(map(int, version_string.split('.')))
-+#if majmin < REQUIRED_VERSION:
-+# raise SystemExit("ERROR: Python %s or higher is required to run %s, "
-+# "%s found" % ('.'.join(map(str, REQUIRED_VERSION)),
-+# appname,
-+# version_string))
+- 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/..
---- bin/kiwi-ui-test~ 2006-04-25 12:09:01.000000000 -0300
-+++ bin/kiwi-ui-test 2006-06-15 20:39:07.000000000 -0300
+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
@@ -41,24 +39,20 @@
# Directory name, defaults to name of binary, it is relative to ..
# a, __init__.py and main.py is expected to be found there.
-@@ -33,13 +33,13 @@
+@@ -33,11 +33,11 @@
dirname = DIRNAME or os.path.split(sys.argv[0])[1]
appname = APPNAME or dirname.capitalize()
--version_string = sys.version.split(' ')[0]
--majmin = tuple(map(int, version_string.split('.')))
--if majmin < REQUIRED_VERSION:
+-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,
-- version_string))
-+#version_string = sys.version.split(' ')[0]
-+#majmin = tuple(map(int, version_string.split('.')))
-+#if majmin < REQUIRED_VERSION:
-+# raise SystemExit("ERROR: Python %s or higher is required to run %s, "
-+# "%s found" % ('.'.join(map(str, REQUIRED_VERSION)),
-+# appname,
-+# version_string))
+- 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/..
Modified: packages/kiwi/trunk/debian/patches/04_avoid_building_helper_module.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/patches/04_avoid_building_helper_module.diff?rev=2473&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/patches/04_avoid_building_helper_module.diff (original)
+++ packages/kiwi/trunk/debian/patches/04_avoid_building_helper_module.diff Mon May 28 23:42:59 2007
@@ -1,11 +1,12 @@
---- setup.py~ 2007-02-01 15:16:12.000000000 -0200
-+++ setup.py 2007-02-15 00:13:24.000000000 -0200
+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':
-+if False: # we don't want to build this for Debian
+-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 version and map(int, version.split('.')) < [2, 10]:
- pkgs = 'gdk-2.0 gtk+-2.0 pygtk-2.0'
+ if exists and version and map(int, version.split('.')) < [2, 10]:
Modified: packages/kiwi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/rules?rev=2473&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/rules (original)
+++ packages/kiwi/trunk/debian/rules Mon May 28 23:42:59 2007
@@ -10,6 +10,9 @@
DEB_COMPRESS_EXCLUDE += .py .glade .gladep
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+binary-post-install/python-kiwi::
+ rm -rf debian/python-kiwi/usr/share/doc/kiwi
+
build/python-kiwi::
cd doc && $(MAKE)
Modified: packages/kiwi/trunk/debian/watch
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/watch?rev=2473&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/watch (original)
+++ packages/kiwi/trunk/debian/watch Mon May 28 23:42:59 2007
@@ -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
More information about the Python-modules-commits
mailing list