Drop 08_waf_python_config: now applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 54240f7ae1ceda230827bd7f7995cdb2a6b4e0ef..0671ace0ef3354aa12e492fc85b3887fdcdb61a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 talloc (2.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+   + Drop 08_waf_python_config: now applied upstream.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sat, 14 Sep 2013 13:03:51 +0100
 

diff --git a/debian/patches/08_waf_python_config b/debian/patches/08_waf_python_config
deleted file mode 100644 (file)
index 2def367..0000000
--- a/debian/patches/08_waf_python_config
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Cope with python-config not being a script
-Author: Jelmer Vernooij <jelmer@debian.org>
-Status: submitted upstream
-
-diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
-index c2af312..a15e1f6 100644
---- a/buildtools/wafadmin/Tools/python.py
-+++ b/buildtools/wafadmin/Tools/python.py
-@@ -259,7 +259,7 @@ MACOSX_DEPLOYMENT_TARGET = %r
- 
-       includes = []
-       if python_config:
--              for incstr in Utils.cmd_output("%s %s --includes" % (python, python_config)).strip().split():
-+              for incstr in Utils.cmd_output("%s --includes" % (python_config,)).strip().split():
-                       # strip the -I or /I
-                       if (incstr.startswith('-I')
-                           or incstr.startswith('/I')):

diff --git a/debian/patches/series b/debian/patches/series
index 78d07aebc9e698a3709a9c6d95e3df6659eea0ed..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-08_waf_python_config