[SCM] KDevelop Platform packaging branch, master, updated. debian/1.5.2-1-18-g84f94e7

Sune Vuorela pusling-guest at moszumanska.debian.org
Fri Sep 19 21:56:27 UTC 2014


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

The following commit has been merged in the master branch:
commit 6dcec164b888b146ee6a0e9edf952d9cb12fb0bf
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Fri Sep 19 23:37:42 2014 +0200

    Switch a script to /bin/bash - it uses bash specific features.
---
 debian/changelog                |  3 +++
 debian/patches/fix_shell_script | 16 ++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ab6c945..2494c5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ kdevplatform (1.7.0-0r1) UNRELEASED; urgency=medium
   * Convert rules to the dh sequencer with kde addon.
   * Remove unused cdbs build dependency.
 
+  [ Sune Vuorela ]
+  * Switch a script to /bin/bash - it uses bash specific features.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jan 2014 13:56:19 +0100
 
 kdevplatform (1.5.2-1) unstable; urgency=low
diff --git a/debian/patches/fix_shell_script b/debian/patches/fix_shell_script
new file mode 100644
index 0000000..e90f4f9
--- /dev/null
+++ b/debian/patches/fix_shell_script
@@ -0,0 +1,16 @@
+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 a6a68c8..a4743f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix_shell_script
 11_disable_examples_tests.diff

-- 
KDevelop Platform packaging



More information about the pkg-kde-commits mailing list