Bug#781219: kdevelop 4.7.1 and kdevplatform 1.7.1 package patch

[张敬强 <godfrey.public@gmail.com>]

Dear Maintainers:
    I do a repackage of kdevplatform 1.7.1 and kdevelop 4.7.1 locally,
and found some change need to be made.
    0001-upstream-release-4.7.1-install-new-.so-file.patch is for kdevelop
    0001-upstream-release-1.7.1-drop-bash-patch.patch is for kdevplatform
    The kdevelop 4.7.1 fix <time.h> parse bug, which may influence many
people.

Thanks

From 48a4d50cc58522cbcf143552f3cbf10b1c34541f Mon Sep 17 00:00:00 2001
From: Zhang Jingqiang <zhangjq@sxis.com>
Date: Thu, 23 Apr 2015 14:11:47 +0800
Subject: [PATCH] upstream release 1.7.1, drop bash patch

---
 debian/changelog                | 10 ++++++++++
 debian/patches/fix_shell_script | 16 ----------------
 debian/patches/series           |  1 -
 3 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 debian/patches/fix_shell_script

diff --git a/debian/changelog b/debian/changelog
index ef88392..43524db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kdevplatform (1.7.1-1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release.
+
+  [ Zhang Jingqiang ]
+  * Drop patch fix_shell_script, applied upstream.
+
+ -- Zhang Jingqiang <godfrey.public@gmail.com>  Thu, 23 Apr 2015 14:04:59 +0800
+
 kdevplatform (1.7.0-2) unstable; urgency=medium
 
   * Team upload.
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@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
-- 
2.1.4

From 0c9680c7130508cac04c018adbcbbe73ba8b7a62 Mon Sep 17 00:00:00 2001
From: Zhang Jingqiang <zhangjq@sxis.com>
Date: Thu, 23 Apr 2015 14:22:02 +0800
Subject: [PATCH] upstream release 4.7.1, install new .so file

---
 debian/changelog        | 10 ++++++++--
 debian/kdevelop.install |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34cc8ee..60f0d7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,7 @@
-kdevelop (4:4.7.0-2) UNRELEASED; urgency=medium
+kdevelop (4:4.7.1-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release.
 
   [ Pino Toscano ]
   * Change section of kdevelop-dev to libdevel.
@@ -8,7 +11,10 @@ kdevelop (4:4.7.0-2) UNRELEASED; urgency=medium
   * Make KDevelop recommend kapptemplate to have more meaningful project
     templates available.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 24 Sep 2014 07:23:44 +0200
+  [ Zhang Jingqiang ]
+  * Install new .so file usr/lib/libkdevcompilerprovider.so.
+
+ -- Zhang Jingqiang <godfrey.public@gmail.com>  Thu, 23 Apr 2015 14:18:46 +0800
 
 kdevelop (4:4.7.0-1) unstable; urgency=medium
 
diff --git a/debian/kdevelop.install b/debian/kdevelop.install
index aeff8e8..13bcbee 100644
--- a/debian/kdevelop.install
+++ b/debian/kdevelop.install
@@ -3,5 +3,6 @@ usr/bin/kdevelop
 usr/bin/kdevelop!
 usr/lib/kde4/*
 usr/lib/libkdev4*.so
+usr/lib/libkdevcompilerprovider.so
 usr/share/applications/kde4/*
 usr/share/kde4/services/*
-- 
2.1.4