[xmds2] 03/11: Drop patches (applied upstream):

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository xmds2.

commit 17d1f5cef7bd7c6983e9348dab63a3c1f64e260f
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Mon Jan 13 08:29:34 2014 +0100

    Drop patches (applied upstream):
    
    + interpreter-name-in-shebang.patch
    + operator-bashism.patch
    + drop-dependency-on-sphinx.patch
    + string-quote-in-run-tests.patch
    
    Git-Dch: Full
---
 debian/patches/drop-dependency-on-sphinx.patch   | 16 ----------------
 debian/patches/interpreter-name-in-shebang.patch | 21 ---------------------
 debian/patches/operator-bashism.patch            | 16 ----------------
 debian/patches/series                            |  4 ----
 debian/patches/string-quote-in-run-tests.patch   | 16 ----------------
 5 files changed, 73 deletions(-)

diff --git a/debian/patches/drop-dependency-on-sphinx.patch b/debian/patches/drop-dependency-on-sphinx.patch
deleted file mode 100644
index c8061bd..0000000
--- a/debian/patches/drop-dependency-on-sphinx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Drop dependency on python-sphinx
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: http://sourceforge.net/p/xmds/mailman/message/31812467/
-Last-Update: 2014-01-04
-
---- xmds2-2.1.4.orig/setup.py
-+++ xmds2-2.1.4/setup.py
-@@ -30,7 +30,7 @@ setup(name="xmds2",
-       exclude_package_data = {'': ['README', 'TODO']},
-       
-       # Project requires Cheetah for all of the templates
--      install_requires = ['Cheetah>=2.0.1', 'pyparsing<2.0.0', 'mpmath', 'Sphinx>=1.1'],
-+      install_requires = ['Cheetah>=2.0.1', 'pyparsing<2.0.0', 'mpmath'],
-       
-       package_data = {
-         'xpdeint': ['includes/*.c',
diff --git a/debian/patches/interpreter-name-in-shebang.patch b/debian/patches/interpreter-name-in-shebang.patch
deleted file mode 100644
index 8fb41a2..0000000
--- a/debian/patches/interpreter-name-in-shebang.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix the name of the python interpreter in the shebang line
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: http://sourceforge.net/p/xmds/mailman/message/31812468/
-Last-Update: 2014-01-03
-
---- xmds2-2.1.4.orig/xpdeint/Features/Transforms/_FourierTransformFFTW3.py
-+++ xmds2-2.1.4/xpdeint/Features/Transforms/_FourierTransformFFTW3.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python,
-+#!/usr/bin/env python
- # encoding: utf-8
- """
- _FourierTransform.py
---- xmds2-2.1.4.orig/xpdeint/Features/Transforms/_MMT.py
-+++ xmds2-2.1.4/xpdeint/Features/Transforms/_MMT.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python,
-+#!/usr/bin/env python
- # encoding: utf-8
- """
- _MMT.py
diff --git a/debian/patches/operator-bashism.patch b/debian/patches/operator-bashism.patch
deleted file mode 100644
index 41b4ade..0000000
--- a/debian/patches/operator-bashism.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix a bashism in boolean operator
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: http://sourceforge.net/p/xmds/mailman/message/31812469/
-Last-Update: 2014-01-03
-
---- xmds2-2.1.4.orig/xpdeint/version.sh
-+++ xmds2-2.1.4/xpdeint/version.sh
-@@ -8,7 +8,7 @@ elif [ -d "../.git" ]; then
-   REVISION=\""r`git log -1 | sed -n 's/.*xpdeint@\([0-9]*\).*/\1/p'`"\"
-   # If we don't have a revision, then we must have git commits after the last SVN revision.
-   # So mark the revision number as the last SVN revision with '+git' appended.
--  if [ "$REVISION" == "\"r\"" ]; then
-+  if [ "$REVISION" = "\"r\"" ]; then
-     REVISION=\""r`git log | grep git-svn-id | head -1 | sed -n 's/.*xpdeint@\([0-9]*\).*/\1/p'`+git"\"
-   fi
- elif [ -f "Version.py" ]; then
diff --git a/debian/patches/series b/debian/patches/series
index cf235ff..cadaff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-interpreter-name-in-shebang.patch
-operator-bashism.patch
-drop-dependency-on-sphinx.patch
-string-quote-in-run-tests.patch
 revision-number-as-deb-pkg.patch
diff --git a/debian/patches/string-quote-in-run-tests.patch b/debian/patches/string-quote-in-run-tests.patch
deleted file mode 100644
index e87cef2..0000000
--- a/debian/patches/string-quote-in-run-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove extraneous string quotes in run_tests.py
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: http://sourceforge.net/p/xmds/mailman/message/31813996/
-Last-Update: 2014-01-06
-
---- xmds2-2.1.4.orig/run_tests.py
-+++ xmds2-2.1.4/run_tests.py
-@@ -138,7 +138,7 @@ def scriptTestingFunction(root, scriptNa
-   commandLineString = '"./' + simulationName + '"'
-   if commandLineElement:
-     # The command line element overrides the prefix
--    commandLineString = '"' + commandLineElement.innerText().strip() + '"'
-+    commandLineString = commandLineElement.innerText().strip()
-   if argumentsElement:
-     commandLineString += ' ' + argumentsElement.innerText().strip()
-   

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/xmds2.git