[SCM] KDevelop Platform packaging branch, master, updated. debian/1.7.0-2-6-g397b8a3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=cd6306d

The following commit has been merged in the master branch:
commit cd6306d9ad212cd6f4a0a8200f7a056b0f2ec617
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Aug 31 15:08:44 2015 +0200

    Remove upstream applied patch: fix_shell_script
---
 debian/changelog                |  1 +
 debian/patches/fix_shell_script | 16 ----------------
 debian/patches/series           |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae2dce9..f72a1e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdevplatform (1.7.1-1~) UNRELEASED; urgency=medium
 
   * New upstream release (1.7.1).
+  * Remove upstream applied patch: fix_shell_script
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 31 Aug 2015 13:36:03 +0200
 
diff --git a/debian/patches/fix_shell_script b/debian/patches/fix_shell_script
deleted file mode 100644
index e90f4f9..0000000
--- a/debian/patches/fix_shell_script
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Sune Vuorela
-Forwarded: no. Upstream wants the script rewritten. No time for that.
-
-Upstream decided that supporting the /bin/sh on openbsd is more important than having
-the script working in debian and derivatives.
-So Fix it by forcing bash.
-Index: b/util/kdevplatform_shell_environment.sh
-===================================================================
---- a/util/kdevplatform_shell_environment.sh
-+++ b/util/kdevplatform_shell_environment.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- # This file is part of KDevelop
- # Copyright 2011 David Nolden <david.nolden.kdevelop at art-master.de>
diff --git a/debian/patches/series b/debian/patches/series
index a4743f3..a6a68c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_shell_script
 11_disable_examples_tests.diff

-- 
KDevelop Platform packaging