[SCM] kmix packaging branch, master, updated. debian/4.13.3-1-4-gc997eeb

Maximiliano Curia maxy at moszumanska.debian.org
Wed Aug 20 19:10:46 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kmix.git;a=commitdiff;h=c997eeb

The following commit has been merged in the master branch:
commit c997eeb4dd6ae6fb8021b530ba1620015a762297
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Aug 20 20:06:45 2014 +0200

    Remove upstream applied patch: kubuntu_script-interpreter.diff
---
 debian/changelog                               |  1 +
 debian/patches/kubuntu_script-interpreter.diff | 15 ---------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0933115..ff1ce96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kmix (4:4.14.0-1) unstable; urgency=medium
 
   * New upstream release.
   * Update build dependencies.
+  * Remove upstream applied patch: kubuntu_script-interpreter.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 20 Aug 2014 19:51:35 +0200
 
diff --git a/debian/patches/kubuntu_script-interpreter.diff b/debian/patches/kubuntu_script-interpreter.diff
deleted file mode 100644
index c16a4c5..0000000
--- a/debian/patches/kubuntu_script-interpreter.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-commit 69703e92424ef29f33070201169bcfd12f8c17cd
-Author: Jonathan Riddell <jr at jriddell.org>
-Date:   Fri Mar 14 16:04:34 2014 +0000
-
-    add interpreter to script
-
-diff --git a/apps/kmixremote b/apps/kmixremote
-index 51f4eec..2f21209 100755
---- a/apps/kmixremote
-+++ b/apps/kmixremote
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #################################################################################
- # kmixremote - control kmix from a script.
- #
diff --git a/debian/patches/series b/debian/patches/series
index 2c5b2c5..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-kubuntu_script-interpreter.diff

-- 
kmix packaging



More information about the pkg-kde-commits mailing list