[Python-modules-commits] r3840 - in packages/pyicu/trunk/debian (7 files)
bzed at users.alioth.debian.org
bzed at users.alioth.debian.org
Wed Dec 5 13:24:02 UTC 2007
Date: Wednesday, December 5, 2007 @ 13:23:59
Author: bzed
Revision: 3840
* debian/watch:
- Updating file to point to Pypi.
* debian/control:
- Updating Build-Depends to the new -dev package name of libicu 3.8 -
libicu-dev.
* debian/patches:
- Removing 64bit-fix.dpatch, setup.py.dpatch - patches integrated
upstream.
- Adding no-setuptools-please.dpatch.
Added:
packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch
Modified:
packages/pyicu/trunk/debian/changelog
packages/pyicu/trunk/debian/control
packages/pyicu/trunk/debian/patches/00list
packages/pyicu/trunk/debian/watch
Deleted:
packages/pyicu/trunk/debian/patches/64bit-fix.dpatch
packages/pyicu/trunk/debian/patches/setup.py.dpatch
Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog 2007-12-04 21:30:27 UTC (rev 3839)
+++ packages/pyicu/trunk/debian/changelog 2007-12-05 13:23:59 UTC (rev 3840)
@@ -1,8 +1,17 @@
-pyicu (0.6-3) UNRELEASED; urgency=low
+pyicu (0.8-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * debian/watch:
+ - Updating file to point to Pypi.
+ * debian/control:
+ - Updating Build-Depends to the new -dev package name of libicu 3.8 -
+ libicu-dev.
+ * debian/patches:
+ - Removing 64bit-fix.dpatch, setup.py.dpatch - patches integrated
+ upstream.
+ - Adding no-setuptools-please.dpatch.
- -- Bernd Zeimetz <bernd at bzed.de> Mon, 19 Nov 2007 19:52:01 +0100
+ -- Bernd Zeimetz <bzed at debian.org> Wed, 05 Dec 2007 14:23:14 +0100
pyicu (0.6-2) unstable; urgency=low
Modified: packages/pyicu/trunk/debian/control
===================================================================
--- packages/pyicu/trunk/debian/control 2007-12-04 21:30:27 UTC (rev 3839)
+++ packages/pyicu/trunk/debian/control 2007-12-05 13:23:59 UTC (rev 3840)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Bernd Zeimetz <bernd at bzed.de>
-Build-Depends: dpatch, debhelper (>= 5.0.37.3), python-all-dev (>= 2.4.4-3), python-all-dbg (>= 2.4.4-3), python-support (>= 0.4), libicu36-dev
+Build-Depends: dpatch, debhelper (>= 5.0.37.3), python-all-dev (>= 2.4.4-3), python-all-dbg (>= 2.4.4-3), python-support (>= 0.4), libicu-dev (>= 3.8)
Build-Conflicts: python-pyicu
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyicu/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/
Modified: packages/pyicu/trunk/debian/patches/00list
===================================================================
--- packages/pyicu/trunk/debian/patches/00list 2007-12-04 21:30:27 UTC (rev 3839)
+++ packages/pyicu/trunk/debian/patches/00list 2007-12-05 13:23:59 UTC (rev 3840)
@@ -1,2 +1 @@
-64bit-fix
-setup.py
+no-setuptools-please
Deleted: packages/pyicu/trunk/debian/patches/64bit-fix.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/64bit-fix.dpatch 2007-12-04 21:30:27 UTC (rev 3839)
+++ packages/pyicu/trunk/debian/patches/64bit-fix.dpatch 2007-12-05 13:23:59 UTC (rev 3840)
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 64bit-fix.dpatch by Bernd Zeimetz <bernd at bzed.de>
-##
-## DP: cast PY_LONG_LONG to int64_t where needed
-
- at DPATCH@
-diff -urNad pyicu~/common.cpp pyicu/common.cpp
---- pyicu~/common.cpp 2007-02-07 22:57:39.000000000 +0100
-+++ pyicu/common.cpp 2007-11-18 00:33:50.000000000 +0100
-@@ -507,7 +507,7 @@
- return new icu::Formattable(i);
-
- if (!parseArg(arg, "L", &l))
-- return new icu::Formattable(l);
-+ return new icu::Formattable((int64_t)l);
-
- if (!parseArg(arg, "c", &s))
- return new icu::Formattable(s);
-diff -urNad pyicu~/numberformat.cpp pyicu/numberformat.cpp
---- pyicu~/numberformat.cpp 2007-11-18 00:33:06.000000000 +0100
-+++ pyicu/numberformat.cpp 2007-11-18 00:33:07.000000000 +0100
-@@ -499,7 +499,7 @@
- }
- if (!parseArgs(args, "L", &l))
- {
-- self->object->format(l, _u);
-+ self->object->format((int64_t)l, _u);
- return PyUnicode_FromUnicodeString(&_u);
- }
- break;
-@@ -519,7 +519,7 @@
- if (!parseArgs(args, "LP", TYPE_CLASSID(FieldPosition),
- &l, &fp))
- {
-- self->object->format(l, _u, *fp);
-+ self->object->format((int64_t)l, _u, *fp);
- return PyUnicode_FromUnicodeString(&_u);
- }
- break;
-@@ -539,7 +539,7 @@
- if (!parseArgs(args, "LUP", TYPE_CLASSID(FieldPosition),
- &l, &u, &fp))
- {
-- self->object->format(l, *u, *fp);
-+ self->object->format((int64_t)l, *u, *fp);
- Py_RETURN_ARG(args, 1);
- }
- break;
-@@ -1674,7 +1674,7 @@
- if (!parseArgs(args, "LSP", TYPE_CLASSID(FieldPosition),
- &l, &u, &_u, &fp))
- {
-- STATUS_CALL(self->object->format(l, *u, _v, *fp, status));
-+ STATUS_CALL(self->object->format((int64_t)l, *u, _v, *fp, status));
- return PyUnicode_FromUnicodeString(&_v);
- }
- case 4:
-@@ -1693,7 +1693,7 @@
- if (!parseArgs(args, "LSUP", TYPE_CLASSID(FieldPosition),
- &l, &u, &_u, &v, &fp))
- {
-- STATUS_CALL(self->object->format(l, *u, *v, *fp, status));
-+ STATUS_CALL(self->object->format((int64_t)l, *u, *v, *fp, status));
- Py_RETURN_ARG(args, 2);
- }
- break;
Added: packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch (rev 0)
+++ packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch 2007-12-05 13:23:59 UTC (rev 3840)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-setuptools-please.dpatch by Bernd Zeimetz <bzed at debian.org>
+##
+## DP: As usual - do not build with setuptools.
+
+ at DPATCH@
+diff -urNad pyicu~/setup.py pyicu/setup.py
+--- pyicu~/setup.py 2007-11-28 19:37:57.000000000 +0100
++++ pyicu/setup.py 2007-12-05 14:21:57.000000000 +0100
+@@ -1,10 +1,7 @@
+
+ import os, sys
+
+-try:
+- from setuptools import setup, Extension
+-except ImportError:
+- from distutils.core import setup, Extension
++from distutils.core import setup, Extension
+
+
+ VERSION = '0.8'
Property changes on: packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/pyicu/trunk/debian/patches/setup.py.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/setup.py.dpatch 2007-12-04 21:30:27 UTC (rev 3839)
+++ packages/pyicu/trunk/debian/patches/setup.py.dpatch 2007-12-05 13:23:59 UTC (rev 3840)
@@ -1,49 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## setup.py.dpatch by Bernd Zeimetz <bernd at bzed.de>
-##
-## DP: replace upstream's weird makefile by something proper
-
- at DPATCH@
-diff -urNad pyicu~/setup.py pyicu/setup.py
---- pyicu~/setup.py 1970-01-01 01:00:00.000000000 +0100
-+++ pyicu/setup.py 2007-11-17 18:51:23.000000000 +0100
-@@ -0,0 +1,39 @@
-+import os
-+import re
-+
-+from distutils.core import setup, Extension
-+if not os.environ.has_key('CC'):
-+ os.environ['CC']='g++'
-+
-+
-+__cpp_files__ = []
-+for filename in os.listdir(os.curdir):
-+ if filename.endswith('.cpp'):
-+ __cpp_files__.append(filename)
-+
-+## this is a debian-only way to figure out which pyicu version we're
-+## using here.... normally upstream's job to keep the version uptodate
-+
-+def __get_pyicu_version__():
-+ dpkgp_stdin, dpkgp_stdout = os.popen2('dpkg-parsechangelog')
-+ dpkgp_out = dpkgp_stdout.read()
-+ dpkgp_stdin.close()
-+ dpkgp_stdout.close()
-+ return re.findall(r'^Version: (.*)-[0-9]+', dpkgp_out, re.M)[0]
-+__pyicu_version__ = __get_pyicu_version__()
-+
-+
-+setup(name="PyICU",
-+ description='Python extension wrapping the ICU C++ API',
-+ version=__pyicu_version__,
-+ url='http://pyicu.osafoundation.org/',
-+ author='Open Source Applications Foundation',
-+ ext_modules=[Extension('_PyICU',
-+ __cpp_files__,
-+ libraries=['icui18n', 'icuuc', 'icudata'],
-+ define_macros=[('PYICU_VER', '"%s"' % __pyicu_version__ )]
-+ )
-+ ],
-+ py_modules=['PyICU']
-+ )
-+
Modified: packages/pyicu/trunk/debian/watch
===================================================================
--- packages/pyicu/trunk/debian/watch 2007-12-04 21:30:27 UTC (rev 3839)
+++ packages/pyicu/trunk/debian/watch 2007-12-05 13:23:59 UTC (rev 3840)
@@ -1,3 +1,3 @@
-version=3
+version = 3
-http://downloads.osafoundation.org/PyICU/src/ PyICU-src-(.*).tar.gz
+http://pypi.python.org/packages/source/P/PyICU/PyICU-(.*)\.tar\.gz
More information about the Python-modules-commits
mailing list