[SCM] kiten packaging branch, master, updated. debian/15.12.1-1-13-gac3837d

Maximiliano Curia maxy at moszumanska.debian.org
Thu May 26 08:59:49 UTC 2016


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

The following commit has been merged in the master branch:
commit 39cdb42187532c72e0038e99b992f3cb22e52a0d
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 21 04:08:59 2016 +0200

    Refresh patches
---
 debian/patches/avoid_installing_incomplete_header | 17 +++++++++++++----
 debian/patches/remove_skip_codes                  | 23 +++++++++++------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/debian/patches/avoid_installing_incomplete_header b/debian/patches/avoid_installing_incomplete_header
index f6dc894..6af0bf5 100644
--- a/debian/patches/avoid_installing_incomplete_header
+++ b/debian/patches/avoid_installing_incomplete_header
@@ -1,8 +1,17 @@
-Index: kiten/lib/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 04:08:58 +0200
+Subject: avoid_installing_incomplete_header
+
 ===================================================================
---- kiten.orig/lib/CMakeLists.txt	2015-02-19 10:06:37.152403543 +0100
-+++ kiten/lib/CMakeLists.txt	2015-02-19 10:07:00.727460940 +0100
-@@ -39,10 +39,8 @@
+---
+ lib/CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index b8a4cf0..51bfaef 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -49,10 +49,8 @@ install( FILES
  	  DESTINATION ${INCLUDE_INSTALL_DIR}/libkiten COMPONENT Devel
  		)
  install(FILES
diff --git a/debian/patches/remove_skip_codes b/debian/patches/remove_skip_codes
index 961d8db..e2877e0 100644
--- a/debian/patches/remove_skip_codes
+++ b/debian/patches/remove_skip_codes
@@ -1,16 +1,15 @@
-Description: Remove SKIP codes
- This patch is the result of running:
- $ sed -i 's/ P[0-9]*-[0-9]*-[0-9]*//g' data/kanjidic
-Author: Maximiliano Curia <maxy at debian.org>
-Bug: #741219
-Forwarded: no
-Last-Update: 2014-04-12
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 04:08:58 +0200
+Subject: remove_skip_codes
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: kiten/data/kanjidic
-===================================================================
---- kiten.orig/data/kanjidic	2014-04-12 21:27:48.894229561 +0200
-+++ kiten/data/kanjidic	2014-04-12 21:35:06.688526778 +0200
+ data/kanjidic | 12710 ++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 6355 insertions(+), 6355 deletions(-)
+
+diff --git a/data/kanjidic b/data/kanjidic
+index 7d91953..d6b180a 100644
+--- a/data/kanjidic
++++ b/data/kanjidic
 @@ -1,6356 +1,6356 @@
  # KANJIDIC JIS X 0208 Kanji Information File/See the kanjidic_doc.html file for full details/Copyright Electronic Dictionary Research & Development Group - 2010/2011-04-10/
 -°¡ 3021 U4e9c B1 C7 G8 S7 XJ05033 F1509 J1 N43 V81 H3540 DK2204 L1809 K1331 O525 DO1788 MN272 MP1.0525 E997 IN1616 DF1032 DT1092 DJ1818 DG35 DM1827 P4-7-1 I0a7.14 Q1010.6 DR3273 Yya4 Wa ¥¢ ¤Ä.¤° T1 ¤ä ¤Ä¤® ¤Ä¤° {Asia} {rank next} {come after} {-ous} 

-- 
kiten packaging



More information about the pkg-kde-commits mailing list