tags 582790 + pending tags 582795 + pending tags 583552 + pending thanks
Dear maintainer,I've prepared an NMU for libmei (versioned as 1.0.1-6.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer.
-- Jakub Wilk
diff -u libmei-1.0.1/debian/rules libmei-1.0.1/debian/rules --- libmei-1.0.1/debian/rules +++ libmei-1.0.1/debian/rules @@ -1,8 +1,11 @@ #!/usr/bin/make -f # Copyright 2008 Sylvestre Ledru <sylvestre.le...@inria.fr> +DEB_PYTHON_SYSTEM=pysupport + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/python-module.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk debian/stamp-autotools-files: diff -u libmei-1.0.1/debian/changelog libmei-1.0.1/debian/changelog --- libmei-1.0.1/debian/changelog +++ libmei-1.0.1/debian/changelog @@ -1,3 +1,18 @@ +libmei (1.0.1-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Replace ‘site-packages’ with ‘*-packages’ in debian/*.install to fix FTBFS + with Python 2.6 (closes: #582790) Thanks to Angel Abad for the bug report + and the initial patch. + * Update Build-Depends and debian/rules to use python-support to + byte-compile Python modules (closes: #583552). + * Fix bashisms in the configure script (closes: #582795). Thanks to Clint + Adams for the patch. + * Fix the mei_patch_lm.diff, so that it actually can be applied, and add it + to the series file. + + -- Jakub Wilk <jw...@debian.org> Fri, 28 May 2010 11:27:15 +0200 + libmei (1.0.1-6) unstable; urgency=low * Handle python 2.6 (Closes: #571495) diff -u libmei-1.0.1/debian/python-libmei.install libmei-1.0.1/debian/python-libmei.install --- libmei-1.0.1/debian/python-libmei.install +++ libmei-1.0.1/debian/python-libmei.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/python*/site-packages/mei/*.so* -debian/tmp/usr/lib/python*/site-packages/mei/*.py -debian/tmp/usr/lib/python*/site-packages/mei/*.a +debian/tmp/usr/lib/python*/*-packages/mei/*.so* +debian/tmp/usr/lib/python*/*-packages/mei/*.py +debian/tmp/usr/lib/python*/*-packages/mei/*.a diff -u libmei-1.0.1/debian/control libmei-1.0.1/debian/control --- libmei-1.0.1/debian/control +++ libmei-1.0.1/debian/control @@ -4,7 +4,8 @@ Maintainer: Debian Science Team <debian-science-maintain...@lists.alioth.debian.org> Uploaders: Sylvestre Ledru <sylves...@debian.org> Build-Depends: debhelper (>= 7), autotools-dev, cdbs, swig, libbft-dev (>= 1.1.2), - python-dev, quilt, autoconf, zlib1g-dev + python-support, python-dev, quilt, autoconf, zlib1g-dev +XS-Python-Version: all Standards-Version: 3.8.4 Homepage: http://www.code-saturne.org/ Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-saturne/libmei/ diff -u libmei-1.0.1/debian/patches/mei_patch_lm.diff libmei-1.0.1/debian/patches/mei_patch_lm.diff --- libmei-1.0.1/debian/patches/mei_patch_lm.diff +++ libmei-1.0.1/debian/patches/mei_patch_lm.diff @@ -1,7 +1,5 @@ -Index: configure.ac -=================================================================== ---- configure.ac (revision 30) -+++ configure.ac (working copy) +--- a/configure.ac ++++ b/configure.ac @@ -192,6 +192,8 @@ fi only in patch2: unchanged: --- libmei-1.0.1.orig/debian/patches/series +++ libmei-1.0.1/debian/patches/series @@ -0,0 +1,2 @@ +bashism_configure.diff +mei_patch_lm.diff only in patch2: unchanged: --- libmei-1.0.1.orig/debian/patches/bashism_configure.diff +++ libmei-1.0.1/debian/patches/bashism_configure.diff @@ -0,0 +1,40 @@ +Description: Fix bashism in the configure script. +Author: Clint Adams <sch...@debian.org> + +--- a/configure.ac ++++ b/configure.ac +@@ -302,14 +302,14 @@ + # Checks for SWIG + #---------------- + +- if test "x${SWIG_EXE}" == "xnone" ; then ++ if test "x${SWIG_EXE}" = "xnone" ; then + AC_PATH_PROG(SWIG, swig, "no") + else + AC_PATH_PROG(SWIG, swig, "no", [${SWIG_EXE}]) + fi + + +- if test "x${SWIG}" == "xno" ; then ++ if test "x${SWIG}" = "xno" ; then + AC_MSG_WARN([]) + AC_MSG_WARN([Swig executable not found]) + AC_MSG_WARN([Please install swig from http://www.swig.org]) +@@ -323,7 +323,7 @@ + # Checks for Python + #------------------ + +- if test "x${PYTHON_EXE}" == "xnone" ; then ++ if test "x${PYTHON_EXE}" = "xnone" ; then + AC_PATH_PROG([PYEXE], [python], ["no"]) + else + AC_PATH_PROG([PYEXE], [python], ["no"], [${PYTHON_EXE}]) +@@ -332,7 +332,7 @@ + PYTHON=${PYEXE} + AM_PATH_PYTHON([2.4],, PYTHON="no") + +- if test "x${PYTHON}" == "xno" ; then ++ if test "x${PYTHON}" = "xno" ; then + AC_MSG_WARN([]) + AC_MSG_WARN([Python interpreter not found]) + AC_MSG_WARN([Please install Python from http://www.python.org])
signature.asc
Description: Digital signature
