tags 617020 + patch pending
tags 713214 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for python-pqueue (versioned as 0.2-7.2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
reverted:
--- python-pqueue-0.2/debian/pycompat
+++ python-pqueue-0.2.orig/debian/pycompat
@@ -1 +0,0 @@
-2
diff -u python-pqueue-0.2/debian/rules python-pqueue-0.2/debian/rules
--- python-pqueue-0.2/debian/rules
+++ python-pqueue-0.2/debian/rules
@@ -57,7 +57,7 @@
dh_compress
dh_fixperms
# dh_makeshlibs
- dh_pycentral
+ dh_python2
dh_installdeb
# dh_perl
dh_shlibdeps
diff -u python-pqueue-0.2/debian/changelog python-pqueue-0.2/debian/changelog
--- python-pqueue-0.2/debian/changelog
+++ python-pqueue-0.2/debian/changelog
@@ -1,3 +1,11 @@
+python-pqueue (0.2-7.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with python2.7 multiarch locations (Closes: #713214).
+ * Convert to dh_python2 (Closes: #617020).
+
+ -- Luca Falavigna <dktrkr...@debian.org> Sun, 07 Jul 2013 12:17:50 +0200
+
python-pqueue (0.2-7.1) unstable; urgency=low
* NMU
diff -u python-pqueue-0.2/debian/control python-pqueue-0.2/debian/control
--- python-pqueue-0.2/debian/control
+++ python-pqueue-0.2/debian/control
@@ -3,13 +3,11 @@
Priority: optional
Maintainer: Chris Lawrence <lawre...@debian.org>
Standards-Version: 3.7.2
-Build-Depends: python-all-dev (>= 2.3.5-10), debhelper (>= 5.0.37.2), python-central (>= 0.4.17)
-XS-Python-Version: all
+Build-Depends: python-all-dev (>= 2.6.6-3~), debhelper (>= 5.0.37.2)
Package: python-pqueue
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}
-XB-Python-Version: ${python:Versions}
Provides: ${python:Provides}
Description: a priority queue extension for Python
This C extension implements a priority-queue object using a Fibonacci
only in patch2:
unchanged:
--- python-pqueue-0.2.orig/configure
+++ python-pqueue-0.2/configure
@@ -612,6 +612,7 @@
py_cv_python_version="$PYTHON_VERSION"
fi
PYTHON_VERSION="$py_cv_python_version"
+py_configdir="`python${PYTHON_VERSION}-config --configdir`"
echo "$ac_t""$PYTHON_VERSION" 1>&6
VERSION=$PYTHON_VERSION
@@ -630,7 +631,7 @@
PYTHON_PREFIX="$with_python_prefix"
fi
echo $ac_n "checking python installation prefix""... $ac_c" 1>&6
-echo "configure:634: checking python installation prefix" >&5
+echo "configure:635: checking python installation prefix" >&5
if test -z "$PYTHON_PREFIX"; then
if eval "test \"`echo '$''{'py_cv_python_prefix'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -659,7 +660,7 @@
PYTHON_EXEC_PREFIX="$with_python_exec_prefix"
fi
echo $ac_n "checking python installation exec_prefix""... $ac_c" 1>&6
-echo "configure:663: checking python installation exec_prefix" >&5
+echo "configure:664: checking python installation exec_prefix" >&5
if test -z "$PYTHON_EXEC_PREFIX"; then
if eval "test \"`echo '$''{'py_cv_python_exec_prefix'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -678,11 +679,11 @@
echo $ac_n "checking definitions in Python library makefile""... $ac_c" 1>&6
-echo "configure:682: checking definitions in Python library makefile" >&5
+echo "configure:683: checking definitions in Python library makefile" >&5
if eval "test \"`echo '$''{'py_cv_python_makefile_vars'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- py_makefile="${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/config/Makefile"
+ py_makefile="$py_configdir/Makefile"
py_cv_python_makefile_LINKCC=''
py_cv_python_makefile_SGI_ABI=''
py_cv_python_makefile_LDLAST=''
@@ -763,14 +764,14 @@
-if test -x "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/install-sh"; then
- INSTALL="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/install-sh"
+if test -x "$py_configdir/install-sh"; then
+ INSTALL="$py_configdir/install-sh"
else
# Extract the first word of "install", so it can be a program name with args.
set dummy install; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
+echo "configure:775: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -808,7 +809,7 @@
echo $ac_n "checking location of python library""... $ac_c" 1>&6
-echo "configure:812: checking location of python library" >&5
+echo "configure:813: checking location of python library" >&5
if eval "test \"`echo '$''{'py_cv_python_library_dir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -829,7 +830,7 @@
echo $ac_n "checking location of python shared modules""... $ac_c" 1>&6
-echo "configure:833: checking location of python shared modules" >&5
+echo "configure:834: checking location of python shared modules" >&5
if eval "test \"`echo '$''{'py_cv_python_module_dir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -859,21 +860,21 @@
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:863: checking for inline" >&5
+echo "configure:864: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 870 "configure"
+#line 871 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -899,7 +900,7 @@
esac
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:903: checking how to run the C preprocessor" >&5
+echo "configure:904: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -914,13 +915,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 918 "configure"
+#line 919 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -931,13 +932,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 935 "configure"
+#line 936 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -948,13 +949,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 952 "configure"
+#line 953 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -979,12 +980,12 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:983: checking for ANSI C header files" >&5
+echo "configure:984: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 988 "configure"
+#line 989 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -992,7 +993,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1009,7 +1010,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1013 "configure"
+#line 1014 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1027,7 +1028,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1031 "configure"
+#line 1032 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1048,7 +1049,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1052 "configure"
+#line 1053 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1059,7 +1060,7 @@
exit (0); }
EOF
-if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1444,7 +1445,7 @@
EOF
cat >> $CONFIG_STATUS <<EOF
-MAKESETUP="${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/config/makesetup"
+MAKESETUP="${py_configdir}/makesetup"
EOF
cat >> $CONFIG_STATUS <<\EOF
only in patch2:
unchanged:
--- python-pqueue-0.2.orig/aclocal.m4
+++ python-pqueue-0.2/aclocal.m4
@@ -49,6 +49,7 @@
py_cv_python_version="$PYTHON_VERSION"
fi
PYTHON_VERSION="$py_cv_python_version"
+py_configdir="`python${PYTHON_VERSION}-config --configdir`"
AC_MSG_RESULT($PYTHON_VERSION)
VERSION=$PYTHON_VERSION
AC_SUBST(VERSION)
@@ -107,7 +108,7 @@
AC_REQUIRE([PY_PYTHON_EXEC_PREFIX])
AC_MSG_CHECKING(definitions in Python library makefile)
AC_CACHE_VAL(py_cv_python_makefile_vars,
-[py_makefile="${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/config/Makefile"
+[py_makefile="$py_configdir/Makefile"
dnl set defaults for these variables so they work with Python 1.4
py_cv_python_makefile_LINKCC=''
py_cv_python_makefile_SGI_ABI=''
@@ -192,8 +193,8 @@
AC_DEFUN(PY_CHECK_INSTALL,
[AC_REQUIRE([PY_PYTHON_VERSION])
AC_REQUIRE([PY_PYTHON_EXEC_PREFIX])
-if test -x "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/install-sh"; then
- INSTALL="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/install-sh"
+if test -x "$py_configdir/install-sh"; then
+ INSTALL="$py_configdir/install-sh"
AC_SUBST(INSTALL)
else
AC_PATH_PROG(INSTALL, install, install)
@@ -252,7 +253,7 @@
AC_OUTPUT($2 $3 $1.pre,dnl
[echo creating $1
$MAKESETUP -m $1.pre -c - $2],dnl
-[MAKESETUP="${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/config/makesetup"
+[MAKESETUP="${py_configdir}/makesetup"
])
])
