rev 17451 - in kde-extras/kchmviewer/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Thu Mar 18 10:31:28 UTC 2010 

Author: fabo
Date: 2010-03-18 10:31:27 +0000 (Thu, 18 Mar 2010)
New Revision: 17451

Added:
   kde-extras/kchmviewer/trunk/debian/patches/02_grammatical_error.diff
Modified:
   kde-extras/kchmviewer/trunk/debian/changelog
   kde-extras/kchmviewer/trunk/debian/control
   kde-extras/kchmviewer/trunk/debian/copyright
   kde-extras/kchmviewer/trunk/debian/patches/01_disable_kio-msits_build.diff
   kde-extras/kchmviewer/trunk/debian/patches/series
   kde-extras/kchmviewer/trunk/debian/rules
Log:
* Add 02_grammatical_error.diff patch. Thanks to Chris Leick.
  (Closes: #536201)
* Update debian/control:
  - Bump build dependencies versions (debhelper and pkg-kde-tools).
  - Bump Standards-Version to 3.8.4 (no changes needed).
* Update debian/copyright:
  - kchmviewer is licensed under the GPL version 3 since version 5.0.
* Update debian/rules:
  - Enable parallel build (pass --parallel option to dh).
  - Use kde sequence addon. (Closes: #574309)


Modified: kde-extras/kchmviewer/trunk/debian/changelog
===================================================================
--- kde-extras/kchmviewer/trunk/debian/changelog	2010-03-18 02:38:39 UTC (rev 17450)
+++ kde-extras/kchmviewer/trunk/debian/changelog	2010-03-18 10:31:27 UTC (rev 17451)
@@ -1,15 +1,27 @@
-kchmviewer (5.1-1) UNRELEASED; urgency=low
+kchmviewer (5.1-1) unstable; urgency=low
 
   * New upstream release.
-  * Update debian/rules:
-    - Switch to cdbs. (Closes: #574309)
+
+  [ José Manuel Santamaría Lema ]
   * Switch to dpkg-source 3.0 (quilt) format.
   * Update debian/control:
     - Remove quilt from Build-Depends.
-  * Refresh 01_disable_kio-msits_build.diff
+  * Refresh 01_disable_kio-msits_build.diff patch.
 
- -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 17 Mar 2010 19:56:04 +0100
+  [ Fathi Boudra ]
+  * Add 02_grammatical_error.diff patch. Thanks to Chris Leick.
+    (Closes: #536201)
+  * Update debian/control:
+    - Bump build dependencies versions (debhelper and pkg-kde-tools).
+    - Bump Standards-Version to 3.8.4 (no changes needed).
+  * Update debian/copyright:
+    - kchmviewer is licensed under the GPL version 3 since version 5.0.
+  * Update debian/rules:
+    - Enable parallel build (pass --parallel option to dh).
+    - Use kde sequence addon. (Closes: #574309)
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 17 Mar 2010 19:56:04 +0100
+
 kchmviewer (4.1-1) unstable; urgency=low
 
   * New upstream release. (Closes: #479402, #496888)

Modified: kde-extras/kchmviewer/trunk/debian/control
===================================================================
--- kde-extras/kchmviewer/trunk/debian/control	2010-03-18 02:38:39 UTC (rev 17450)
+++ kde-extras/kchmviewer/trunk/debian/control	2010-03-18 10:31:27 UTC (rev 17451)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Jose Luis Tallon <jltallon at adv-solutions.net>
-Build-Depends: debhelper (>= 7.3.8), cmake, pkg-kde-tools (>= 0.4.11),
+Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.4),
  kdelibs5-dev, libchm-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
 Package: kchmviewer

Modified: kde-extras/kchmviewer/trunk/debian/copyright
===================================================================
--- kde-extras/kchmviewer/trunk/debian/copyright	2010-03-18 02:38:39 UTC (rev 17450)
+++ kde-extras/kchmviewer/trunk/debian/copyright	2010-03-18 10:31:27 UTC (rev 17451)
@@ -1,26 +1,39 @@
-This package was debianized by Tommaso Moroni <moronito at debian.org> on
-Sat, 24 Sep 2005 18:52:09 +0200.
-..and later redone by Jose Luis Tallon <jltallon at adv-solutions.net>
+This work was packaged for Debian by:
 
-It was downloaded from http://kchmviewer.sourceforge.net
+    Tommaso Moroni <moronito at debian.org>
+    Jose Luis Tallon <jltallon at adv-solutions.net>
+    on Sat, 24 Sep 2005 18:52:09 +0200.
 
+It was downloaded from:
+
+    http://kchmviewer.sourceforge.net
+
 Copyright Holder:
 
-   © 2004-2009 Georgy Gunayev <tim at krasnogorsk.ru>
+    © 2004-2010 Georgy Gunayev <tim at krasnogorsk.ru>
 
-License statement:
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+License:
 
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-Additional Licenses:
-   The 'kio-msits' KIOSlave module is covered by the GNU LGPL license.
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-On Debian systems, the complete text of the GNU GPL2 and LGPL licenses
-can be found at `/usr/share/common-licenses'.
+    You should have received a copy of the GNU General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General
+Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+The Debian packaging is:
+
+    Copyright (C) 2009-2010 Fathi Boudra <fabo at debian.org>
+    Copyright (C) 2005-2008 Jose Luis Tallon <jltallon at adv-solutions.net>
+    Copyright (C) 2005 Tommaso Moroni <moronito at debian.org>
+
+and is licensed under the GPL version 3, see above.

Modified: kde-extras/kchmviewer/trunk/debian/patches/01_disable_kio-msits_build.diff
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/01_disable_kio-msits_build.diff	2010-03-18 02:38:39 UTC (rev 17450)
+++ kde-extras/kchmviewer/trunk/debian/patches/01_disable_kio-msits_build.diff	2010-03-18 10:31:27 UTC (rev 17451)
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -18,7 +18,6 @@
+@@ -18,7 +18,6 @@ ADD_DEFINITIONS( -DUSE_KDE )
  
  # Run in those subdirectories
  ADD_SUBDIRECTORY( lib/libchmfile )

Added: kde-extras/kchmviewer/trunk/debian/patches/02_grammatical_error.diff
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/02_grammatical_error.diff	                        (rev 0)
+++ kde-extras/kchmviewer/trunk/debian/patches/02_grammatical_error.diff	2010-03-18 10:31:27 UTC (rev 17451)
@@ -0,0 +1,121 @@
+--- a/po/kchmviewer.pot
++++ b/po/kchmviewer.pot
+@@ -213,7 +213,7 @@ msgstr ""
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_cs.po
++++ b/po/kchmviewer_cs.po
+@@ -226,7 +226,7 @@ msgstr "Hledání se nezdařilo"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_fr.po
++++ b/po/kchmviewer_fr.po
+@@ -236,7 +236,7 @@ msgstr "La recherche  a échoué"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_hu.po
++++ b/po/kchmviewer_hu.po
+@@ -229,7 +229,7 @@ msgstr "Keresés érvénytelen"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_it.po
++++ b/po/kchmviewer_it.po
+@@ -225,7 +225,7 @@ msgstr "Ricerca fallita"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_nl.po
++++ b/po/kchmviewer_nl.po
+@@ -227,7 +227,7 @@ msgstr "Zoekopdracht mislukt"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_ru.po
++++ b/po/kchmviewer_ru.po
+@@ -227,7 +227,7 @@ msgstr "Поиск не удался"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_sv.po
++++ b/po/kchmviewer_sv.po
+@@ -225,7 +225,7 @@ msgstr "Sökning misslyckades"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_tr.po
++++ b/po/kchmviewer_tr.po
+@@ -227,7 +227,7 @@ msgstr "Arama başarısız"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/po/kchmviewer_zh_CN.po
++++ b/po/kchmviewer_zh_CN.po
+@@ -226,7 +226,7 @@ msgstr "搜索失败"
+ msgid ""
+ "<html><p>The improved search engine allows you to search for a word, symbol "
+ "or phrase, which is set of words and symbols included in quotes. Only the "
+-"documents which include all the terms speficide in th search query are "
++"documents which include all the terms specified in th search query are "
+ "shown; no prefixes needed.<p>Unlike MS CHM internal search index, my "
+ "improved search engine indexes everything, including special symbols. "
+ "Therefore it is possible to search (and find!) for something like <i>$q = "
+--- a/src/tab_search.cpp
++++ b/src/tab_search.cpp
+@@ -184,7 +184,7 @@ void TabSearch::saveSettings( Settings::
+ void TabSearch::onHelpClicked( const QString & )
+ {
+ 	QWhatsThis::showText ( mapToGlobal( lblHelp->pos() ),
+-		i18n( "<html><p>The improved search engine allows you to search for a word, symbol or phrase, which is set of words and symbols included in quotes. Only the documents which include all the terms speficide in th search query are shown; no prefixes needed.<p>Unlike MS CHM internal search index, my improved search engine indexes everything, including special symbols. Therefore it is possible to search (and find!) for something like <i>$q = new ChmFile();</i>. This search also fully supports Unicode, which means that you can search in non-English documents.<p>If you want to search for a quote symbol, use quotation mark instead. The engine treats a quote and a quotation mark as the same symbol, which allows to use them in phrases.</html>") );
++		i18n( "<html><p>The improved search engine allows you to search for a word, symbol or phrase, which is set of words and symbols included in quotes. Only the documents which include all the terms specified in th search query are shown; no prefixes needed.<p>Unlike MS CHM internal search index, my improved search engine indexes everything, including special symbols. Therefore it is possible to search (and find!) for something like <i>$q = new ChmFile();</i>. This search also fully supports Unicode, which means that you can search in non-English documents.<p>If you want to search for a quote symbol, use quotation mark instead. The engine treats a quote and a quotation mark as the same symbol, which allows to use them in phrases.</html>") );
+ }
+ 
+ 

Modified: kde-extras/kchmviewer/trunk/debian/patches/series
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/series	2010-03-18 02:38:39 UTC (rev 17450)
+++ kde-extras/kchmviewer/trunk/debian/patches/series	2010-03-18 10:31:27 UTC (rev 17451)
@@ -1 +1,2 @@
 01_disable_kio-msits_build.diff
+02_grammatical_error.diff

Modified: kde-extras/kchmviewer/trunk/debian/rules
===================================================================
--- kde-extras/kchmviewer/trunk/debian/rules	2010-03-18 02:38:39 UTC (rev 17450)
+++ kde-extras/kchmviewer/trunk/debian/rules	2010-03-18 10:31:27 UTC (rev 17451)
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh --parallel --with kde $@
\ No newline at end of file

More information about the pkg-kde-commits mailing list