[Python-modules-commits] r30149 - in packages/pythonmagick/trunk/debian (8 files)

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Aug 13 19:24:42 UTC 2014 

    Date: Wednesday, August 13, 2014 @ 19:24:41
  Author: sramacher
Revision: 30149

* Team upload.
* New upstream release.
  - Fix build with newer imagemagick releases. (Closes: #758001)
* debian/patches:
  - 003_detect_py27.diff: Removed, no longer needed.
  - 001_autofoo_fixes.diff: Refreshed.
* debian/{rules,control,source/format}: Use 3.0 (quilt) and remove quilt
  from build depends and dh call.
* debian({rules,control}: Switch to dh_python2. Replace python-support with
  dh-python in Build-Depends and invoke dh with --with python2 instead of
  python-support.
* debian/control:
  - Bump libmagic++-dev to >= 8:6.8.6. Required by the new upstream version.
  - Bump Standards-Version to 3.9.5. No changes required.
* debian/rules:
  - Build with --disable-silent-rules.
  - Build with --parallel.
* debian/copyright: Update copyright years.

Modified:
  packages/pythonmagick/trunk/debian/changelog
  packages/pythonmagick/trunk/debian/control
  packages/pythonmagick/trunk/debian/copyright
  packages/pythonmagick/trunk/debian/patches/001_autofoo_fixes.diff
  packages/pythonmagick/trunk/debian/patches/series
  packages/pythonmagick/trunk/debian/rules
  packages/pythonmagick/trunk/debian/source/format
Deleted:
  packages/pythonmagick/trunk/debian/patches/003_detect_py27.diff

Modified: packages/pythonmagick/trunk/debian/changelog
===================================================================
--- packages/pythonmagick/trunk/debian/changelog	2014-08-13 04:49:33 UTC (rev 30148)
+++ packages/pythonmagick/trunk/debian/changelog	2014-08-13 19:24:41 UTC (rev 30149)
@@ -1,3 +1,26 @@
+pythonmagick (0.9.11-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+    - Fix build with newer imagemagick releases. (Closes: #758001)
+  * debian/patches:
+    - 003_detect_py27.diff: Removed, no longer needed.
+    - 001_autofoo_fixes.diff: Refreshed.
+  * debian/{rules,control,source/format}: Use 3.0 (quilt) and remove quilt
+    from build depends and dh call.
+  * debian({rules,control}: Switch to dh_python2. Replace python-support with
+    dh-python in Build-Depends and invoke dh with --with python2 instead of
+    python-support.
+  * debian/control:
+    - Bump libmagic++-dev to >= 8:6.8.6. Required by the new upstream version.
+    - Bump Standards-Version to 3.9.5. No changes required.
+  * debian/rules:
+    - Build with --disable-silent-rules.
+    - Build with --parallel.
+  * debian/copyright: Update copyright years.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Wed, 13 Aug 2014 20:23:47 +0200
+
 pythonmagick (0.9.8-1) unstable; urgency=low
 
   * Team upload.

Modified: packages/pythonmagick/trunk/debian/control
===================================================================
--- packages/pythonmagick/trunk/debian/control	2014-08-13 04:49:33 UTC (rev 30148)
+++ packages/pythonmagick/trunk/debian/control	2014-08-13 19:24:41 UTC (rev 30149)
@@ -7,15 +7,14 @@
 Uploaders: Carl Fürstenberg <azatoth at gmail.com>
 Build-Depends:
  debhelper (>= 9),
- libmagick++-dev (>= 8:6.6.9.7),
+ libmagick++-dev (>= 8:6.8.6),
  libtool (>= 1.5),
  libboost-python-dev (>= 1.34.1-8),
- python-support,
  python-all-dev (>= 2.5),
- quilt (>= 0.46-7~),
  pkg-config,
- dh-autoreconf
-Standards-Version: 3.9.4
+ dh-autoreconf,
+ dh-python
+Standards-Version: 3.9.5
 Homepage: http://www.imagemagick.org
 XS-Python-Version: all
 

Modified: packages/pythonmagick/trunk/debian/copyright
===================================================================
--- packages/pythonmagick/trunk/debian/copyright	2014-08-13 04:49:33 UTC (rev 30148)
+++ packages/pythonmagick/trunk/debian/copyright	2014-08-13 19:24:41 UTC (rev 30149)
@@ -235,7 +235,7 @@
 
 Files: debian/*
 Copyright: © 2007-2009 Carl Fürstenberg
-           2011-2013 Sebastian Ramacher <sramacher at debian.org>
+           2011-2014 Sebastian Ramacher <sramacher at debian.org>
 License:
  Copying and distribution of this package, with or without
  modification, are permitted in any medium without royalty

Modified: packages/pythonmagick/trunk/debian/patches/001_autofoo_fixes.diff
===================================================================
--- packages/pythonmagick/trunk/debian/patches/001_autofoo_fixes.diff	2014-08-13 04:49:33 UTC (rev 30148)
+++ packages/pythonmagick/trunk/debian/patches/001_autofoo_fixes.diff	2014-08-13 19:24:41 UTC (rev 30149)
@@ -4,48 +4,15 @@
  Fix python boost detection and reverse upstream's hardcoding of the lib in
  Makefile.am.
 Author: Thomas Viehmann <tv at beamnet.de>
-Last-Update: 2011-10-17
+Last-Update: 2014-08-13
 
---- a/m4/ax_boost_python.m4
-+++ b/m4/ax_boost_python.m4
-@@ -74,6 +74,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 yes/no or the boost python library or suffix to use]),
-@@ -83,8 +85,9 @@
-    fi])
-   BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-   for ax_lib in `ls $BOOSTLIBDIR/libboost_python*.so* $BOOSTLIBDIR/libboost_python*.dylib* $BOOSTLIBDIR/libboost_python*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_python.*\)\.so.*$;\1;' -e 's;^lib\(boost_python.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_python.*\)\.a.*$;\1;' ` $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
---- a/m4/ax_python.m4
-+++ b/m4/ax_python.m4
-@@ -62,7 +62,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 --includes | sed 's/-I//g;s/^ *//;s/ .*//'`]],
-    ax_python_header=no)
-    if test $ax_python_lib != no; then
-      if test $ax_python_header != no; then
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -27,7 +27,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) -lboost_python $(MAGICKPP_LIBS) $(MAGICK_LIBS)
 +_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

Deleted: packages/pythonmagick/trunk/debian/patches/003_detect_py27.diff
===================================================================
--- packages/pythonmagick/trunk/debian/patches/003_detect_py27.diff	2014-08-13 04:49:33 UTC (rev 30148)
+++ packages/pythonmagick/trunk/debian/patches/003_detect_py27.diff	2014-08-13 19:24:41 UTC (rev 30149)
@@ -1,17 +0,0 @@
-Description: detect Python 2.7 and honor PYTHON
-Author: Sebastian Ramacher <s.ramacher at gmx.at>
-Last-Update: 2011-10-17
-
---- a/m4/ax_python.m4
-+++ b/m4/ax_python.m4
-@@ -56,7 +56,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

Modified: packages/pythonmagick/trunk/debian/patches/series
===================================================================
--- packages/pythonmagick/trunk/debian/patches/series	2014-08-13 04:49:33 UTC (rev 30148)
+++ packages/pythonmagick/trunk/debian/patches/series	2014-08-13 19:24:41 UTC (rev 30149)
@@ -1,2 +1 @@
 001_autofoo_fixes.diff
-003_detect_py27.diff

Modified: packages/pythonmagick/trunk/debian/rules
===================================================================
--- packages/pythonmagick/trunk/debian/rules	2014-08-13 04:49:33 UTC (rev 30148)
+++ packages/pythonmagick/trunk/debian/rules	2014-08-13 19:24:41 UTC (rev 30149)
@@ -3,7 +3,7 @@
 PYVERSIONS = $(shell pyversions -vr)
 
 %:
-	dh $@ --with python-support --with quilt --with autoreconf
+	dh $@ --with python2 --with autoreconf --parallel
 
 override_dh_auto_clean:
 	set -e && for pyver in $(PYVERSIONS); do \
@@ -13,7 +13,7 @@
 override_dh_auto_configure:
 	set -e && for pyver in $(PYVERSIONS); do \
 		mkdir -p build/py$$pyver; \
-		PYTHON=python$$pyver dh_auto_configure -Bbuild/py$$pyver; \
+		PYTHON=python$$pyver dh_auto_configure -Bbuild/py$$pyver -- --disable-silent-rules; \
 	done
 
 override_dh_auto_build:

Modified: packages/pythonmagick/trunk/debian/source/format
===================================================================
--- packages/pythonmagick/trunk/debian/source/format	2014-08-13 04:49:33 UTC (rev 30148)
+++ packages/pythonmagick/trunk/debian/source/format	2014-08-13 19:24:41 UTC (rev 30149)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

More information about the Python-modules-commits mailing list