[SCM] kmix packaging branch, master, updated. debian/15.12.0-1-13-gac0e2a1

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 21 18:09:10 UTC 2016


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

The following commit has been merged in the master branch:
commit a04adc427b1af6a5d63ffc5508fff428131622cb
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 21 01:37:12 2016 +0200

    Refresh patches
---
 debian/patches/kmix_showeverywhere.diff  | 16 ++++++++++------
 debian/patches/kubuntu_cmake-policy.diff | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/debian/patches/kmix_showeverywhere.diff b/debian/patches/kmix_showeverywhere.diff
index 6153b2c..17c8f79 100644
--- a/debian/patches/kmix_showeverywhere.diff
+++ b/debian/patches/kmix_showeverywhere.diff
@@ -1,10 +1,14 @@
-Description: show kmix in the menus of other desktop environments
- The patch remove OnlyShowIn=KDE from kmix.desktop
-Author: Modestas Vainius <modax at debian.org>
-Forwarded: no
-Last-Update: 2013-06-17
-Index: b/kmix.desktop
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 01:37:11 +0200
+Subject: kmix_showeverywhere
+
 ===================================================================
+---
+ kmix.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/kmix.desktop b/kmix.desktop
+index 3e1df09..3069100 100755
 --- a/kmix.desktop
 +++ b/kmix.desktop
 @@ -1,7 +1,6 @@
diff --git a/debian/patches/kubuntu_cmake-policy.diff b/debian/patches/kubuntu_cmake-policy.diff
index 7749b7d..da02927 100644
--- a/debian/patches/kubuntu_cmake-policy.diff
+++ b/debian/patches/kubuntu_cmake-policy.diff
@@ -1,16 +1,16 @@
-Description: set cmake policy to allow compilation
- new cmake policy means kmix can't compile, set to old policy
-Author: Jonathan Riddell
-Origin: me
-Forwarded: will send to upstream maintainer
-Last-Update: 2015-09-07
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 01:37:11 +0200
+Subject: kubuntu_cmake-policy
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: kmix-15.08.0/CMakeLists.txt
-===================================================================
---- kmix-15.08.0.orig/CMakeLists.txt
-+++ kmix-15.08.0/CMakeLists.txt
-@@ -27,6 +27,8 @@ if(POLICY CMP0046)
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 94fe651..fe72468 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ if(POLICY CMP0046)
    cmake_policy (SET CMP0046 NEW)
  endif()
  

-- 
kmix packaging



More information about the pkg-kde-commits mailing list