[Python-modules-commits] r24628 - in packages/pythonmagick/trunk/debian (11 files)

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Jun 2 14:03:28 UTC 2013 

    Date: Sunday, June 2, 2013 @ 14:03:25
  Author: sramacher
Revision: 24628

* debian/control:
  - Bump Standards-Version to 3.9.4.
  - Bump debhelper to (>= 9) for arch and indep targets.
  - Remove unnecessary Build-Depends autotools-dev and dpkg-dev.
* debian/compat: Bump to 9.
* debian/rules:
  - Call dh correctly.
  - No need to include /usr/share/dpkg/buildflags.mk anymore.
* debian/patches:
  - 001_autofoo_fixes.diff: Use python-config --includes to fix build
    failure. (Closes: #710790)
  - 002_set_minimum_python_version_to_2.4.diff: Removed, not needed anymore.
  - 004_quote_cppflags.diff: Removed, not needed anymore.
  - __init__-fixup: Removed, not needed anymore.

Modified:
  packages/pythonmagick/trunk/debian/changelog
  packages/pythonmagick/trunk/debian/compat
  packages/pythonmagick/trunk/debian/control
  packages/pythonmagick/trunk/debian/copyright
  packages/pythonmagick/trunk/debian/patches/001_autofoo_fixes.diff
  packages/pythonmagick/trunk/debian/patches/003_detect_py27.diff
  packages/pythonmagick/trunk/debian/patches/series
  packages/pythonmagick/trunk/debian/rules
Deleted:
  packages/pythonmagick/trunk/debian/patches/002_set_minimum_python_version_to_2.4.diff
  packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff
  packages/pythonmagick/trunk/debian/patches/__init__-fixup

Modified: packages/pythonmagick/trunk/debian/changelog
===================================================================
--- packages/pythonmagick/trunk/debian/changelog	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/changelog	2013-06-02 14:03:25 UTC (rev 24628)
@@ -1,19 +1,34 @@
-pythonmagick (0.9.8-1) UNRELEASED; urgency=low
+pythonmagick (0.9.8-1) unstable; urgency=low
 
+  * Team upload.
+
   [ Sebastian Ramacher ]
   * New upstream release.
-  * debian/rules: Run loops with set -e.
+  * debian/control:
+    - Bump Standards-Version to 3.9.4.
+    - Bump debhelper to (>= 9) for arch and indep targets.
+    - Remove unnecessary Build-Depends autotools-dev and dpkg-dev.
+  * debian/compat: Bump to 9.
+  * debian/rules:
+    - Run loops with set -e.
+    - Call dh correctly.
+    - No need to include /usr/share/dpkg/buildflags.mk anymore.
   * debian/copyright:
     - Update Format URL.
     - Merge the two debian/* sections.
     - Fix formatting of the ImageMagick license.
-  * debian/patches/001_autofoo_fixes.diff: Use python-config --includes to fix
-    build failure. (Closes: #710790)
+    - Update copyright years
+  * debian/patches:
+    - 001_autofoo_fixes.diff: Use python-config --includes to fix build
+      failure. (Closes: #710790)
+    - 002_set_minimum_python_version_to_2.4.diff: Removed, not needed anymore.
+    - 004_quote_cppflags.diff: Removed, not needed anymore.
+    - __init__-fixup: Removed, not needed anymore.
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:03:45 +0200
+ -- Sebastian Ramacher <sramacher at debian.org>  Sun, 02 Jun 2013 15:59:18 +0200
 
 pythonmagick (0.9.7-2) unstable; urgency=low
 

Modified: packages/pythonmagick/trunk/debian/compat
===================================================================
--- packages/pythonmagick/trunk/debian/compat	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/compat	2013-06-02 14:03:25 UTC (rev 24628)
@@ -1 +1 @@
-5
+9

Modified: packages/pythonmagick/trunk/debian/control
===================================================================
--- packages/pythonmagick/trunk/debian/control	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/control	2013-06-02 14:03:25 UTC (rev 24628)
@@ -6,18 +6,16 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pythonmagick/trunk/
 Uploaders: Carl Fürstenberg <azatoth at gmail.com>
 Build-Depends:
- debhelper (>= 7.2),
+ debhelper (>= 9),
  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
+ dh-autoreconf
+Standards-Version: 3.9.4
 Homepage: http://www.imagemagick.org
 XS-Python-Version: all
 

Modified: packages/pythonmagick/trunk/debian/copyright
===================================================================
--- packages/pythonmagick/trunk/debian/copyright	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/copyright	2013-06-02 14:03:25 UTC (rev 24628)
@@ -3,7 +3,7 @@
 Source: http://www.imagemagick.org/download/python/
 
 Files: *
-Copyright: © 1999-2011 ImageMagick Studio LLC
+Copyright: © 1999-2012 ImageMagick Studio LLC
 License:
  Before we get to the text of the license lets just review what the license says
  in simple terms:
@@ -235,7 +235,7 @@
 
 Files: debian/*
 Copyright: © 2007-2009 Carl Fürstenberg
-           2011 Sebastian Ramacher <s.ramacher at gmx.at>
+           2011-2013 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	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/patches/001_autofoo_fixes.diff	2013-06-02 14:03:25 UTC (rev 24628)
@@ -6,23 +6,21 @@
 Author: Thomas Viehmann <tv at beamnet.de>
 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
+--- 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 the boost python library or suffix to use]),
+   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 @@
-      ax_boost_python_lib=boost_python-$with_boost_python
     fi])
-   for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python; do
+   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
@@ -30,11 +28,9 @@
 +  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 @@
+--- 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],
@@ -43,11 +39,9 @@
     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 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,7 @@
  _PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS)
  
  # And the libraries to include

Deleted: packages/pythonmagick/trunk/debian/patches/002_set_minimum_python_version_to_2.4.diff
===================================================================
--- packages/pythonmagick/trunk/debian/patches/002_set_minimum_python_version_to_2.4.diff	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/patches/002_set_minimum_python_version_to_2.4.diff	2013-06-02 14:03:25 UTC (rev 24628)
@@ -1,17 +0,0 @@
-Description: Set minimum required Python version to 2.4
-Author: Thomas Viehmann <tv at beamnet.de>
-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

Modified: packages/pythonmagick/trunk/debian/patches/003_detect_py27.diff
===================================================================
--- packages/pythonmagick/trunk/debian/patches/003_detect_py27.diff	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/patches/003_detect_py27.diff	2013-06-02 14:03:25 UTC (rev 24628)
@@ -2,9 +2,9 @@
 Author: Sebastian Ramacher <s.ramacher at gmx.at>
 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 @@
+--- 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([])

Deleted: packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff
===================================================================
--- packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff	2013-06-02 14:03:25 UTC (rev 24628)
@@ -1,15 +0,0 @@
-Description: add quotes to prevent build failure with non empty CPPFLAGS
-Author: Sebastian Ramacher <s.ramacher at gmx.at>
-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 <boost/python/module.hpp>

Deleted: packages/pythonmagick/trunk/debian/patches/__init__-fixup
===================================================================
--- packages/pythonmagick/trunk/debian/patches/__init__-fixup	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/patches/__init__-fixup	2013-06-02 14:03:25 UTC (rev 24628)
@@ -1,16 +0,0 @@
-Description: Provide all objects in PythonMagick
-Author: Bernd Zeimetz <bzed at debian.org>
-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):

Modified: packages/pythonmagick/trunk/debian/patches/series
===================================================================
--- packages/pythonmagick/trunk/debian/patches/series	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/patches/series	2013-06-02 14:03:25 UTC (rev 24628)
@@ -1,5 +1,2 @@
-__init__-fixup
 001_autofoo_fixes.diff
-002_set_minimum_python_version_to_2.4.diff
 003_detect_py27.diff
-004_quote_cppflags.diff

Modified: packages/pythonmagick/trunk/debian/rules
===================================================================
--- packages/pythonmagick/trunk/debian/rules	2013-06-02 13:20:52 UTC (rev 24627)
+++ packages/pythonmagick/trunk/debian/rules	2013-06-02 14:03:25 UTC (rev 24628)
@@ -2,11 +2,8 @@
 
 PYVERSIONS = $(shell pyversions -vr)
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
 %:
-	dh --with python-support --with quilt --with autoreconf $@;
+	dh $@ --with python-support --with quilt --with autoreconf
 
 override_dh_auto_clean:
 	set -e && for pyver in $(PYVERSIONS); do \

More information about the Python-modules-commits mailing list