[Python-modules-commits] r3627 - in /packages/pyicu/trunk/debian: patches/00list patches/make-python-config.dpatch patches/make-test.dpatch pyversions rules

bzed-guest at users.alioth.debian.org bzed-guest at users.alioth.debian.org
Fri Nov 16 04:36:32 UTC 2007


Author: bzed-guest
Date: Fri Nov 16 04:36:31 2007
New Revision: 3627

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3627
Log:
ARGH.
buggy stuff :|

Added:
    packages/pyicu/trunk/debian/patches/make-python-config.dpatch   (with props)
    packages/pyicu/trunk/debian/patches/make-test.dpatch   (with props)
Modified:
    packages/pyicu/trunk/debian/patches/00list
    packages/pyicu/trunk/debian/pyversions
    packages/pyicu/trunk/debian/rules

Modified: packages/pyicu/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/patches/00list?rev=3627&op=diff
==============================================================================
--- packages/pyicu/trunk/debian/patches/00list (original)
+++ packages/pyicu/trunk/debian/patches/00list Fri Nov 16 04:36:31 2007
@@ -1,1 +1,3 @@
 64bit-fix
+make-test
+make-python-config

Added: packages/pyicu/trunk/debian/patches/make-python-config.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/patches/make-python-config.dpatch?rev=3627&op=file
==============================================================================
--- packages/pyicu/trunk/debian/patches/make-python-config.dpatch (added)
+++ packages/pyicu/trunk/debian/patches/make-python-config.dpatch Fri Nov 16 04:36:31 2007
@@ -1,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## make-python-config.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: The build-system is kinda broken. It should link against lpython2.X...
+
+ at DPATCH@
+diff -urNad pyicu~/Makefile pyicu/Makefile
+--- pyicu~/Makefile	2007-11-16 05:18:14.000000000 +0100
++++ pyicu/Makefile	2007-11-16 05:19:00.000000000 +0100
+@@ -98,16 +98,16 @@
+ 
+ ifeq ($(OS),Linux)
+ PYTHON_SITE=$(PREFIX_PYTHON)/lib/python$(PYTHON_VER)/site-packages
+-PYTHON_INC=$(PREFIX_PYTHON)/include/python$(PYTHON_VER)
++PYTHON_INC=`$(PYTHON)-config --includes`
+ PYICU_LIB=$(BINDIR)/_PyICU.so
+ ICU_INC=$(PREFIX_ICU)/include
+ ICU_LIB=$(PREFIX_ICU)/lib
+ ifeq ($(DEBUG),1)
+-CCFLAGS=-O0 -g -fPIC
+-LDFLAGS=-g
++CCFLAGS=-O0 -g `$(PYTHON)-config --cflags`
++LDFLAGS=-g `$(PYTHON)-config --ldflags`
+ else
+-CCFLAGS=-O2 -fPIC
+-LDFLAGS=
++CCFLAGS=-O2 -fPIC `$(PYTHON)-config --cflags`
++LDFLAGS=`$(PYTHON)-config --ldflags`
+ endif
+ OBJS=$(MODULES:%=$(BINDIR)/%.o)
+ else
+@@ -179,7 +179,7 @@
+ 	$(CXX) -c -o $@ $(CCFLAGS) $(PYDBG) -I$(PYTHON_INC) -I$(ICU_INC) $<
+ 
+ $(PYICU_LIB): $(OBJS) _PyICU.cpp
+-	$(CXX) -shared -o $@ -DPYICU_VER="\"$(VERSION)\"" $(CCFLAGS) $(PYDBG) -I$(PYTHON_INC) -I$(ICU_INC) _PyICU.cpp $(OBJS) -L$(ICU_LIB) -licui18n -licuuc -licudata
++	$(CXX) -shared -o $@ -DPYICU_VER="\"$(VERSION)\"" $(CCFLAGS) $(PYDBG) -I$(PYTHON_INC) -I$(ICU_INC) _PyICU.cpp $(OBJS) $(LDFLAGS) -L$(ICU_LIB) -licui18n -licuuc -licudata
+ else
+ 
+ ifeq ($(OS),Cygwin)

Propchange: packages/pyicu/trunk/debian/patches/make-python-config.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/pyicu/trunk/debian/patches/make-test.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/patches/make-test.dpatch?rev=3627&op=file
==============================================================================
--- packages/pyicu/trunk/debian/patches/make-test.dpatch (added)
+++ packages/pyicu/trunk/debian/patches/make-test.dpatch Fri Nov 16 04:36:31 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## make-test.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: implement tests properly
+
+ at DPATCH@
+diff -urNad pyicu~/Makefile pyicu/Makefile
+--- pyicu~/Makefile	2007-11-16 04:46:50.000000000 +0100
++++ pyicu/Makefile	2007-11-16 04:47:04.000000000 +0100
+@@ -200,8 +200,11 @@
+ all: env $(BINDIR) $(LIBS)
+ 	@echo build of $(BINDIR) complete
+ 
+-test:
+-	find test -name 'test_*.py' | xargs -n 1 $(PYTHON)
++test: all
++	set -e ;\
++	for test in `find test -name 'test_*.py'`; do \
++	    PYTHONPATH=$(CURDIR):$(BINDIR) $(PYTHON) $$test ;\
++	done
+ 
+ install: all
+ 	mkdir -p $(PYTHON_SITE)
+@@ -210,6 +213,7 @@
+ 
+ clean:
+ 	rm -rf $(BINDIR)
++	find . -name \*.pyc -print0 | xargs -0 rm -f
+ 
+ realclean: clean
+ 	rm -rf distrib

Propchange: packages/pyicu/trunk/debian/patches/make-test.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/pyicu/trunk/debian/pyversions
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/pyversions?rev=3627&op=diff
==============================================================================
--- packages/pyicu/trunk/debian/pyversions (original)
+++ packages/pyicu/trunk/debian/pyversions Fri Nov 16 04:36:31 2007
@@ -1,1 +1,1 @@
-2.3-
+2.5-

Modified: packages/pyicu/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/debian/rules?rev=3627&op=diff
==============================================================================
--- packages/pyicu/trunk/debian/rules (original)
+++ packages/pyicu/trunk/debian/rules Fri Nov 16 04:36:31 2007
@@ -8,29 +8,38 @@
 
 #this will change to libicu-dev, preparing everything to make the package
 #binNMUable when libicu-dev moves from experimental to unstable.
-LIBICUDEV:=libicu63-dev
+LIBICUDEV:=libicu36-dev
 ICU_VER:=$(shell dpkg -s $(LIBICUDEV) | \
                  grep '^Version'      | \
                  sed 's,Version: ,,;s,-.*,,g')
 
 include /usr/share/dpatch/dpatch.make
 
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+MAKETEST = all test
+endif
+
 build: patch build-stamp
 build-stamp:
 	dh_testdir
 	set -e ;\
 	for pyver in $(PYVERS); do \
-	    make PREFIX=/usr PREFIX_PYTHON=/usr PREFIX_ICU=/usr \
+	    make $(MAKETEST) 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/$(PKGNAME)/usr ;\
 	    make clean ;\
-	    make PREFIX=/usr PREFIX_PYTHON=/usr PREFIX_ICU=/usr \
+	    make $(MAKETEST) 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 install PREFIX_PYTHON=$(CURDIR)/debian/$(PKGNAME)-dbg/usr \
+	         DEBUG=1 ;\
 	    make clean DEBUG=1 ;\
 	done
+	find $(CURDIR)/debian/$(PKGNAME)-dbg/usr -name PyICU.py -print0 | \
+	    xargs -0 rm -f
+	find $(CURDIR)/debian/$(PKGNAME)/usr -name PyICU.py -print0 | \
+	    xargs -0 chmod 644
 	touch $@
 
 clean: clean-patched unpatch
@@ -50,6 +59,7 @@
 binary-arch: build
 	dh_testdir
 	dh_testroot
+	dh_installdocs
 	dh_installchangelogs CHANGES
 	dh_compress
 	dh_fixperms




More information about the Python-modules-commits mailing list