[Python-modules-commits] r12013 - in packages/pythonmagick/trunk/debian/patches (3 files)
azatoth-guest at users.alioth.debian.org
azatoth-guest at users.alioth.debian.org
Sun Feb 28 13:47:50 UTC 2010
Date: Sunday, February 28, 2010 @ 13:47:44
Author: azatoth-guest
Revision: 12013
forgot to remove
Deleted:
packages/pythonmagick/trunk/debian/patches/00list
packages/pythonmagick/trunk/debian/patches/01_autofoo_fixes.dpatch
packages/pythonmagick/trunk/debian/patches/02_set_minimum_python_version_to_2.4.dpatch
Deleted: packages/pythonmagick/trunk/debian/patches/00list
===================================================================
--- packages/pythonmagick/trunk/debian/patches/00list 2010-02-28 13:46:22 UTC (rev 12012)
+++ packages/pythonmagick/trunk/debian/patches/00list 2010-02-28 13:47:44 UTC (rev 12013)
@@ -1,2 +0,0 @@
-01_autofoo_fixes
-02_set_minimum_python_version_to_2.4
Deleted: packages/pythonmagick/trunk/debian/patches/01_autofoo_fixes.dpatch
===================================================================
--- packages/pythonmagick/trunk/debian/patches/01_autofoo_fixes.dpatch 2010-02-28 13:46:22 UTC (rev 12012)
+++ packages/pythonmagick/trunk/debian/patches/01_autofoo_fixes.dpatch 2010-02-28 13:47:44 UTC (rev 12013)
@@ -1,180 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_autofoo_fixes.dpatch by Thomas Viehmann <tv at beamnet.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes to autofoo:
-## DP: - use python?.?-config instead of locate in python detection macro
-## DP: - python boost detection
-## DP: and reverse upstream's hardcoding of the lib in Makefile.am
-
- at DPATCH@
-
---- pythonmagick-0.9.1.orig/configure
-+++ pythonmagick-0.9.1/configure
-@@ -16209,7 +16209,7 @@
- as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`
-+ ax_python_header=`${ax_python_bin}-config --include | sed 's/-I//g;s/^ *//;s/ .*//'`
- else
- ax_python_header=no
- fi
-@@ -16324,6 +16324,13 @@
- $as_echo "$ac_cv_boost_python" >&6; }
- if test "$ac_cv_boost_python" = "yes"; then
-
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_BOOST_PYTHON /**/
- _ACEOF
-@@ -16339,14 +16346,14 @@
- fi
-
- for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python; do
-- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
--$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-+ as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for main in -l$ax_lib" >&5
-+$as_echo_n "checking for main in -l$ax_lib... " >&6; }
- if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$ax_lib $LIBS"
-+LIBS="-l$ax_lib -l${PYTHON_LIB} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -16354,17 +16361,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char exit ();
-+
- int
- main ()
- {
--return exit ();
-+return main ();
- ;
- return 0;
- }
-@@ -16384,7 +16385,7 @@
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-+ test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
-@@ -16415,6 +16416,12 @@
-
- done
-
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
- fi
-
-
---- pythonmagick-0.9.1.orig/Makefile.in
-+++ pythonmagick-0.9.1/Makefile.in
-@@ -276,7 +276,7 @@
- _PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS)
-
- # And the libraries to include
--_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) -lboost_python $(MAGICKPP_LIBS) $(MAGICK_LIBS) -l$(PYTHON_LIB)
-+_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) -l$(BOOST_PYTHON_LIB) $(MAGICKPP_LIBS) $(MAGICK_LIBS) -l$(PYTHON_LIB)
- EXTRA_DIST = autogen.pl SConstruct pyste_src LICENSE
-
- # Automatically reconfigure libtool
---- pythonmagick-0.9.1.orig/Makefile.am
-+++ pythonmagick-0.9.1/Makefile.am
-@@ -28,7 +28,7 @@
- _PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS)
-
- # And the libraries to include
--_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) -lboost_python $(MAGICKPP_LIBS) $(MAGICK_LIBS) -l$(PYTHON_LIB)
-+_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) -l$(BOOST_PYTHON_LIB) $(MAGICKPP_LIBS) $(MAGICK_LIBS) -l$(PYTHON_LIB)
-
- EXTRA_DIST = autogen.pl SConstruct pyste_src LICENSE
-
---- pythonmagick-0.9.1.orig/m4/ax_boost_python.m4
-+++ pythonmagick-0.9.1/m4/ax_boost_python.m4
-@@ -75,6 +75,8 @@
- CPPFLAGS=$CPPFLAGS_SAVE
- ])
- if test "$ac_cv_boost_python" = "yes"; then
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
- AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is available])
- ax_python_lib=boost_python
- AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the boost python library or suffix to use]),
-@@ -83,8 +85,9 @@
- ax_boost_python_lib=boost_python-$with_boost_python
- fi])
- for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python; do
-- AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break])
-+ AC_CHECK_LIB($ax_lib, main, [BOOST_PYTHON_LIB=$ax_lib break],,[-l${PYTHON_LIB}])
- done
- AC_SUBST(BOOST_PYTHON_LIB)
-+ AC_LANG_RESTORE
- fi
- ])dnl
---- pythonmagick-0.9.1.orig/m4/ax_python.m4
-+++ pythonmagick-0.9.1/m4/ax_python.m4
-@@ -64,7 +64,7 @@
- if test x$ax_python_bin != x; then
- AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
- AC_CHECK_HEADER([$ax_python_bin/Python.h],
-- [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
-+ [[ax_python_header=`${ax_python_bin}-config --include | sed 's/-I//g;s/^ *//;s/ .*//'`]],
- ax_python_header=no)
- if test $ax_python_lib != no; then
- if test $ax_python_header != no; then
---- pythonmagick-0.9.1.orig/helpers_src/Makefile.in
-+++ pythonmagick-0.9.1/helpers_src/Makefile.in
-@@ -226,9 +226,9 @@
- exit 1;; \
- esac; \
- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers_src/Makefile'; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu helpers_src/Makefile'; \
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --foreign helpers_src/Makefile
-+ $(AUTOMAKE) --gnu helpers_src/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
---- pythonmagick-0.9.1.orig/pythonmagick_src/Makefile.in
-+++ pythonmagick-0.9.1/pythonmagick_src/Makefile.in
-@@ -382,9 +382,9 @@
- exit 1;; \
- esac; \
- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pythonmagick_src/Makefile'; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pythonmagick_src/Makefile'; \
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --foreign pythonmagick_src/Makefile
-+ $(AUTOMAKE) --gnu pythonmagick_src/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
Deleted: packages/pythonmagick/trunk/debian/patches/02_set_minimum_python_version_to_2.4.dpatch
===================================================================
--- packages/pythonmagick/trunk/debian/patches/02_set_minimum_python_version_to_2.4.dpatch 2010-02-28 13:46:22 UTC (rev 12012)
+++ packages/pythonmagick/trunk/debian/patches/02_set_minimum_python_version_to_2.4.dpatch 2010-02-28 13:47:44 UTC (rev 12013)
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_set_minimum_python_version_to_2.4.dpatch by Thomas Viehmann <tv at beamnet.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: make Python 2.4 the minimum required one
-
- at DPATCH@
-
---- pythonmagick-0.9.1.orig/configure.ac
-+++ pythonmagick-0.9.1/configure.ac
-@@ -24,7 +24,7 @@
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_PROG_LIBTOOL
--AM_PATH_PYTHON(2.6)
-+AM_PATH_PYTHON(2.4)
- PKG_PROG_PKG_CONFIG
-
- # Add configure option --enable-maintainer-mode which enables dependency
---- pythonmagick-0.9.1.orig/configure
-+++ pythonmagick-0.9.1/configure
-@@ -15331,12 +15331,12 @@
-
- if test -n "$PYTHON"; then
- # If the user set $PYTHON, use it and don't search something else.
-- { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.6" >&5
--$as_echo_n "checking whether $PYTHON version >= 2.6... " >&6; }
-+ { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
-+$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
- prog="import sys, string
- # split strings by '.' and convert to numeric. Append some zeros
- # because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('2.6', '.')) + [0, 0, 0]
-+minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
- minverhex = 0
- for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
- sys.exit(sys.hexversion < minverhex)"
-@@ -15357,8 +15357,8 @@
- else
- # Otherwise, try each interpreter until we find one that satisfies
- # VERSION.
-- { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.6" >&5
--$as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; }
-+ { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.4" >&5
-+$as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; }
- if test "${am_cv_pathless_PYTHON+set}" = set; then
- $as_echo_n "(cached) " >&6
- else
-@@ -15368,7 +15368,7 @@
- prog="import sys, string
- # split strings by '.' and convert to numeric. Append some zeros
- # because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('2.6', '.')) + [0, 0, 0]
-+minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
- minverhex = 0
- for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
- sys.exit(sys.hexversion < minverhex)"
More information about the Python-modules-commits
mailing list