[SCM] kiten packaging branch, master, updated. debian/4.13.3-1-5-g9e2baf5
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Sep 4 12:21:52 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kiten.git;a=commitdiff;h=1fb3ca9
The following commit has been merged in the master branch:
commit 1fb3ca9cfb7b7ce89b498b2490b7a07a406806cd
Author: Maximiliano Curia <maxy at debian.org>
Date: Tue Aug 19 23:16:32 2014 +0200
Refresh patches, remove obsolete ones
---
debian/changelog | 1 +
debian/patches/enable_debianabimanager.diff | 8 +++--
debian/patches/kiten_deinflection_search_leaks | 37 ----------------------
debian/patches/kiten_dictfileedict_dosearch_leaks | 30 ------------------
.../patches/kiten_dictfilekanjidic_dosearch_leaks | 18 -----------
debian/patches/kiten_kanjibrowser_loadkanji_leaks | 22 -------------
.../kiten_radicalfile_loadradicalfile_leaks | 18 -----------
7 files changed, 6 insertions(+), 128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eb0d887..000f137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kiten (4:4.14.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Update install file.
+ * Refresh patches.
-- Maximiliano Curia <maxy at debian.org> Mon, 18 Aug 2014 18:17:46 +0200
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index eda315c..e1ae907 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -7,9 +7,11 @@ 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)).
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,3 +36,5 @@ install( TARGETS kitengen ${INSTALL_TARG
+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 )
diff --git a/debian/patches/kiten_deinflection_search_leaks b/debian/patches/kiten_deinflection_search_leaks
deleted file mode 100644
index 29a0317..0000000
--- a/debian/patches/kiten_deinflection_search_leaks
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 5b5cf8de24231ec1fb8a49178676b28e643e3282
-Author: Maximiliano Curia <maxy at debian.org>
-Date: Mon Feb 10 13:28:27 2014 +0100
-
- Deinflection::search leaks
-
-diff --git a/lib/DictEdict/deinflection.cpp b/lib/DictEdict/deinflection.cpp
-index 62d0925..2679dd0 100644
---- a/lib/DictEdict/deinflection.cpp
-+++ b/lib/DictEdict/deinflection.cpp
-@@ -98,6 +98,7 @@ EntryList* Deinflection::search( const DictQuery &query, const QVector<QString>
- matched = true;
- }
- }
-+ if (! matched) delete entry;
- }
-
- EntryList *results = new EntryList();
-@@ -113,6 +114,9 @@ EntryList* Deinflection::search( const DictQuery &query, const QVector<QString>
-
- if( text.isEmpty() )
- {
-+ entries->deleteAll();
-+ delete entries;
-+ delete results;
- return NULL;
- }
- }
-@@ -153,7 +157,7 @@ EntryList* Deinflection::search( const DictQuery &query, const QVector<QString>
- }
- }
- }
--
-+ delete entries;
- return results;
- }
-
diff --git a/debian/patches/kiten_dictfileedict_dosearch_leaks b/debian/patches/kiten_dictfileedict_dosearch_leaks
deleted file mode 100644
index aace321..0000000
--- a/debian/patches/kiten_dictfileedict_dosearch_leaks
+++ /dev/null
@@ -1,30 +0,0 @@
-commit c52b284a504109d03fdb1a4515dd20094bd7e619
-Author: Maximiliano Curia <maxy at debian.org>
-Date: Mon Feb 10 15:51:56 2014 +0100
-
- DictFileEdict::doSearch leaks
-
-diff --git a/lib/DictEdict/dictfileedict.cpp b/lib/DictEdict/dictfileedict.cpp
-index a84ffe1..fe5348e 100644
---- a/lib/DictEdict/dictfileedict.cpp
-+++ b/lib/DictEdict/dictfileedict.cpp
-@@ -193,6 +193,8 @@ EntryList *DictFileEdict::doSearch( const DictQuery &query )
- results = new EntryList();
- results->appendList( common );
- results->appendList( uncommon );
-+ delete common;
-+ delete uncommon;
-
- EntryList *exact = new EntryList();
- EntryList *beginning = new EntryList();
-@@ -227,6 +229,10 @@ EntryList *DictFileEdict::doSearch( const DictQuery &query )
- results->appendList( beginning );
- results->appendList( ending );
- results->appendList( anywhere );
-+ delete exact;
-+ delete beginning;
-+ delete ending;
-+ delete anywhere;
- }
-
- return results;
diff --git a/debian/patches/kiten_dictfilekanjidic_dosearch_leaks b/debian/patches/kiten_dictfilekanjidic_dosearch_leaks
deleted file mode 100644
index e9cca30..0000000
--- a/debian/patches/kiten_dictfilekanjidic_dosearch_leaks
+++ /dev/null
@@ -1,18 +0,0 @@
-commit c323d006b4f6a7d402e9f8849547d0671b18df9d
-Author: Maximiliano Curia <maxy at debian.org>
-Date: Mon Feb 10 15:03:18 2014 +0100
-
- DictFileKanjidic::doSearch leaks
-
-diff --git a/lib/DictKanjidic/dictfilekanjidic.cpp b/lib/DictKanjidic/dictfilekanjidic.cpp
-index 24ecea5..55e9eeb 100644
---- a/lib/DictKanjidic/dictfilekanjidic.cpp
-+++ b/lib/DictKanjidic/dictfilekanjidic.cpp
-@@ -139,6 +139,7 @@ EntryList* DictFileKanjidic::doSearch( const DictQuery &query )
- {
- results->append( entry );
- }
-+ else delete entry;
- }
- }
-
diff --git a/debian/patches/kiten_kanjibrowser_loadkanji_leaks b/debian/patches/kiten_kanjibrowser_loadkanji_leaks
deleted file mode 100644
index eec6d0f..0000000
--- a/debian/patches/kiten_kanjibrowser_loadkanji_leaks
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 32f1f80e4a98fb147aaa1be0f47911e6871ac7ed
-Author: Maximiliano Curia <maxy at debian.org>
-Date: Mon Feb 10 15:25:42 2014 +0100
-
- KanjiBrowser::loadKanji leaks
-
-diff --git a/kanjibrowser/kanjibrowser.cpp b/kanjibrowser/kanjibrowser.cpp
-index bc932a9..79f7a02 100644
---- a/kanjibrowser/kanjibrowser.cpp
-+++ b/kanjibrowser/kanjibrowser.cpp
-@@ -62,7 +62,10 @@ KanjiBrowser::KanjiBrowser()
-
- KanjiBrowser::~KanjiBrowser()
- {
--
-+ if( _dictFileKanjidic )
-+ {
-+ delete _dictFileKanjidic;
-+ }
- }
-
- void KanjiBrowser::changeStatusBar( const QString &text )
diff --git a/debian/patches/kiten_radicalfile_loadradicalfile_leaks b/debian/patches/kiten_radicalfile_loadradicalfile_leaks
deleted file mode 100644
index 19dee79..0000000
--- a/debian/patches/kiten_radicalfile_loadradicalfile_leaks
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 65f8a5326026b50fd7a7c33bf08981127c8cdb95
-Author: Maximiliano Curia <maxy at debian.org>
-Date: Mon Feb 10 15:18:33 2014 +0100
-
- RadicalFile::loadRadicalFile leaks
-
-diff --git a/radselect/radicalfile.cpp b/radselect/radicalfile.cpp
-index bf79b7d..cbe4b57 100644
---- a/radselect/radicalfile.cpp
-+++ b/radselect/radicalfile.cpp
-@@ -102,6 +102,7 @@ bool RadicalFile::loadRadicalFile( QString &radkfile )
- if( newestRadical != NULL )
- {
- m_radicals[ *newestRadical ] = *newestRadical;
-+ delete newestRadical;
- }
-
- //Move contents of our krad QHash into our hash of m_kanji
--
kiten packaging
More information about the pkg-kde-commits
mailing list