[Python-modules-commits] r19701 - in packages/pythonmagick/trunk/debian (5 files)

[sramacher-guest at users.alioth.debian.org]

    Date: Tuesday, December 20, 2011 @ 11:35:02
  Author: sramacher-guest
Revision: 19701

* 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.

Added:
  packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff
Modified:
  packages/pythonmagick/trunk/debian/changelog
  packages/pythonmagick/trunk/debian/control
  packages/pythonmagick/trunk/debian/patches/series
  packages/pythonmagick/trunk/debian/rules

Modified: packages/pythonmagick/trunk/debian/changelog
===================================================================
--- packages/pythonmagick/trunk/debian/changelog	2011-12-20 06:48:37 UTC (rev 19700)
+++ packages/pythonmagick/trunk/debian/changelog	2011-12-20 11:35:02 UTC (rev 19701)
@@ -1,3 +1,16 @@
+pythonmagick (0.9.7-2) UNRELEASED; 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 <s.ramacher at gmx.at>  Tue, 20 Dec 2011 12:32:16 +0100
+
 pythonmagick (0.9.7-1) unstable; urgency=low
 
   * Team upload.

Modified: packages/pythonmagick/trunk/debian/control
===================================================================
--- packages/pythonmagick/trunk/debian/control	2011-12-20 06:48:37 UTC (rev 19700)
+++ packages/pythonmagick/trunk/debian/control	2011-12-20 11:35:02 UTC (rev 19701)
@@ -15,7 +15,8 @@
  autotools-dev,
  quilt (>= 0.46-7~),
  pkg-config,
- dh-autoreconf
+ dh-autoreconf,
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://www.imagemagick.org
 XS-Python-Version: all
@@ -25,5 +26,5 @@
 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 functionallity
+ PythonMagick an interface to ImageMagick to give all the functionality
  of ImageMagick++ into Python.

Added: packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff
===================================================================
--- packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff	                        (rev 0)
+++ packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff	2011-12-20 11:35:02 UTC (rev 19701)
@@ -0,0 +1,15 @@
+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>


Property changes on: packages/pythonmagick/trunk/debian/patches/004_quote_cppflags.diff
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: packages/pythonmagick/trunk/debian/patches/series
===================================================================
--- packages/pythonmagick/trunk/debian/patches/series	2011-12-20 06:48:37 UTC (rev 19700)
+++ packages/pythonmagick/trunk/debian/patches/series	2011-12-20 11:35:02 UTC (rev 19701)
@@ -2,3 +2,4 @@
 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	2011-12-20 06:48:37 UTC (rev 19700)
+++ packages/pythonmagick/trunk/debian/rules	2011-12-20 11:35:02 UTC (rev 19701)
@@ -2,6 +2,9 @@
 
 PYVERSIONS = $(shell pyversions -vr)
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 %:
 	dh --with python-support --with quilt --with autoreconf $@;
 
@@ -26,6 +29,3 @@
 		PYTHON=python$$pyver dh_auto_install -Bbuild/py$$pyver; \
 	done
 
-# TODO extra clean needed?
-#clean::
-#	find . -name '*\.py[co]' -delete