[Python-modules-commits] r24952 - in packages/pyicu/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, June 25, 2013 @ 17:55:53
  Author: piotr
Revision: 24952

Rename docs.py to icu_docs.py instead of removing it as it's used in icu (closes: #714048)

Added:
  packages/pyicu/trunk/debian/patches/rename_docs_module.patch
Modified:
  packages/pyicu/trunk/debian/changelog
  packages/pyicu/trunk/debian/patches/series
  packages/pyicu/trunk/debian/rules

Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog	2013-06-25 16:27:51 UTC (rev 24951)
+++ packages/pyicu/trunk/debian/changelog	2013-06-25 17:55:53 UTC (rev 24952)
@@ -1,3 +1,10 @@
+pyicu (1.5-2) unstable; urgency=low
+
+  * Rename docs.py to icu_docs.py instead of removing it
+    as it's used in icu (closes: #714048)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 25 Jun 2013 19:22:34 +0200
+
 pyicu (1.5-1) unstable; urgency=low
 
   * Team upload.

Added: packages/pyicu/trunk/debian/patches/rename_docs_module.patch
===================================================================
--- packages/pyicu/trunk/debian/patches/rename_docs_module.patch	                        (rev 0)
+++ packages/pyicu/trunk/debian/patches/rename_docs_module.patch	2013-06-25 17:55:53 UTC (rev 24952)
@@ -0,0 +1,10 @@
+Index: PyICU-1.5/icu.py
+===================================================================
+--- PyICU-1.5.orig/icu.py
++++ PyICU-1.5/icu.py
+@@ -34,4 +34,4 @@ class ICUError(Exception):
+ class InvalidArgsError(Exception):
+     pass
+ 
+-from docs import *
++from icu_docs import *

Modified: packages/pyicu/trunk/debian/patches/series
===================================================================
--- packages/pyicu/trunk/debian/patches/series	2013-06-25 16:27:51 UTC (rev 24951)
+++ packages/pyicu/trunk/debian/patches/series	2013-06-25 17:55:53 UTC (rev 24952)
@@ -1,3 +1,4 @@
 no-setuptools-please.diff
 platform-definitions-fix.diff
 fix_typo_in_deprecation_warning.patch
+rename_docs_module.patch

Modified: packages/pyicu/trunk/debian/rules
===================================================================
--- packages/pyicu/trunk/debian/rules	2013-06-25 16:27:51 UTC (rev 24951)
+++ packages/pyicu/trunk/debian/rules	2013-06-25 17:55:53 UTC (rev 24952)
@@ -20,23 +20,26 @@
 	
 	# 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/
+	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) $(PY3VERS); do  \
-	    (cd build-py$${py%%.*}; \
+	    (cd build/py$${py%%.*}; \
 	    python$$py setup.py build; \
 	    python$$py-dbg setup.py build); \
 	done
+	set -e; \
+	for file in `find $(CURDIR)/build -type f -name docs.py`; do \
+	  mv "$$file" "`dirname $$file`/icu_docs.py"; done
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	set -ex ;\
 	for test in `ls test/*.py`; do \
 	  for py in $(PYVERS) $(PY3VERS); do  \
-	    (cd build-py$${py%%.*}; \
+	    (cd build/py$${py%%.*}; \
 	    PYTHONPATH=`ls -d $$(pwd)/build/lib.*-$$py` \
 	      python$$py $$test ;\
 	    PYTHONPATH=`ls -d $$(pwd)/build/lib_d.*-$$py || ls -d $$(pwd)/build/lib.*-$$py-pydebug` \
@@ -53,7 +56,7 @@
 	rm -f install-stamp build-stamp
 	find . -name "*.pyc" -print0 | xargs -0 rm -f
 	find . -name __pycache__ -print0 | xargs -0 rm -rf
-	rm -rf build-py2 build-py3
+	rm -rf build
 	dh_clean 
 
 install: install-stamp
@@ -64,17 +67,16 @@
 	dh_installdirs
 	set -e; \
 	for py in $(PYVERS); do  \
-	    (cd build-py2; \
+	    (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)) ;\
 	done
 	set -e; \
 	for py in $(PY3VERS); do  \
-	    (cd build-py3; \
+	    (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