[Python-modules-commits] r2890 - in /packages/pythonmagick/trunk/debian: control patches/build-system.dpatch rules

azatoth-guest at users.alioth.debian.org azatoth-guest at users.alioth.debian.org
Sun Jul 29 00:05:17 UTC 2007


Author: azatoth-guest
Date: Sun Jul 29 00:05:17 2007
New Revision: 2890

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2890
Log:
FFS, cant get the boost check to work, WHY!!!!!!!!!!!!!!!!!!!!! (kill kill kill)

Modified:
    packages/pythonmagick/trunk/debian/control
    packages/pythonmagick/trunk/debian/patches/build-system.dpatch
    packages/pythonmagick/trunk/debian/rules

Modified: packages/pythonmagick/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pythonmagick/trunk/debian/control?rev=2890&op=diff
==============================================================================
--- packages/pythonmagick/trunk/debian/control (original)
+++ packages/pythonmagick/trunk/debian/control Sun Jul 29 00:05:17 2007
@@ -7,6 +7,6 @@
 
 Package: python-magick
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends} libmagick++9, libboost-python1.34.0
+Depends: ${shlibs:Depends}, ${misc:Depends} libmagick++9c2a, libboost-python1.34.0
 Description: an object-oriented Python interface to ImageMagick
  PythonMagick an object-oriented Python interface to ImageMagick

Modified: packages/pythonmagick/trunk/debian/patches/build-system.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pythonmagick/trunk/debian/patches/build-system.dpatch?rev=2890&op=diff
==============================================================================
--- packages/pythonmagick/trunk/debian/patches/build-system.dpatch (original)
+++ packages/pythonmagick/trunk/debian/patches/build-system.dpatch Sun Jul 29 00:05:17 2007
@@ -7,41 +7,41 @@
 @DPATCH@
 diff -urNad pythonmagick~/Makefile.am pythonmagick/Makefile.am
 --- pythonmagick~/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/Makefile.am	2007-07-28 17:34:00.000000000 +0200
++++ pythonmagick/Makefile.am	2007-07-29 02:02:25.000000000 +0200
 @@ -0,0 +1,24 @@
 +# Library built from two directories
 +SUBDIRS = pythonmagick_src helpers_src
 +
 +# where to put the bastard
-+pymagickexecdir = $(pyexecdir)/$(PACKAGE)
++pymagickexecdir = $(pyexecdir)/$(PACKAGE_NAME)
 +
 +# name of our library
-+pymagickexec_LTLIBRARIES = libpython-imagemagick.la
++pymagickexec_LTLIBRARIES = _PythonMagick.la
 +
 +# the python initalization code
 +pymagickexec_PYTHON = PythonMagick/__init__.py
 +
 +# EMPTY! we dont have any sources at top level
-+libpython_imagemagick_la_SOURCES =
++_PythonMagick_la_SOURCES =
 +
 +# A dummy to tell that we are building c++
-+nodist_EXTRA_libpython_imagemagick_la_SOURCES = dummy.cpp
++nodist_EXTRA__PythonMagick_la_SOURCES = dummy.cpp
 +
 +# Flags are always good to have
-+libpython_imagemagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS)
++_PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS) -l$(BOOST_PYTHON_LIBS) $(MAGICKPP_LIBS) $(MAGICK_LIBS)
 +
 +# And the libraries to include
-+libpython_imagemagick_la_LIBADD = pythonmagick_src/libpymagick.la \
++_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la \
 +								  helpers_src/libhelper.la
 diff -urNad pythonmagick~/configure.ac pythonmagick/configure.ac
 --- pythonmagick~/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/configure.ac	2007-07-28 17:34:00.000000000 +0200
++++ pythonmagick/configure.ac	2007-07-29 02:02:25.000000000 +0200
 @@ -0,0 +1,42 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ(2.61)
-+AC_INIT([pythonmagick],[0.6],[])
++AC_INIT([PythonMagick],[0.6],[])
 +AC_CONFIG_SRCDIR([pythonmagick_src/_PathLinetoAbs.cpp])
 +AC_CONFIG_HEADER([config.h])
 +
@@ -81,17 +81,244 @@
 +AC_OUTPUT
 diff -urNad pythonmagick~/helpers_src/Makefile.am pythonmagick/helpers_src/Makefile.am
 --- pythonmagick~/helpers_src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/helpers_src/Makefile.am	2007-07-28 17:34:00.000000000 +0200
++++ pythonmagick/helpers_src/Makefile.am	2007-07-29 02:02:25.000000000 +0200
 @@ -0,0 +1,5 @@
 +noinst_LTLIBRARIES = libhelper.la
 +
 +libhelper_la_SOURCES = Blob.cpp
 +libhelper_la_LIBS = $(MAGICKPP_LIBS)
 +libhelper_la_CXXFLAGS = $(MAGICKPP_CFLAGS)
+diff -urNad pythonmagick~/m4/ax_boost_python.m4 pythonmagick/m4/ax_boost_python.m4
+--- pythonmagick~/m4/ax_boost_python.m4	1970-01-01 01:00:00.000000000 +0100
++++ pythonmagick/m4/ax_boost_python.m4	2007-07-29 02:04:20.000000000 +0200
+@@ -0,0 +1,118 @@
++##### http://autoconf-archive.cryp.to/ax_boost_python.html
++#
++# SYNOPSIS
++#
++#   AX_BOOST_PYTHON
++#
++# DESCRIPTION
++#
++#   This macro checks to see if the Boost.Python library is installed.
++#   It also attempts to guess the currect library name using several
++#   attempts. It tries to build the library name using a user supplied
++#   name or suffix and then just the raw library.
++#
++#   If the library is found, HAVE_BOOST_PYTHON is defined and
++#   BOOST_PYTHON_LIB is set to the name of the library.
++#
++#   This macro calls AC_SUBST(BOOST_PYTHON_LIB).
++#
++#   In order to ensure that the Python headers are specified on the
++#   include path, this macro requires AX_PYTHON to be called.
++#
++# LAST MODIFICATION
++#
++#   2005-05-20
++#
++# COPYLEFT
++#
++#   Copyright (c) 2005 Michael Tindal <mtindal at paradoxpoint.com>
++#
++#   This program is free software; you can redistribute it and/or
++#   modify it under the terms of the GNU General Public License as
++#   published by the Free Software Foundation; either version 2 of the
++#   License, or (at your option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++#   General Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License
++#   along with this program; if not, write to the Free Software
++#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++#   02111-1307, USA.
++#
++#   As a special exception, the respective Autoconf Macro's copyright
++#   owner gives unlimited permission to copy, distribute and modify the
++#   configure scripts that are the output of Autoconf when processing
++#   the Macro. You need not follow the terms of the GNU General Public
++#   License when using or distributing such scripts, even though
++#   portions of the text of the Macro appear in them. The GNU General
++#   Public License (GPL) does govern all other use of the material that
++#   constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the
++#   Autoconf Macro released by the Autoconf Macro Archive. When you
++#   make and distribute a modified version of the Autoconf Macro, you
++#   may extend this special exception to the GPL to apply to your
++#   modified version as well.
++
++AC_DEFUN([AX_BOOST_PYTHON],
++		[AC_REQUIRE([AX_PYTHON])dnl
++		AC_CACHE_CHECK(whether the Boost::Python library is available,
++			ac_cv_boost_python,
++			[AC_LANG_SAVE
++			AC_LANG_CPLUSPLUS
++			CPPFLAGS_SAVE=$CPPFLAGS
++			if test x$PYTHON_INCLUDE_DIR != x; then
++			CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
++			fi
++			AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
++#include <boost/python/module.hpp>
++					using namespace boost::python;
++					BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
++					[[return 0;]]),
++				ac_cv_boost_python=yes, ac_cv_boost_python=no)
++			AC_LANG_RESTORE
++			CPPFLAGS=$CPPFLAGS_SAVE
++			])
++		if test "$ac_cv_boost_python" = "yes"; then
++		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 to use]),
++			[if test "x$with_boost_python" != "xno"; then
++			ax_python_lib=$with_boost_python;
++			fi],
++			[for i in mt st gcc-mt gcc gcc41-mt gcc41 gcc42-mt gcc42; do
++			ax_python_lib_extra="$ax_python_lib_extra $ax_python_lib-$i";
++			done;
++			ax_python_lib="$ax_python_lib $ax_python_lib_extra";])
++	AC_LANG_SAVE
++	AC_LANG_CPLUSPLUS
++	CPPFLAGS_SAVE=$CPPFLAGS
++	if test x$PYTHON_INCLUDE_DIR != x; then
++	CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
++	fi
++
++	LIBS_SAVE=$LIBS
++	for i in $ax_python_lib; do
++	ax_var=AS_TR_SH(ax_$i);
++	LIBS=-l$i
++	AC_CACHE_CHECK([if $i is available], $ax_var, [AC_LINK_IFELSE([[
++#include <boost/python/module.hpp>
++				using namespace boost::python;
++				BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
++				ax_result=yes,
++				ax_result=no)])
++	AC_MSG_RESULT($ax_result)
++	if test $ax_result = yes; then
++		BOOST_PYTHON_LIBS= $LIBS;
++		break;
++	fi;
++	done;
++	LIBS=$LIBS_SAVE
++	AC_SUBST(BOOST_PYTHON_LIBS)
++	fi
++	AC_LANG_RESTORE
++	CPPFLAGS=$CPPFLAGS_SAVE
++	])dnl
+diff -urNad pythonmagick~/m4/ax_python.m4 pythonmagick/m4/ax_python.m4
+--- pythonmagick~/m4/ax_python.m4	1970-01-01 01:00:00.000000000 +0100
++++ pythonmagick/m4/ax_python.m4	2007-07-29 02:02:25.000000000 +0200
+@@ -0,0 +1,101 @@
++##### http://autoconf-archive.cryp.to/ax_python.html
++#
++# SYNOPSIS
++#
++#   AX_PYTHON
++#
++# DESCRIPTION
++#
++#   This macro does a complete Python development environment check.
++#
++#   It recurses through several python versions (from 2.1 to 2.4 in
++#   this version), looking for an executable. When it finds an
++#   executable, it looks to find the header files and library.
++#
++#   It sets PYTHON_BIN to the name of the python executable,
++#   PYTHON_INCLUDE_DIR to the directory holding the header files, and
++#   PYTHON_LIB to the name of the Python library.
++#
++#   This macro calls AC_SUBST on PYTHON_BIN (via AC_CHECK_PROG),
++#   PYTHON_INCLUDE_DIR and PYTHON_LIB.
++#
++# LAST MODIFICATION
++#
++#   2004-09-20
++#
++# COPYLEFT
++#
++#   Copyright (c) 2004 Michael Tindal <mtindal at paradoxpoint.com>
++#
++#   This program is free software; you can redistribute it and/or
++#   modify it under the terms of the GNU General Public License as
++#   published by the Free Software Foundation; either version 2 of the
++#   License, or (at your option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++#   General Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License
++#   along with this program; if not, write to the Free Software
++#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++#   02111-1307, USA.
++#
++#   As a special exception, the respective Autoconf Macro's copyright
++#   owner gives unlimited permission to copy, distribute and modify the
++#   configure scripts that are the output of Autoconf when processing
++#   the Macro. You need not follow the terms of the GNU General Public
++#   License when using or distributing such scripts, even though
++#   portions of the text of the Macro appear in them. The GNU General
++#   Public License (GPL) does govern all other use of the material that
++#   constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the
++#   Autoconf Macro released by the Autoconf Macro Archive. When you
++#   make and distribute a modified version of the Autoconf Macro, you
++#   may extend this special exception to the GPL to apply to your
++#   modified version as well.
++
++AC_DEFUN([AX_PYTHON],
++[AC_MSG_CHECKING(for python build information)
++AC_MSG_RESULT([])
++for python in python2.4 python2.3 python2.2 python2.1 python; do
++AC_CHECK_PROGS(PYTHON_BIN, [$python])
++ax_python_bin=$PYTHON_BIN
++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=no)
++   if test $ax_python_lib != no; then
++     if test $ax_python_header != no; then
++       break;
++     fi
++   fi
++fi
++done
++if test x$ax_python_bin = x; then
++   ax_python_bin=no
++fi
++if test x$ax_python_header = x; then
++   ax_python_header=no
++fi
++if test x$ax_python_lib = x; then
++   ax_python_lib=no
++fi
++
++AC_MSG_RESULT([  results of the Python check:])
++AC_MSG_RESULT([    Binary:      $ax_python_bin])
++AC_MSG_RESULT([    Library:     $ax_python_lib])
++AC_MSG_RESULT([    Include Dir: $ax_python_header])
++
++if test x$ax_python_header != xno; then
++  PYTHON_INCLUDE_DIR=$ax_python_header
++  AC_SUBST(PYTHON_INCLUDE_DIR)
++fi
++if test x$ax_python_lib != xno; then
++  PYTHON_LIB=$ax_python_lib
++  AC_SUBST(PYTHON_LIB)
++fi
++])dnl
 diff -urNad pythonmagick~/pythonmagick_src/Makefile.am pythonmagick/pythonmagick_src/Makefile.am
 --- pythonmagick~/pythonmagick_src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ pythonmagick/pythonmagick_src/Makefile.am	2007-07-28 17:34:00.000000000 +0200
-@@ -0,0 +1,73 @@
++++ pythonmagick/pythonmagick_src/Makefile.am	2007-07-29 02:02:25.000000000 +0200
+@@ -0,0 +1,71 @@
 +noinst_LTLIBRARIES = libpymagick.la
 +
 +libpymagick_la_SOURCES = _PathLinetoAbs.cpp \
@@ -162,6 +389,4 @@
 +						 _PathSmoothCurvetoRel.cpp \
 +						 _PathLinetoHorizontalRel.cpp
 +
-+libpymagick_la_LIBS = $(BOOST_PYTHON_LIBS) $(MAGICKPP_LIBS) $(MAGICK_LIBS)
 +libpymagick_la_CXXFLAGS = -I$(PYTHON_INCLUDE_DIR) $(BOOST_CPPFLAGS) $(MAGICKPP_CFLAGS) $(MAGICK_CFLAGS)
-+libpymagick_la_LDFLAGS = $(BOOST_LDFLAGS)

Modified: packages/pythonmagick/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pythonmagick/trunk/debian/rules?rev=2890&op=diff
==============================================================================
--- packages/pythonmagick/trunk/debian/rules (original)
+++ packages/pythonmagick/trunk/debian/rules Sun Jul 29 00:05:17 2007
@@ -5,9 +5,11 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 include $(CURDIR)/debian/mk/autotools-generate.mk
 include /usr/share/cdbs/1/class/autotools.mk
-DEB_ACLOCAL_PARAMS += -I /usr/share/autoconf-archive
 
 # Add here any variable or target overrides you need.
 
+DEB_ACLOCAL_PARAMS += -I /usr/share/autoconf-archive
+
+
 binary-install/python-magick::
 	dh_pysupport -ppython-magick




More information about the Python-modules-commits mailing list