[SCM] KDevelop Platform packaging branch, master, updated. debian/1.3.0-1-3-g64ca7bd

[Andreas Cord-Landwehr]

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

The following commit has been merged in the master branch:
commit 26175525c69d238e18f62926f7f4b8ce81347480
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Apr 15 15:43:55 2012 +0200

    Remove patch for bash shell usage in scripts.
    
    Scripts were changed upstream.
---
 debian/changelog                              |    1 +
 debian/patches/12_use_bash_for_formatter.diff |   14 --------------
 debian/patches/series                         |    1 -
 3 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a25f39..1954089 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kdevplatform (1.3.1-0r0) UNRELEASED; urgency=low
 
   [ Andreas Cord-Landwehr ]
   * New upstream release.
+  * Remove bash shell patch for kdev_format_source.sh: fixed upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 15 Apr 2012 15:39:13 +0200
 
diff --git a/debian/patches/12_use_bash_for_formatter.diff b/debian/patches/12_use_bash_for_formatter.diff
deleted file mode 100644
index 2b69b60..0000000
--- a/debian/patches/12_use_bash_for_formatter.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Fix usage of shell for script.
-Forwarded: no
-Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
-Last-Update: 2012-03-21
-Description: use bash shell for kdevplatform formatter script.
-
---- a/util/kdev_format_source.sh
-+++ b/util/kdev_format_source.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- # Author: David Nolden <david.nolden.kdevelop at art-master.de>
- # This script is made available under the GPLv2 licence.
diff --git a/debian/patches/series b/debian/patches/series
index 16f9bd4..a6a68c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 11_disable_examples_tests.diff
-12_use_bash_for_formatter.diff

-- 
KDevelop Platform packaging