[Python-modules-commits] r3626 - in /packages/pyicu/trunk/debian: control patches/ patches/00dpatch.conf patches/00list patches/64bit-fix.dpatch rules
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Fri Nov 16 03:03:04 UTC 2007
Author: bzed-guest
Date: Fri Nov 16 03:03:03 2007
New Revision: 3626
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3626
Log:
fixing build, adding dbg extension
Added:
packages/pyicu/trunk/debian/patches/
packages/pyicu/trunk/debian/patches/00dpatch.conf
packages/pyicu/trunk/debian/patches/00list
packages/pyicu/trunk/debian/patches/64bit-fix.dpatch (with props)
Modified:
packages/pyicu/trunk/debian/control
packages/pyicu/trunk/debian/rules
Modified: packages/pyicu/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/control?rev=3626&op=diff
==============================================================================
--- packages/pyicu/trunk/debian/control (original)
+++ packages/pyicu/trunk/debian/control Fri Nov 16 03:03:03 2007
@@ -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: debhelper (>= 5), python-all-dev, python-support (>= 0.4), libicu36-dev
+Build-Depends: dpatch, debhelper (>= 5), python-all-dev, python-support (>= 0.4), libicu36-dev
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyicu/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/
Homepage: http://pyicu.osafoundation.org/
@@ -17,3 +17,15 @@
ICU is a C++ and C library that provides robust and full-featured
Unicode and locale support. This package provides an extension for
Python which wraps the ICU C++ API.
+
+Package: python-pyicu-dbg
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+Description: Python extension wrapping the ICU C++ API (debug extension)
+ ICU is a C++ and C library that provides robust and full-featured
+ Unicode and locale support. This package provides an extension for
+ Python which wraps the ICU C++ API.
+ .
+ This package contains the extension built for the python debug interpreter.
Added: packages/pyicu/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/patches/00dpatch.conf?rev=3626&op=file
==============================================================================
--- packages/pyicu/trunk/debian/patches/00dpatch.conf (added)
+++ packages/pyicu/trunk/debian/patches/00dpatch.conf Fri Nov 16 03:03:03 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs
Added: packages/pyicu/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/patches/00list?rev=3626&op=file
==============================================================================
--- packages/pyicu/trunk/debian/patches/00list (added)
+++ packages/pyicu/trunk/debian/patches/00list Fri Nov 16 03:03:03 2007
@@ -1,0 +1,1 @@
+64bit-fix
Added: packages/pyicu/trunk/debian/patches/64bit-fix.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/patches/64bit-fix.dpatch?rev=3626&op=file
==============================================================================
--- packages/pyicu/trunk/debian/patches/64bit-fix.dpatch (added)
+++ packages/pyicu/trunk/debian/patches/64bit-fix.dpatch Fri Nov 16 03:03:03 2007
@@ -1,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 64bit-fix.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: Fixing build on 64bit
+
+ at DPATCH@
+diff -urNad pyicu~/bases.cpp pyicu/bases.cpp
+--- pyicu~/bases.cpp 2007-02-07 22:57:39.000000000 +0100
++++ pyicu/bases.cpp 2007-11-16 03:52:05.000000000 +0100
+@@ -1954,7 +1954,7 @@
+ static PyObject *t_formattable_getInt64(t_formattable *self)
+ {
+ UErrorCode status = U_ZERO_ERROR;
+- PY_LONG_LONG l = self->object->getInt64(status);
++ Py_intptr_t l = self->object->getInt64(status);
+
+ if (U_FAILURE(status))
+ return ICUException(status).reportError();
+@@ -2037,7 +2037,7 @@
+
+ static PyObject *t_formattable_setInt64(t_formattable *self, PyObject *arg)
+ {
+- PY_LONG_LONG l;
++ Py_intptr_t l;
+
+ if (!parseArg(arg, "L", &l))
+ {
+diff -urNad pyicu~/common.cpp pyicu/common.cpp
+--- pyicu~/common.cpp 2007-02-07 22:57:39.000000000 +0100
++++ pyicu/common.cpp 2007-11-16 03:52:05.000000000 +0100
+@@ -495,7 +495,7 @@
+ UDate date;
+ double d;
+ int i;
+- PY_LONG_LONG l;
++ Py_intptr_t l;
+ icu::UnicodeString *u;
+ icu::UnicodeString _u;
+ char *s;
+@@ -828,7 +828,7 @@
+ break;
+ return -1;
+
+- case 'L': /* PY_LONG_LONG */
++ case 'L': /* Py_intptr_t */
+ if (PyLong_Check(arg) || PyInt_Check(arg))
+ break;
+ return -1;
+@@ -1009,9 +1009,9 @@
+ break;
+ }
+
+- case 'L': /* PY_LONG_LONG */
++ case 'L': /* Py_intptr_t */
+ {
+- PY_LONG_LONG *l = va_arg(list, PY_LONG_LONG *);
++ Py_intptr_t *l = va_arg(list, Py_intptr_t *);
+ *l = PyLong_AsLongLong(arg);
+ break;
+ }
+diff -urNad pyicu~/numberformat.cpp pyicu/numberformat.cpp
+--- pyicu~/numberformat.cpp 2006-04-13 19:41:51.000000000 +0200
++++ pyicu/numberformat.cpp 2007-11-16 03:52:05.000000000 +0100
+@@ -482,7 +482,7 @@
+ icu::UnicodeString _u;
+ double d;
+ int i;
+- PY_LONG_LONG l;
++ Py_intptr_t l;
+ icu::FieldPosition *fp;
+
+ switch (PyTuple_Size(args)) {
+@@ -1654,7 +1654,7 @@
+ icu::UnicodeString _u, _v;
+ double d;
+ int i;
+- PY_LONG_LONG l;
++ Py_intptr_t l;
+ icu::FieldPosition *fp;
+
+ switch (PyTuple_Size(args)) {
Propchange: packages/pyicu/trunk/debian/patches/64bit-fix.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/pyicu/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/rules?rev=3626&op=diff
==============================================================================
--- packages/pyicu/trunk/debian/rules (original)
+++ packages/pyicu/trunk/debian/rules Fri Nov 16 03:03:03 2007
@@ -13,10 +13,9 @@
grep '^Version' | \
sed 's,Version: ,,;s,-.*,,g')
-#include /usr/share/dpatch/dpatch.make
+include /usr/share/dpatch/dpatch.make
-#build: patch build-stamp
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
set -e ;\
@@ -24,18 +23,24 @@
make PREFIX=/usr PREFIX_PYTHON=/usr PREFIX_ICU=/usr \
PYTHON=/usr/bin/python$$pyver PYTHON_VER=$$pyver \
ICU_VER=$(ICU_VER) ;\
- make install PREFIX_PYTHON=$(CURDIR)/debian/usr/$(PKGNAME) ;\
+ make install PREFIX_PYTHON=$(CURDIR)/debian/$(PKGNAME)/usr ;\
make clean ;\
+ make PREFIX=/usr PREFIX_PYTHON=/usr PREFIX_ICU=/usr \
+ PYTHON=/usr/bin/python$$pyver-dbg PYTHON_VER=$$pyver \
+ ICU_VER=$(ICU_VER) DEBUG=1 ;\
+ make install PREFIX_PYTHON=$(CURDIR)/debian/$(PKGNAME)-dbg/usr ;\
+ make clean DEBUG=1 ;\
done
touch $@
-#clean: clean-patched unpatch
-#clean-patched: patch-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched: patch-stamp
dh_testdir
dh_testroot
rm -f build-stamp
+ make clean
+ make clean DEBUG=1
dh_clean
@@ -48,7 +53,7 @@
dh_installchangelogs CHANGES
dh_compress
dh_fixperms
- dh_strip
+ dh_strip -ppython-pyicu --dbg-package=python-pyicu-dbg
dh_pysupport
dh_installdeb
# Ignore libpython dependencies
@@ -59,7 +64,6 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
-#\
-# clean-patched patch unpatch
+.PHONY: build clean binary-indep binary-arch binary \
+ clean-patched patch unpatch
More information about the Python-modules-commits
mailing list