[SCM] spectacle packaging branch, kubuntu_stable, updated. ubuntu/15.12.1-1ubuntu1-10-g8cfb3aa

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Sat Mar 12 18:31:39 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/spectacle.git;a=commitdiff;h=637acd1

The following commit has been merged in the kubuntu_stable branch:
commit 637acd1500dffe7bb16c45b14ece0112a51d64d7
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Mar 12 09:51:03 2016 -0800

    Adjust patch to comment rather than remove.
---
 debian/changelog                                   | 7 +------
 debian/patches/kubuntu_test_desktop_mime_fix.patch | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25e454f..09e67bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,7 @@ kde-spectacle (15.12.2-0ubuntu1) UNRELEASED; urgency=medium
   * Add new build dep libkipi. 
   * Add kubuntu_test_desktop_mime_fix.patch to test
     desktop-mime-but-no-exec-code fix for upstream. 
-  * Add files. 
-  * Remove added cruft. 
-  * Refresh patch. 
-  * Line number corrections. 
-  * Patch whitespace?!  
-  * Last attempt at patching this. 
+  * Adjust patch to comment rather than remove. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 09 Mar 2016 21:10:49 -0800
 
diff --git a/debian/patches/kubuntu_test_desktop_mime_fix.patch b/debian/patches/kubuntu_test_desktop_mime_fix.patch
index dbf6a99..23ad4fc 100644
--- a/debian/patches/kubuntu_test_desktop_mime_fix.patch
+++ b/debian/patches/kubuntu_test_desktop_mime_fix.patch
@@ -1,7 +1,7 @@
-diff --git desktop/org.kde.spectacle.desktop desktop/org.kde.spectacle.desktop
+diff --git a/desktop/org.kde.spectacle.desktop b/desktop/org.kde.spectacle.desktop
 index 5f24638..58c0f9a 100644
---- desktop/org.kde.spectacle.desktop
-+++ desktop/org.kde.spectacle.desktop
+--- a/desktop/org.kde.spectacle.desktop
++++ b/desktop/org.kde.spectacle.desktop
 @@ -53,7 +53,7 @@ Name[uk]=Spectacle
  Name[x-test]=xxSpectaclexx
  Name[zh_TW]=Spectacle

-- 
spectacle packaging



More information about the pkg-kde-commits mailing list