--- pythonmagick-0.9.7.orig/debian/copyright +++ pythonmagick-0.9.7/debian/copyright @@ -0,0 +1,251 @@ +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=166 +Upstream-Name: PythonMagick +Source: http://www.imagemagick.org/download/python/ + +Files: * +Copyright: © 1999-2011 ImageMagick Studio LLC +License: + Before we get to the text of the license lets just review what the license says + in simple terms: + . + It allows you to: + * freely download and use ImageMagick software, in whole or in part, for + personal, company internal, or commercial purposes; + * use ImageMagick software in packages or distributions that you create; + * link against a library under a different license; + * link code under a different license against a library under this license; + * merge code into a work under a different license; + * extend patent grants to any code using code under this license; + * and extend patent protection. + . + It forbids you to: + . + * redistribute any piece of ImageMagick-originated software without proper + attribution; + * use any marks owned by ImageMagick Studio LLC in any way that might state or + imply that ImageMagick Studio LLC endorses your distribution; + * use any marks owned by ImageMagick Studio LLC in any way that might state or + imply that you created the ImageMagick software in question. + . + It requires you to: + . + * include a copy of the license in any redistribution you may make that + includes ImageMagick software; + * provide clear attribution to ImageMagick Studio LLC for any distributions + that include ImageMagick software. + . + It does not require you to: + . + * include the source of the ImageMagick software itself, or of any + modifications you may have made to it, in any redistribution you may + assemble that includes it; + * submit changes that you make to the software back to the ImageMagick Studio + LLC (though such feedback is encouraged). + . + A few other clarifications include: + . + * ImageMagick is freely available without charge; + * you may include ImageMagick on a DVD as long as you comply with the terms + of the license; + * you can give modified code away for free or sell it under the terms of the + ImageMagick license or distribute the result under a different license, + but you need to acknowledge the use of the ImageMagick software; + * the license is compatible with the GPL V3. + * when exporting the ImageMagick software, review its export classification. + . + The legally binding and authoritative terms and conditions for use, + reproduction, and distribution of ImageMagick follow: + . + Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization dedicated + to making software imaging solutions freely available. + . + 1. Definitions. + . + License shall mean the terms and conditions for use, reproduction, and + distribution as defined by Sections 1 through 9 of this document. + . + Licensor shall mean the copyright owner or entity authorized by the copyright + owner that is granting the License. + . + Legal Entity shall mean the union of the acting entity and all other entities + that control, are controlled by, or are under common control with that entity. + For the purposes of this definition, control means (i) the power, direct or + indirect, to cause the direction or management of such entity, whether by + contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + . + You (or Your) shall mean an individual or Legal Entity exercising permissions + granted by this License. + . + Source form shall mean the preferred form for making modifications, including + but not limited to software source code, documentation source, and + configuration files. + . + Object form shall mean any form resulting from mechanical transformation or + translation of a Source form, including but not limited to compiled object + code, generated documentation, and conversions to other media types. + . + Work shall mean the work of authorship, whether in Source or Object form, made + available under the License, as indicated by a copyright notice that is + included in or attached to the work (an example is provided in the Appendix + below). + . + Derivative Works shall mean any work, whether in Source or Object form, that is + based on (or derived from) the Work and for which the editorial revisions, + annotations, elaborations, or other modifications represent, as a whole, an + original work of authorship. For the purposes of this License, Derivative Works + shall not include works that remain separable from, or merely link (or bind by + name) to the interfaces of, the Work and Derivative Works thereof. + . + Contribution shall mean any work of authorship, including the original version + of the Work and any modifications or additions to that Work or Derivative Works + thereof, that is intentionally submitted to Licensor for inclusion in the Work + by the copyright owner or by an individual or Legal Entity authorized to submit + on behalf of the copyright owner. For the purposes of this definition, + "submitted" means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, and + issue tracking systems that are managed by, or on behalf of, the Licensor for + the purpose of discussing and improving the Work, but excluding communication + that is conspicuously marked or otherwise designated in writing by the + copyright owner as Not a Contribution. + . + Contributor shall mean Licensor and any individual or Legal Entity on behalf of + whom a Contribution has been received by Licensor and subsequently incorporated + within the Work. + . + 2. Grant of Copyright License. Subject to the terms and conditions of this + License, each Contributor hereby grants to You a perpetual, worldwide, + non-exclusive, no-charge, royalty-free, irrevocable copyright license to + reproduce, prepare Derivative Works of, publicly display, publicly perform, + sublicense, and distribute the Work and such Derivative Works in Source or + Object form. + . + 3. Grant of Patent License. Subject to the terms and conditions of this + License, each Contributor hereby grants to You a perpetual, worldwide, + non-exclusive, no-charge, royalty-free, irrevocable patent license to make, + have made, use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable by such + Contributor that are necessarily infringed by their Contribution(s) alone or by + combination of their Contribution(s) with the Work to which such + Contribution(s) was submitted. If You institute patent litigation against any + entity (including a cross-claim or counterclaim in a lawsuit) alleging that the + Work or a Contribution incorporated within the Work constitutes direct or + contributory patent infringement, then any patent licenses granted to You under + this License for that Work shall terminate as of the date such litigation is + filed. + . + 4. Redistribution. You may reproduce and distribute copies of the Work or + Derivative Works thereof in any medium, with or without modifications, and in + Source or Object form, provided that You meet the following conditions: + . + 1. You must give any other recipients of the Work or Derivative Works a copy + of this License; and + 2. You must cause any modified files to carry prominent notices stating that + You changed the files; and + 3. You must retain, in the Source form of any Derivative Works that You + distribute, all copyright, patent, trademark, and attribution notices from + the Source form of the Work, excluding those notices that do not pertain to + any part of the Derivative Works; and + 4. If the Work includes a "NOTICE" text file as part of its distribution, then + any Derivative Works that You distribute must include a readable copy of + the attribution notices contained within such NOTICE file, excluding those + notices that do not pertain to any part of the Derivative Works, in at + least one of the following places: within a NOTICE text file distributed as + part of the Derivative Works; within the Source form or documentation, if + provided along with the Derivative Works; or, within a display generated by + the Derivative Works, if and wherever such third-party notices normally + appear. The contents of the NOTICE file are for informational purposes only + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum to + the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. + . + You may add Your own copyright statement to Your modifications and may provide + additional or different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works as a + whole, provided Your use, reproduction, and distribution of the Work otherwise + complies with the conditions stated in this License. + . + 5. Submission of Contributions. Unless You explicitly state otherwise, any + Contribution intentionally submitted for inclusion in the Work by You to the + Licensor shall be under the terms and conditions of this License, without any + additional terms or conditions. Notwithstanding the above, nothing herein shall + supersede or modify the terms of any separate license agreement you may have + executed with Licensor regarding such Contributions. + . + 6. Trademarks. This License does not grant permission to use the trade names, + trademarks, service marks, or product names of the Licensor, except as required + for reasonable and customary use in describing the origin of the Work and + reproducing the content of the NOTICE file. + . + 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in + writing, Licensor provides the Work (and each Contributor provides its + Contributions) on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied, including, without limitation, any warranties or + conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any risks + associated with Your exercise of permissions under this License. + . + 8. Limitation of Liability. In no event and under no legal theory, whether in + tort (including negligence), contract, or otherwise, unless required by + applicable law (such as deliberate and grossly negligent acts) or agreed to in + writing, shall any Contributor be liable to You for damages, including any + direct, indirect, special, incidental, or consequential damages of any + character arising as a result of this License or out of the use or inability to + use the Work (including but not limited to damages for loss of goodwill, work + stoppage, computer failure or malfunction, or any and all other commercial + damages or losses), even if such Contributor has been advised of the + possibility of such damages. + . + 9. Accepting Warranty or Additional Liability. While redistributing the Work or + Derivative Works thereof, You may choose to offer, and charge a fee for, + acceptance of support, warranty, indemnity, or other liability obligations + and/or rights consistent with this License. However, in accepting such + obligations, You may act only on Your own behalf and on Your sole + responsibility, not on behalf of any other Contributor, and only if You agree + to indemnify, defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason of your + accepting any such warranty or additional liability. + . + APPENDIX: How to apply the ImageMagick License to your work + . + To apply the ImageMagick License to your work, attach the following boilerplate + notice, with the fields enclosed by brackets "[]" replaced with your own + identifying information. (Don't include the brackets!) The text should be + enclosed in the appropriate comment syntax for the file format. We also + recommend that a file or class name and description of purpose be included on + the same "printed page" as the copyright notice for easier identification + within third-party archives. + . + Copyright [yyyy] [name of copyright owner] + . + Licensed under the ImageMagick License (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy + of the License at + . + http://www.imagemagick.org/script/license.php + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + License for the specific language governing permissions and limitations + under the License. + +Files: debian/* +Copyright: © 2007-2009 Carl Fürstenberg +License: + Copying and distribution of this package, with or without + modification, are permitted in any medium without royalty + provided the copyright notice and this notice are + preserved. + +Files: debian/* +Copyright: 2011 Sebastian Ramacher +License: + Copying and distribution of this package, with or without + modification, are permitted in any medium without royalty + provided the copyright notice and this notice are + preserved. + --- pythonmagick-0.9.7.orig/debian/changelog +++ pythonmagick-0.9.7/debian/changelog @@ -0,0 +1,171 @@ +pythonmagick (0.9.7-2build2) quantal; urgency=low + + * Rebuild for imagemagick 6.7. + + -- Colin Watson Fri, 13 Jul 2012 11:23:22 +0100 + +pythonmagick (0.9.7-2build1) quantal; urgency=low + + * No change rebuild against boost1.49 + + -- Dmitrijs Ledkovs Tue, 19 Jun 2012 10:31:58 +0100 + +pythonmagick (0.9.7-2) unstable; urgency=low + + * Team upload. + * Enable hardened build: + - debian/patches: add 004_quote_cppflags.diff to fix build issues with + enabled hardening flags (Closes: #652483). + - debian/rules: export buildflags. + - debian/control: add versioned Buil-Dep on dpkg-dev for + /usr/share/dpkg/buildlflags.mk + * debian/control: fix spelling error in description. + + -- Sebastian Ramacher Tue, 20 Dec 2011 12:32:16 +0100 + +pythonmagick (0.9.7-1) unstable; urgency=low + + * Team upload. + + [ Bernd Zeimetz ] + * Upstream's __init__.py is *WEIRD*. I think I've fixed it as it should be, + although this change might introduce features which are not available in + other distributions. (Closes: #495025) + * Removing myself from uploaders. + + [ Sebastian Ramacher ] + * New upstream release + - Fixes build issues with newer ligmagick++ versions (Closes: #625581). + - debian/control: Bump Build-Dep of libmagick++-dev to 8:6.6.7-9. + * Drop autotools related diffs and run dh --with autoreconf instead. + - debian/control: Add Build-Dep on dh-autoreconf. + - debian/rules: call dh with --with autoreconf. + - debian/patches: remove diffs that are releated to autotools output. + * Detect Python 2.7 correctly (Closes: #632508) and honor PYTHON environment + variable. + * Build for all supported Python versions. + - debian/control: Build-Dep on python-all-dev instead of python-dev. + - debian/rules: Build for all supported Python versions. + * debian/patches: Format according to DEP-3. + * debian/control: Bump Standards-Version (no changes required). + * debian/copyright: + - Update copyright years. + - Fixes to be DEP-5 compliant. + - Fix license of PythonMagick. It is released under the ImageMagick + License, not GPL-3+. + + -- Sebastian Ramacher Wed, 19 Oct 2011 20:12:28 +0200 + +pythonmagick (0.9.1-3) unstable; urgency=low + + * Add pkg-config as build-dependency. + * Bumping Standards-Version to 3.8.4. + * Add debian/README.source. + * Update patches to include python2.6 properly. + + -- Bernd Zeimetz Wed, 12 May 2010 23:05:38 +0200 + +pythonmagick (0.9.1-2) unstable; urgency=low + + * Remove usage of cdbs in favour of debhelper >> 7 + * change dpatch to quilt + + -- Carl Fürstenberg Sun, 28 Feb 2010 14:44:53 +0100 + +pythonmagick (0.9.1-1) unstable; urgency=low + + [ Thomas Viehmann ] + * New upstream release + - compatible with new imagemagick. Closes: #512049, #524588 + - links against current boost. Closes: #488105 + - Fixes to autofoo: + - use python?.?-config instead of locate in python detection macro + - python boost detection + and reverse upstream's hardcoding of the lib in Makefile.am + + [ Sandro Tosi ] + * debian/control + - switch Vcs-Browser field to viewsvn + + [ Carl Fürstenberg ] + * New upstream release + * update copyright file + * updating build-depends + - change libmagick++9-dev to libmagick++-dev >= 6.4 + + [ Piotr Ożarowski ] + * Thomas' patches converted to dpatch (thanks Thomas for your work!) + - dpatch added to Build-Depends + * Remove .pyc files in clean rule + + -- Debian Python Modules Team Mon, 15 Jun 2009 21:46:45 +0200 + +pythonmagick (0.7-5) unstable; urgency=low + + [ Bernd Zeimetz ] + * debian/control: + - Dropping python2.4 Build-Deps again, depend on libboost-python-dev + (>= 1.34.1-8) instead, as this was the first version which used rtupdate + to support multiple python versions. + - Typo and style fixes in the description. + - Adding myself to Uploaders + * debian/pyversions: + - Not needed, removing file. + + [ Carl Fürstenberg ] + * debian/control: + - Dropping obsolete and useless Build-Deps (autostuff etc...), adding + dependice on autotools.dev + - change dependices to python 2.5 or above (Closes: #445395) + * debian/patches: + - removing the patch poking in configure to change python 2.5 to 2.4. + * debian/rules: + - remove cruft. + + -- Carl Fürstenberg Tue, 15 Apr 2008 21:35:19 +0200 + +pythonmagick (0.7-4) unstable; urgency=low + + [ Piotr Ożarowski ] + * Homepage field added + * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now) + + [ Sandro Tosi ] + * debian/control + - uniforming Vcs-Browser field + + [ Carl Fürstenberg ] + * debian/rules + - Changed to static patch, and rebootstrapping isn't relevant any more + * debian/control + - swapped Maintainer and Uploaders field + - bump Standards-Version + + -- Carl Fürstenberg Sun, 06 Apr 2008 00:45:16 +0200 + +pythonmagick (0.7-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Added python2.4-dev to build-depends (Closes: #473966) + * rm autogen.log on clean as suggested by Sandro Tosi (Closes: #442714) + + -- Alexander Schmehl Sat, 05 Apr 2008 18:39:32 +0200 + +pythonmagick (0.7-3) unstable; urgency=high + + * Really include pythonmagick in the deb-files (closes: #439251) + + -- Carl Fürstenberg Fri, 24 Aug 2007 00:31:03 +0200 + +pythonmagick (0.7-2) unstable; urgency=medium + + * Move it to use python 2.4 instead per changes in libboost-python. + + -- Carl Fürstenberg Sat, 18 Aug 2007 17:01:51 +0200 + +pythonmagick (0.7-1) unstable; urgency=low + + * Initial release (Closes: #433709) + + -- Carl Fürstenberg Sun, 05 Aug 2007 17:27:03 +0200 + --- pythonmagick-0.9.7.orig/debian/watch +++ pythonmagick-0.9.7/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.imagemagick.org/download/python/PythonMagick-(.*)\.tar\.gz --- pythonmagick-0.9.7.orig/debian/README.source +++ pythonmagick-0.9.7/debian/README.source @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- pythonmagick-0.9.7.orig/debian/control +++ pythonmagick-0.9.7/debian/control @@ -0,0 +1,30 @@ +Source: pythonmagick +Section: python +Priority: extra +Maintainer: Debian Python Modules Team +Vcs-Svn: svn://svn.debian.org/python-modules/packages/pythonmagick/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pythonmagick/trunk/ +Uploaders: Carl Fürstenberg +Build-Depends: + debhelper (>= 7.2), + libmagick++-dev (>= 8:6.6.9.7), + libtool (>= 1.5), + libboost-python-dev (>= 1.34.1-8), + python-support, + python-all-dev (>= 2.5), + autotools-dev, + quilt (>= 0.46-7~), + pkg-config, + dh-autoreconf, + dpkg-dev (>= 1.16.1) +Standards-Version: 3.9.2 +Homepage: http://www.imagemagick.org +XS-Python-Version: all + +Package: python-pythonmagick +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Description: Object-oriented Python interface to ImageMagick + PythonMagick an interface to ImageMagick to give all the functionality + of ImageMagick++ into Python. --- pythonmagick-0.9.7.orig/debian/rules +++ pythonmagick-0.9.7/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f + +PYVERSIONS = $(shell pyversions -vr) + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +%: + dh --with python-support --with quilt --with autoreconf $@; + +override_dh_auto_clean: + set -x && for pyver in $(PYVERSIONS); do \ + PYTHON=python$$pyver dh_auto_clean -Bbuild/py$$pyver; \ + done + +override_dh_auto_configure: + set -x && for pyver in $(PYVERSIONS); do \ + mkdir -p build/py$$pyver; \ + PYTHON=python$$pyver dh_auto_configure -Bbuild/py$$pyver; \ + done + +override_dh_auto_build: + set -x && for pyver in $(PYVERSIONS); do \ + PYTHON=python$$pyver dh_auto_build -Bbuild/py$$pyver; \ + done + +override_dh_auto_install: + set -x && for pyver in $(PYVERSIONS); do \ + PYTHON=python$$pyver dh_auto_install -Bbuild/py$$pyver; \ + done + --- pythonmagick-0.9.7.orig/debian/compat +++ pythonmagick-0.9.7/debian/compat @@ -0,0 +1 @@ +5 --- pythonmagick-0.9.7.orig/debian/source/format +++ pythonmagick-0.9.7/debian/source/format @@ -0,0 +1 @@ +1.0 --- pythonmagick-0.9.7.orig/debian/patches/series +++ pythonmagick-0.9.7/debian/patches/series @@ -0,0 +1,5 @@ +__init__-fixup +001_autofoo_fixes.diff +002_set_minimum_python_version_to_2.4.diff +003_detect_py27.diff +004_quote_cppflags.diff --- pythonmagick-0.9.7.orig/debian/patches/003_detect_py27.diff +++ pythonmagick-0.9.7/debian/patches/003_detect_py27.diff @@ -0,0 +1,17 @@ +Description: detect Python 2.7 and honor PYTHON +Author: Sebastian Ramacher +Last-Update: 2011-10-17 + +--- pythonmagick-0.9.1.orig/m4/ax_python.m4 ++++ pythonmagick-0.9.1/m4/ax_python.m4 +@@ -58,7 +58,9 @@ + AC_DEFUN([AX_PYTHON], + [AC_MSG_CHECKING(for python build information) + AC_MSG_RESULT([]) +-for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do ++echo $PYTHON $python ++for python in python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do ++if test x$PYTHON != x && test $PYTHON != $python; then continue; fi + AC_CHECK_PROGS(PYTHON_BIN, [$python]) + ax_python_bin=$PYTHON_BIN + if test x$ax_python_bin != x; then --- pythonmagick-0.9.7.orig/debian/patches/001_autofoo_fixes.diff +++ pythonmagick-0.9.7/debian/patches/001_autofoo_fixes.diff @@ -0,0 +1,58 @@ +Description: autotools related fixes + Use python?.?-config instead of locate in python detection macro and don't link + against libpython2.x. + Fix python boost detection and reverse upstream's hardcoding of the lib in + Makefile.am. +Author: Thomas Viehmann +Last-Update: 2011-10-17 + +Index: pythonmagick-0.9.1/m4/ax_boost_python.m4 +=================================================================== +--- pythonmagick-0.9.1.orig/m4/ax_boost_python.m4 2010-02-28 14:29:58.000000000 +0100 ++++ pythonmagick-0.9.1/m4/ax_boost_python.m4 2010-02-28 14:30:56.000000000 +0100 +@@ -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 +Index: pythonmagick-0.9.1/m4/ax_python.m4 +=================================================================== +--- pythonmagick-0.9.1.orig/m4/ax_python.m4 2010-02-28 14:29:58.000000000 +0100 ++++ pythonmagick-0.9.1/m4/ax_python.m4 2010-02-28 14:30:56.000000000 +0100 +@@ -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 +Index: pythonmagick-0.9.1/Makefile.am +=================================================================== +--- pythonmagick-0.9.1.orig/Makefile.am 2010-02-28 14:29:58.000000000 +0100 ++++ pythonmagick-0.9.1/Makefile.am 2010-02-28 14:30:56.000000000 +0100 +@@ -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) + + EXTRA_DIST = autogen.pl SConstruct pyste_src LICENSE + --- pythonmagick-0.9.7.orig/debian/patches/__init__-fixup +++ pythonmagick-0.9.7/debian/patches/__init__-fixup @@ -0,0 +1,16 @@ +Description: Provide all objects in PythonMagick +Author: Bernd Zeimetz +Last-Update: 2011-10-17 + +--- a/PythonMagick/__init__.py ++++ b/PythonMagick/__init__.py +@@ -1,7 +1,5 @@ +-import _PythonMagick +- +-class Image(_PythonMagick.Image): +- pass ++import PythonMagick._PythonMagick as _PythonMagick ++from PythonMagick._PythonMagick import * + + class Blob(_PythonMagick.Blob): + def __init__(self,*args): --- pythonmagick-0.9.7.orig/debian/patches/002_set_minimum_python_version_to_2.4.diff +++ pythonmagick-0.9.7/debian/patches/002_set_minimum_python_version_to_2.4.diff @@ -0,0 +1,17 @@ +Description: Set minimum required Python version to 2.4 +Author: Thomas Viehmann +Last-Update: 2011-10-17 + +Index: pythonmagick-0.9.1/configure.ac +=================================================================== +--- pythonmagick-0.9.1.orig/configure.ac 2010-02-28 14:29:58.000000000 +0100 ++++ pythonmagick-0.9.1/configure.ac 2010-02-28 14:33:50.000000000 +0100 +@@ -24,7 +24,7 @@ + AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_LIBTOOL +-AM_PATH_PYTHON(3.1) ++AM_PATH_PYTHON(2.4) + PKG_PROG_PKG_CONFIG + + # Add configure option --enable-maintainer-mode which enables dependency --- pythonmagick-0.9.7.orig/debian/patches/004_quote_cppflags.diff +++ pythonmagick-0.9.7/debian/patches/004_quote_cppflags.diff @@ -0,0 +1,15 @@ +Description: add quotes to prevent build failure with non empty CPPFLAGS +Author: Sebastian Ramacher +Last-Update: 2011-12-17 + +--- a/m4/ax_boost_python.m4 ++++ b/m4/ax_boost_python.m4 +@@ -63,7 +63,7 @@ ac_cv_boost_python, + AC_LANG_CPLUSPLUS + CPPFLAGS_SAVE=$CPPFLAGS + if test x$PYTHON_INCLUDE_DIR != x; then +- CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS ++ CPPFLAGS="-I$PYTHON_INCLUDE_DIR $CPPFLAGS" + fi + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ + #include