Package: magics++
Version: 2.10.0.dfsg-5.1
Severity: important
Tags: patch
Justification: fails to build from source
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmpMEwKzy
In Ubuntu, we've applied the attached patch to achieve the following:
* debian/python-magics++.install: Update install path for any python version
to fix a FTBFS issue with python 2.7 in natty (LP: #)
We thought you might be interested in doing the same.
-- System Information:
Debian Release: squeeze/sid
APT prefers maverick-updates
APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500,
'maverick-backports'), (500, 'maverick')
Architecture: i386 (i686)
Kernel: Linux 2.6.35-24-generic (SMP w/2 CPU cores)
Locale: LANG=en_ZA.utf8, LC_CTYPE=en_ZA.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru magics++-2.10.0.dfsg/debian/changelog magics++-2.10.0.dfsg/debian/changelog
diff -Nru magics++-2.10.0.dfsg/debian/control magics++-2.10.0.dfsg/debian/control
--- magics++-2.10.0.dfsg/debian/control 2010-10-17 05:45:42.000000000 +1300
+++ magics++-2.10.0.dfsg/debian/control 2011-01-04 00:57:22.000000000 +1300
@@ -57,7 +57,7 @@
Package: python-magics++
Section: python
Architecture: any
-Depends: libmagplus3 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}, python2.6, python-numpy
+Depends: libmagplus3 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}, python, python-numpy
Description: python support for Magics++
Magics++ is the latest generation of the ECMWF's Meteorological plotting
software MAGICS. Although completely redesigned in C++, it is intended to be
diff -Nru magics++-2.10.0.dfsg/debian/python-magics++.dirs magics++-2.10.0.dfsg/debian/python-magics++.dirs
--- magics++-2.10.0.dfsg/debian/python-magics++.dirs 2010-10-17 05:45:42.000000000 +1300
+++ magics++-2.10.0.dfsg/debian/python-magics++.dirs 1970-01-01 12:00:00.000000000 +1200
@@ -1,2 +0,0 @@
-usr/lib/pymodules/python2.6
-usr/share/pyshared
diff -Nru magics++-2.10.0.dfsg/debian/python-magics++.install magics++-2.10.0.dfsg/debian/python-magics++.install
--- magics++-2.10.0.dfsg/debian/python-magics++.install 2010-10-17 05:45:42.000000000 +1300
+++ magics++-2.10.0.dfsg/debian/python-magics++.install 2011-01-03 23:21:42.000000000 +1300
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/python2.6/site-packages/*.so usr/lib/pymodules/python2.6
-debian/tmp/usr/lib/python2.6/site-packages/*.py usr/share/pyshared
+debian/tmp/usr/lib/python*/*-packages/*.so
+debian/tmp/usr/lib/python*/*-packages/*.py
diff -Nru magics++-2.10.0.dfsg/debian/pyversions magics++-2.10.0.dfsg/debian/pyversions
--- magics++-2.10.0.dfsg/debian/pyversions 2010-10-17 05:45:42.000000000 +1300
+++ magics++-2.10.0.dfsg/debian/pyversions 2011-01-03 02:37:45.000000000 +1300
@@ -1 +1 @@
-2.6
+2.6-
diff -Nru magics++-2.10.0.dfsg/debian/rules magics++-2.10.0.dfsg/debian/rules
--- magics++-2.10.0.dfsg/debian/rules 2010-10-17 05:45:42.000000000 +1300
+++ magics++-2.10.0.dfsg/debian/rules 2011-01-03 23:32:08.000000000 +1300
@@ -14,7 +14,7 @@
DEB_AUTO_UPDATE_LIBTOOL := pre
DEB_SHLIBDEPS_LIBRARY_magics++ := libmagplus3
DEB_SHLIBDEPS_INCLUDE_magics++ := debian/libmagplus3/usr/lib/
-DEB_MAKE_ENVVARS:= MAGPLUS_HOME=`pwd` PYTHON_INCLUDE_DIR=/usr/include/python2.6
+DEB_MAKE_ENVVARS:= MAGPLUS_HOME=`pwd` PYTHON_INCLUDE_DIR=/usr/include/$(shell pyversions -d)
DEB_PYTHON_SYSTEM:= pysupport
clean::
