[Python-modules-commits] r11039 - in packages/pyicu/trunk/debian (3 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Friday, January 8, 2010 @ 00:19:18
  Author: jwilk-guest
Revision: 11039

* debian/rules:
  - Don't rely on particular names for build/ subdirectories. 
    Thanks to Cyril Brulebois for the patch.
* debian/patches/platform-definitions-fix.dpatch:
  - Handle kFreeBSD platform (Closes: #519099). Thanks to Cyril Brulebois
    for new the patch.

Modified:
  packages/pyicu/trunk/debian/changelog
  packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch
  packages/pyicu/trunk/debian/rules

Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog	2010-01-07 22:43:36 UTC (rev 11038)
+++ packages/pyicu/trunk/debian/changelog	2010-01-08 00:19:18 UTC (rev 11039)
@@ -1,8 +1,14 @@
 pyicu (0.8.1-4) UNRELEASED; urgency=low
 
   * Put the *-dbg package into section debug.
+  * debian/rules:
+    - Don't rely on particular names for build/ subdirectories. 
+      Thanks to Cyril Brulebois for the patch.
+  * debian/patches/platform-definitions-fix.dpatch:
+    - Handle kFreeBSD platform (Closes: #519099). Thanks to Cyril Brulebois
+      for new the patch.
 
- -- Jakub Wilk <ubanus at users.sf.net>  Thu, 07 Jan 2010 23:39:43 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Thu, 07 Jan 2010 23:46:42 +0100
 
 pyicu (0.8.1-3) unstable; urgency=low
 

Modified: packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch	2010-01-07 22:43:36 UTC (rev 11038)
+++ packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch	2010-01-08 00:19:18 UTC (rev 11039)
@@ -1,37 +1,47 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## platform-definitions-fix.dpatch by Bernd Zeimetz <bzed at debian.org>
+## platform-definitions-fix.dpatch by Cyril Brulebois <kibi 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.
 
 @DPATCH@
-diff -urNad pyicu~/setup.py pyicu/setup.py
---- pyicu~/setup.py	2009-03-12 17:15:41.000000000 +0100
-+++ pyicu/setup.py	2009-03-12 17:17:29.000000000 +0100
-@@ -34,22 +34,22 @@
+--- pyicu-0.8.1/setup.py
++++ pyicu-0.8.1+kbsd/setup.py
+@@ -34,25 +31,33 @@
+     'win32': ['icuin', 'icuuc', 'icudt'],
+ }
+ 
++my_platform = sys.platform
++# Linux is linux2-* on various platforms (#519099):
++if my_platform.startswith('linux2'):
++    my_platform = 'linux2'
++# GNU/kFreeBSD mostly behaves as GNU/Linux for userland:
++if my_platform.startswith('gnukfreebsd'):
++    my_platform = 'linux2'
++
  if 'PYICU_INCLUDES' in os.environ:
      _includes = os.environ['PYICU_INCLUDES'].split(os.pathsep)
  else:
 -    _includes = INCLUDES[sys.platform]
-+    _includes = INCLUDES[sys.platform.split('-')[0]]
++    _includes = INCLUDES[my_platform]
  
  if 'PYICU_CFLAGS' in os.environ:
      _cflags = os.environ['PYICU_CFLAGS'].split(os.pathsep)
  else:
 -    _cflags = CFLAGS[sys.platform]
-+    _cflags = CFLAGS[sys.platform.split('-')[0]]
++    _cflags = CFLAGS[my_platform]
  
  if 'PYICU_LFLAGS' in os.environ:
      _lflags = os.environ['PYICU_LFLAGS'].split(os.pathsep)
  else:
 -    _lflags = LFLAGS[sys.platform]
-+    _lflags = LFLAGS[sys.platform.split('-')[0]]
++    _lflags = LFLAGS[my_platform]
  
  if 'PYICU_LIBRARIES' in os.environ:
      _libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep)
  else:
 -    _libraries = LIBRARIES[sys.platform]
-+    _libraries = LIBRARIES[sys.platform.split('-')[0]]
++    _libraries = LIBRARIES[my_platform]
  
  
  setup(name="PyICU",

Modified: packages/pyicu/trunk/debian/rules
===================================================================
--- packages/pyicu/trunk/debian/rules	2010-01-07 22:43:36 UTC (rev 11038)
+++ packages/pyicu/trunk/debian/rules	2010-01-08 00:19:18 UTC (rev 11039)
@@ -23,9 +23,9 @@
 	set -e ;\
 	for test in `ls test/*.py`; do \
 	  for py in $(PYVERS); do  \
-	    PYTHONPATH=$(CURDIR)/build/lib.$(DEB_BUILD_ARCH_OS)-$(shell uname -m)-$$py \
+	    PYTHONPATH=`ls -d $(CURDIR)/build/lib.*-*-$$py` \
 	      python$$py $$test ;\
-	    PYTHONPATH=$(CURDIR)/build/lib_d.$(DEB_BUILD_ARCH_OS)-$(shell uname -m)-$$py \
+	    PYTHONPATH=`ls -d $(CURDIR)/build/lib_d.*-*-$$py` \
 	      python$$py-dbg $$test ;\
 	  done ;\
 	done