[Python-modules-commits] r24940 - in packages/pyicu/trunk/debian (12 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Mon Jun 24 21:12:31 UTC 2013
Date: Monday, June 24, 2013 @ 21:12:30
Author: piotr
Revision: 24940
* Add Python 3 packages (closes: #671361).
* Drop manual cleaning of python-pyicu-dbg, since dh_python2 handles this.
* New upstream release
* Convert patches from deprecated dpatch to quilt
* Debian source package format changed to 3.0 (quilt)
* Add fix_typo_in_deprecation_warning patch (closes: #589031)
* Remove docs.py file from binary packages (closes: #603717)
* Add fonttools to Build-Depends to run test_LayoutEngine at build time
(closes: #654516)
* Standards-Version bumped to 3.9.4:
- build-arch and build-indep targets added in debian/rules
Added:
packages/pyicu/trunk/debian/patches/fix_typo_in_deprecation_warning.patch
packages/pyicu/trunk/debian/patches/no-setuptools-please.diff
packages/pyicu/trunk/debian/patches/platform-definitions-fix.diff
packages/pyicu/trunk/debian/patches/series
Modified:
packages/pyicu/trunk/debian/changelog
packages/pyicu/trunk/debian/control
packages/pyicu/trunk/debian/rules
packages/pyicu/trunk/debian/source/format
Deleted:
packages/pyicu/trunk/debian/patches/00dpatch.conf
packages/pyicu/trunk/debian/patches/00list
packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch
packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch
Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog 2013-06-24 21:01:50 UTC (rev 24939)
+++ packages/pyicu/trunk/debian/changelog 2013-06-24 21:12:30 UTC (rev 24940)
@@ -1,9 +1,27 @@
-pyicu (1.4-2) UNRELEASED; urgency=low
+pyicu (1.5-1) unstable; urgency=low
+ * Team upload.
+
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:01:46 +0200
+ [ Colin Watson ]
+ * Add Python 3 packages (closes: #671361).
+ * Drop manual cleaning of python-pyicu-dbg, since dh_python2 handles this.
+ [ Piotr Ożarowski ]
+ * New upstream release
+ * Convert patches from deprecated dpatch to quilt
+ * Debian source package format changed to 3.0 (quilt)
+ * Add fix_typo_in_deprecation_warning patch (closes: #589031)
+ * Remove docs.py file from binary packages (closes: #603717)
+ * Add fonttools to Build-Depends to run test_LayoutEngine at build time
+ (closes: #654516)
+ * Standards-Version bumped to 3.9.4:
+ - build-arch and build-indep targets added in debian/rules
+
+ -- Piotr Ożarowski <piotr at debian.org> Mon, 24 Jun 2013 22:20:56 +0200
+
pyicu (1.4-1) unstable; urgency=low
[ Jakub Wilk ]
Modified: packages/pyicu/trunk/debian/control
===================================================================
--- packages/pyicu/trunk/debian/control 2013-06-24 21:01:50 UTC (rev 24939)
+++ packages/pyicu/trunk/debian/control 2013-06-24 21:12:30 UTC (rev 24940)
@@ -3,12 +3,13 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Bernd Zeimetz <bzed at debian.org>
-Build-Depends: dpatch, debhelper (>= 5.0.37.3), python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~), libicu-dev
+Build-Depends: debhelper (>= 5.0.37.3), python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~), python3-all-dev, python3-all-dbg, libicu-dev,
+ fonttools
Build-Conflicts: python-pyicu
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyicu/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyicu/trunk/
Homepage: http://pyicu.osafoundation.org/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Package: python-pyicu
Architecture: any
@@ -31,3 +32,26 @@
Python which wraps the ICU C++ API.
.
This package contains the extension built for the Python debug interpreter.
+
+Package: python3-icu
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
+Provides: ${python3:Provides}
+Description: Python 3 extension wrapping the ICU C++ API
+ ICU is a C++ and C library that provides robust and full-featured
+ Unicode and locale support. This package provides an extension for
+ Python 3 which wraps the ICU C++ API.
+
+Package: python3-icu-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-icu (= ${binary:Version}), python3-dbg
+Provides: ${python3:Provides}
+Description: Python 3 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 3 which wraps the ICU C++ API.
+ .
+ This package contains the extension built for the Python 3 debug
+ interpreter.
Deleted: packages/pyicu/trunk/debian/patches/00dpatch.conf
===================================================================
--- packages/pyicu/trunk/debian/patches/00dpatch.conf 2013-06-24 21:01:50 UTC (rev 24939)
+++ packages/pyicu/trunk/debian/patches/00dpatch.conf 2013-06-24 21:12:30 UTC (rev 24940)
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
Deleted: packages/pyicu/trunk/debian/patches/00list
===================================================================
--- packages/pyicu/trunk/debian/patches/00list 2013-06-24 21:01:50 UTC (rev 24939)
+++ packages/pyicu/trunk/debian/patches/00list 2013-06-24 21:12:30 UTC (rev 24940)
@@ -1,2 +0,0 @@
-no-setuptools-please
-platform-definitions-fix
Added: packages/pyicu/trunk/debian/patches/fix_typo_in_deprecation_warning.patch
===================================================================
--- packages/pyicu/trunk/debian/patches/fix_typo_in_deprecation_warning.patch (rev 0)
+++ packages/pyicu/trunk/debian/patches/fix_typo_in_deprecation_warning.patch 2013-06-24 21:12:30 UTC (rev 24940)
@@ -0,0 +1,13 @@
+Index: PyICU-1.5/PyICU.py
+===================================================================
+--- PyICU-1.5.orig/PyICU.py
++++ PyICU-1.5/PyICU.py
+@@ -23,7 +23,7 @@
+
+ import warnings as _warnings
+
+-_warnings.warn("Module 'PyICU' is deprecated, import 'icu' instead'",
++_warnings.warn("Module 'PyICU' is deprecated, import 'icu' instead",
+ category=DeprecationWarning, stacklevel=2)
+
+ from icu import *
Added: packages/pyicu/trunk/debian/patches/no-setuptools-please.diff
===================================================================
--- packages/pyicu/trunk/debian/patches/no-setuptools-please.diff (rev 0)
+++ packages/pyicu/trunk/debian/patches/no-setuptools-please.diff 2013-06-24 21:12:30 UTC (rev 24940)
@@ -0,0 +1,22 @@
+#! /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@
+Index: PyICU-1.5/setup.py
+===================================================================
+--- PyICU-1.5.orig/setup.py
++++ PyICU-1.5/setup.py
+@@ -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 = '1.5'
Deleted: packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch 2013-06-24 21:01:50 UTC (rev 24939)
+++ packages/pyicu/trunk/debian/patches/no-setuptools-please.dpatch 2013-06-24 21:12:30 UTC (rev 24940)
@@ -1,21 +0,0 @@
-#! /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'
Added: packages/pyicu/trunk/debian/patches/platform-definitions-fix.diff
===================================================================
--- packages/pyicu/trunk/debian/patches/platform-definitions-fix.diff (rev 0)
+++ packages/pyicu/trunk/debian/patches/platform-definitions-fix.diff 2013-06-24 21:12:30 UTC (rev 24940)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## platform-definitions-fix.dpatch by Jakub Wilk <jwilk at debian.org>
+##
+## DP: Fixing FTBFS due to new platform definitions. Setup.py doesn't need to
+## DP: take care of them in our case.
+
+ at DPATCH@
+Index: PyICU-1.5/setup.py
+===================================================================
+--- PyICU-1.5.orig/setup.py
++++ PyICU-1.5/setup.py
+@@ -48,7 +48,7 @@ LIBRARIES = {
+ }
+
+ platform = sys.platform
+-if platform.startswith('linux'):
++if platform.startswith('linux') or platform.startswith('gnu'):
+ platform = 'linux'
+
+ if 'PYICU_INCLUDES' in os.environ:
Deleted: packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch 2013-06-24 21:01:50 UTC (rev 24939)
+++ packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch 2013-06-24 21:12:30 UTC (rev 24940)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## platform-definitions-fix.dpatch by Jakub Wilk <jwilk at debian.org>
-##
-## DP: Fixing FTBFS due to new platform definitions. Setup.py doesn't need to
-## DP: take care of them in our case.
-
- at DPATCH@
---- pyicu-0.8.1/setup.py
-+++ pyicu-0.8.1+kbsd/setup.py
-@@ -42,7 +42,7 @@
- }
-
- platform = sys.platform
--if platform.startswith('linux'):
-+if platform.startswith('linux') or platform.startswith('gnu'):
- platform = 'linux'
-
- if 'PYICU_INCLUDES' in os.environ:
Added: packages/pyicu/trunk/debian/patches/series
===================================================================
--- packages/pyicu/trunk/debian/patches/series (rev 0)
+++ packages/pyicu/trunk/debian/patches/series 2013-06-24 21:12:30 UTC (rev 24940)
@@ -0,0 +1,3 @@
+no-setuptools-please.diff
+platform-definitions-fix.diff
+fix_typo_in_deprecation_warning.patch
Modified: packages/pyicu/trunk/debian/rules
===================================================================
--- packages/pyicu/trunk/debian/rules 2013-06-24 21:01:50 UTC (rev 24939)
+++ packages/pyicu/trunk/debian/rules 2013-06-24 21:12:30 UTC (rev 24940)
@@ -4,53 +4,56 @@
#export DH_VERBOSE=1
PKGNAME:=python-pyicu
+PKG3NAME=python3-icu
PYVERS:=$(shell pyversions -vr)
+PY3VERS:=$(shell py3versions -vr)
-include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
- py_sitename = site-packages
- py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
- py_sitename_sh = $(py_sitename)
- py_libdir_sh = $(py_libdir)
-endif
-include /usr/share/dpatch/dpatch.make
-
-build: patch build-stamp
+build: build-arch
+build-indep:
+# We have nothing to do by default.
+build-arch: build-stamp
build-stamp:
dh_testdir
-
+
+ # setup.py modifies test source files when building for Python 3, so
+ # build out of tree.
+ rm -rf build-py2 build-py3
+ mkdir -p build-py2 build-py3
+ cp -a $(filter-out build-py2 build-py3 debian,$(wildcard *)) build-py2/
+ cp -a $(filter-out build-py2 build-py3 debian,$(wildcard *)) build-py3/
+
set -e; \
- for py in $(PYVERS); do \
+ for py in $(PYVERS) $(PY3VERS); do \
+ (cd build-py$${py%%.*}; \
python$$py setup.py build; \
- python$$py-dbg setup.py build; \
+ python$$py-dbg setup.py build); \
done
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
set -ex ;\
for test in `ls test/*.py`; do \
- for py in $(PYVERS); do \
- PYTHONPATH=`ls -d $(CURDIR)/build/lib.*-$$py` \
+ for py in $(PYVERS) $(PY3VERS); do \
+ (cd build-py$${py%%.*}; \
+ PYTHONPATH=`ls -d $$(pwd)/build/lib.*-$$py` \
python$$py $$test ;\
- PYTHONPATH=`ls -d $(CURDIR)/build/lib_d.*-$$py || ls -d $(CURDIR)/build/lib.*-$$py-pydebug` \
- python$$py-dbg $$test ;\
+ PYTHONPATH=`ls -d $$(pwd)/build/lib_d.*-$$py || ls -d $$(pwd)/build/lib.*-$$py-pydebug` \
+ python$$py-dbg $$test) ;\
done ;\
done
endif
touch $@
-clean: clean-patched unpatch
-clean-patched: patch-stamp
+clean:
dh_testdir
dh_testroot
rm -f install-stamp build-stamp
- -for py in $(PYVERS); do \
- python$$py setup.py clean; \
- done
find . -name "*.pyc" -print0 | xargs -0 rm -f
- rm -rf build
+ find . -name __pycache__ -print0 | xargs -0 rm -rf
+ rm -rf build-py2 build-py3
dh_clean
install: install-stamp
@@ -61,30 +64,39 @@
dh_installdirs
set -e; \
for py in $(PYVERS); do \
+ (cd build-py2; \
python$$py setup.py install --root=$(CURDIR)/debian/$(PKGNAME) --prefix=/usr $(py_setup_install_args) ;\
- python$$py-dbg setup.py install --root=$(CURDIR)/debian/$(PKGNAME)-dbg --prefix=/usr $(py_setup_install_args) ;\
+ python$$py-dbg setup.py install --root=$(CURDIR)/debian/$(PKGNAME)-dbg --prefix=/usr $(py_setup_install_args)) ;\
done
- find $(CURDIR)/debian/$(PKGNAME)-dbg -name "*.pyc" -print0 | xargs -0 rm -f
- find $(CURDIR)/debian/$(PKGNAME)-dbg -name "*.py" -print0 | xargs -0 rm -f
- find $(CURDIR)/debian/$(PKGNAME)-dbg -name "*.egg-info" -print0 | xargs -0 rm -f
-
+ set -e; \
+ for py in $(PY3VERS); do \
+ (cd build-py3; \
+ python$$py setup.py install --root=$(CURDIR)/debian/$(PKG3NAME) --prefix=/usr $(py_setup_install_args) ;\
+ python$$py-dbg setup.py install --root=$(CURDIR)/debian/$(PKG3NAME)-dbg --prefix=/usr $(py_setup_install_args)) ;\
+ done
+ find $(CURDIR)/debian/ -type f -name docs.py -delete
+
dh_installdocs
dh_installexamples
touch install-stamp
-binary-indep: build install
+binary-indep: build-indep install
# We have nothing to do by default.
-binary-arch: build install
+binary-arch: build-arch install
dh_testdir
dh_testroot
dh_installchangelogs CHANGES
dh_compress -X.py
dh_strip -p$(PKGNAME) --dbg-package=$(PKGNAME)-dbg
+ dh_strip -p$(PKG3NAME) --dbg-package=$(PKG3NAME)-dbg
dh_fixperms
dh_python2
+ dh_python3
rm -rf debian/$(PKGNAME)-dbg/usr/share/doc/$(PKGNAME)-dbg
ln -s $(PKGNAME) debian/$(PKGNAME)-dbg/usr/share/doc/$(PKGNAME)-dbg
+ rm -rf debian/$(PKG3NAME)-dbg/usr/share/doc/$(PKG3NAME)-dbg
+ ln -s $(PKG3NAME) debian/$(PKG3NAME)-dbg/usr/share/doc/$(PKG3NAME)-dbg
dh_installdeb
dh_shlibdeps
dh_gencontrol
@@ -92,6 +104,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install \
- clean-patched patch unpatch
-
+.PHONY: build clean binary-indep binary-arch binary install
Modified: packages/pyicu/trunk/debian/source/format
===================================================================
--- packages/pyicu/trunk/debian/source/format 2013-06-24 21:01:50 UTC (rev 24939)
+++ packages/pyicu/trunk/debian/source/format 2013-06-24 21:12:30 UTC (rev 24940)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list