[SCM] kiten packaging branch, kubuntu_unstable, updated. debian/14.12.2-1-4-gc371e45

Harald Sitter apachelogger-guest at moszumanska.debian.org
Tue Mar 10 13:28:13 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit c371e45308a2c659a6251945fc1bf3345581f8c8
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 10 14:26:28 2015 +0100

    drop patches
---
 debian/patches/avoid_installing_incomplete_header | 15 ---------------
 debian/patches/enable_debianabimanager.diff       | 19 -------------------
 debian/patches/series                             |  2 --
 3 files changed, 36 deletions(-)

diff --git a/debian/patches/avoid_installing_incomplete_header b/debian/patches/avoid_installing_incomplete_header
deleted file mode 100644
index f6dc894..0000000
--- a/debian/patches/avoid_installing_incomplete_header
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: kiten/lib/CMakeLists.txt
-===================================================================
---- 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 @@
- 	  DESTINATION ${INCLUDE_INSTALL_DIR}/libkiten COMPONENT Devel
- 		)
- install(FILES
--        DictEdict/dictfileedict.h
-         DictEdict/entryedict.h
-         DESTINATION ${INCLUDE_INSTALL_DIR}/libkiten/DictEdict COMPONENT Devel)
- install(FILES
--        DictKanjidic/dictfilekanjidic.h
-         DictKanjidic/entrykanjidic.h
-         DESTINATION ${INCLUDE_INSTALL_DIR}/libkiten/DictKanjidic COMPONENT Devel)
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
deleted file mode 100644
index e1ae907..0000000
--- a/debian/patches/enable_debianabimanager.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-From: Pino Toscano <pino at debian.org>
-Subject: Use DebianABIManager for this source package. It's Debian-specific.
-Forwarded: not-needed
-Last-Update: 2012-06-16
-
-For more information about DebianABIManager, refer to
-/usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
-
-Index: kiten/CMakeLists.txt
-===================================================================
---- kiten.orig/CMakeLists.txt	2014-08-19 23:14:39.142352102 +0200
-+++ kiten/CMakeLists.txt	2014-08-19 23:14:39.138352266 +0200
-@@ -37,3 +37,5 @@
- 
- ## Install our datafiles
- install( FILES data/edict data/kanjidic data/radkfile data/vconj data/romkana.cnv DESTINATION ${DATA_INSTALL_DIR}/kiten )
-+
-+include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/series b/debian/patches/series
index 41029b5..08d61cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-enable_debianabimanager.diff
 remove_skip_codes
-avoid_installing_incomplete_header

-- 
kiten packaging



More information about the pkg-kde-commits mailing list