[SCM] keurocalc Debian packaging branch, master, updated. upstream/1.2.0-24-g2fc45a4

Michael Meskes meskes at moszumanska.debian.org
Sat Jan 25 11:21:28 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/keurocalc.git;a=commitdiff;h=2fc45a4

The following commit has been merged in the master branch:
commit 2fc45a4b7ac773e6575223caf32968ae22547fc3
Merge: 6df116cadd03b2e2d60de21c0aac9149fd845324 dc027f33a63ee10581ec46acffca94c2a0ec6ef8
Author: Michael Meskes <meskes at debian.org>
Date:   Sat Jan 25 12:05:40 2014 +0100

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 CMakeLists.txt                |    4 +-
 curconvd/CMakeLists.txt       |    2 +
 curconvd/converter.cpp        |    2 +-
 curconvd/converter.h          |    2 +-
 curconvd/main.cpp             |    6 +-
 curconvd/table.cpp            |    2 +-
 curconvd/table.h              |    2 +-
 currencies/currencies.cpp     |    2 +-
 currencies/currencies.h       |    2 +-
 currencies/currencies.xml     |    1 +
 debian/changelog              |    6 +
 doc/CMakeLists.txt            |    1 +
 doc/da.po                     |  305 ++++-----
 doc/da/index.docbook          |  240 +++----
 doc/{pt_BR.po => de.po}       | 1027 +++++++++++++++--------------
 doc/{en => de}/CMakeLists.txt |    2 +-
 doc/de/index.docbook          | 1444 +++++++++++++++++++++++++++++++++++++++++
 doc/de/screenshot.png         |  Bin 0 -> 60466 bytes
 doc/de/settings.png           |  Bin 0 -> 65152 bytes
 doc/en/CMakeLists.txt         |    4 +-
 doc/en/index.docbook          |   11 +-
 doc/es.po                     |  447 +++++--------
 doc/es/index.docbook          |  246 +++----
 doc/et.po                     |  528 +++++----------
 doc/et/index.docbook          |  107 ++-
 doc/fr.po                     |  366 +++++------
 doc/fr/index.docbook          |   77 +--
 doc/it.po                     |  372 ++++-------
 doc/it/index.docbook          |   43 +-
 doc/keurocalc.pot             |  579 ++++++++---------
 doc/nb.po                     |  263 ++++----
 doc/nb/index.docbook          |  311 ++++-----
 doc/nl.po                     |  368 ++++-------
 doc/nl/index.docbook          |   43 +-
 doc/pt.po                     |  249 ++++---
 doc/pt/index.docbook          |   21 +-
 doc/pt_BR.po                  |  271 ++++----
 doc/pt_BR/index.docbook       |   27 +-
 doc/sv.po                     |  319 ++++-----
 doc/sv/index.docbook          |   23 +-
 doc/uk.po                     |  323 ++++-----
 doc/uk/index.docbook          |   23 +-
 keurocalc.lsm                 |    2 +-
 keurocalc.spec                |   49 +-
 keurocalc/CMakeLists.txt      |    2 +
 keurocalc/keurocalc.cpp       |    2 +-
 keurocalc/keurocalc.desktop   |   33 +-
 keurocalc/keurocalc.h         |    2 +-
 keurocalc/main.cpp            |    6 +-
 keurocalc/preferences.cpp     |    2 +-
 keurocalc/preferences.h       |    2 +-
 po/CMakeLists.txt             |    7 +-
 po/ar/CMakeLists.txt          |    2 -
 po/ar/keurocalc.po            |  848 ------------------------
 po/bg/CMakeLists.txt          |    2 +-
 po/bg/keurocalc.po            | 1064 +++++++++++++++---------------
 po/bs/CMakeLists.txt          |    2 +-
 po/bs/curconvd.po             |   21 +-
 po/bs/keurocalc.po            |  983 +++++++++++++---------------
 po/ca/CMakeLists.txt          |    2 +-
 po/ca/curconvd.po             |   27 +-
 po/ca/keurocalc.po            | 1051 +++++++++++++-----------------
 po/ca at valencia/CMakeLists.txt |    2 +-
 po/ca at valencia/curconvd.po    |   29 +-
 po/ca at valencia/keurocalc.po   | 1053 +++++++++++++-----------------
 po/cs/CMakeLists.txt          |    2 +-
 po/cs/curconvd.po             |   23 +-
 po/cs/keurocalc.po            |  946 +++++++++++++--------------
 po/curconvd.pot               |   16 +-
 po/da/CMakeLists.txt          |    2 +-
 po/da/curconvd.po             |   20 +-
 po/da/keurocalc.po            |  940 +++++++++++++--------------
 po/de/CMakeLists.txt          |    2 +-
 po/de/curconvd.po             |   35 +-
 po/de/keurocalc.po            |  949 +++++++++++++--------------
 po/el/CMakeLists.txt          |    2 +-
 po/el/curconvd.po             |   20 +-
 po/el/keurocalc.po            | 1064 +++++++++++++++---------------
 po/en_GB/CMakeLists.txt       |    2 +-
 po/en_GB/curconvd.po          |   20 +-
 po/en_GB/keurocalc.po         | 1064 +++++++++++++++---------------
 po/es/CMakeLists.txt          |    2 +-
 po/es/curconvd.po             |   41 +-
 po/es/keurocalc.po            | 1049 +++++++++++++-----------------
 po/et/CMakeLists.txt          |    2 +-
 po/et/curconvd.po             |   36 +-
 po/et/keurocalc.po            | 1046 +++++++++++++----------------
 po/fi/CMakeLists.txt          |    2 +
 po/fi/curconvd.po             |   75 +++
 po/{cs => fi}/keurocalc.po    | 1045 ++++++++++++++---------------
 po/fr/CMakeLists.txt          |    2 +-
 po/fr/curconvd.po             |   46 +-
 po/fr/keurocalc.po            |  975 +++++++++++++---------------
 po/ga/CMakeLists.txt          |    2 +-
 po/ga/curconvd.po             |   24 +-
 po/ga/keurocalc.po            | 1002 +++++++++++++---------------
 po/gl/CMakeLists.txt          |    2 +-
 po/gl/curconvd.po             |   43 +-
 po/gl/keurocalc.po            | 1031 +++++++++++++----------------
 po/hu/CMakeLists.txt          |    2 +-
 po/hu/curconvd.po             |   46 +-
 po/hu/keurocalc.po            | 1067 ++++++++++++++----------------
 po/it/CMakeLists.txt          |    2 +-
 po/it/curconvd.po             |   28 +-
 po/it/keurocalc.po            |  940 +++++++++++++--------------
 po/ja/CMakeLists.txt          |    2 +-
 po/ja/keurocalc.po            |  988 ++++++++++++++--------------
 po/ka/CMakeLists.txt          |    2 -
 po/ka/keurocalc.po            |  862 ------------------------
 po/keurocalc.pot              |  577 ++++++++--------
 po/ko/CMakeLists.txt          |    2 +-
 po/ko/curconvd.po             |   23 +-
 po/ko/keurocalc.po            |  996 ++++++++++++++--------------
 po/nb/CMakeLists.txt          |    2 +-
 po/nb/curconvd.po             |   38 +-
 po/nb/keurocalc.po            |  954 +++++++++++++--------------
 po/nds/CMakeLists.txt         |    2 +-
 po/nds/curconvd.po            |   20 +-
 po/nds/keurocalc.po           | 1068 ++++++++++++++----------------
 po/nl/CMakeLists.txt          |    2 +-
 po/nl/curconvd.po             |   20 +-
 po/nl/keurocalc.po            |  940 +++++++++++++--------------
 po/pl/CMakeLists.txt          |    2 +-
 po/pl/curconvd.po             |   38 +-
 po/pl/keurocalc.po            | 1042 +++++++++++++----------------
 po/pt/CMakeLists.txt          |    2 +-
 po/pt/curconvd.po             |   22 +-
 po/pt/keurocalc.po            |  942 +++++++++++++--------------
 po/pt_BR/CMakeLists.txt       |    2 +-
 po/pt_BR/curconvd.po          |   20 +-
 po/pt_BR/keurocalc.po         |  940 +++++++++++++--------------
 po/ru/CMakeLists.txt          |    2 +-
 po/ru/keurocalc.po            |  988 ++++++++++++++--------------
 po/sk/CMakeLists.txt          |    2 +
 po/{cs => sk}/curconvd.po     |   56 +-
 po/{cs => sk}/keurocalc.po    | 1030 ++++++++++++++---------------
 po/sl/CMakeLists.txt          |    2 +
 po/{pl => sl}/curconvd.po     |   56 +-
 po/{cs => sl}/keurocalc.po    | 1037 ++++++++++++++---------------
 po/sr/CMakeLists.txt          |    2 +-
 po/sr/curconvd.po             |   34 +-
 po/sr/keurocalc.po            | 1075 ++++++++++++++----------------
 po/sr at latin/CMakeLists.txt    |    2 +-
 po/sr at latin/curconvd.po       |   34 +-
 po/sr at latin/keurocalc.po      | 1071 ++++++++++++++----------------
 po/sv/CMakeLists.txt          |    2 +-
 po/sv/curconvd.po             |   26 +-
 po/sv/keurocalc.po            | 1046 +++++++++++++----------------
 po/ta/CMakeLists.txt          |    2 -
 po/ta/keurocalc.po            |  896 -------------------------
 po/tr/CMakeLists.txt          |    2 +-
 po/tr/curconvd.po             |   46 +-
 po/tr/keurocalc.po            | 1003 ++++++++++++++--------------
 po/ug/CMakeLists.txt          |    2 +
 po/{cs => ug}/keurocalc.po    | 1033 ++++++++++++++---------------
 po/uk/CMakeLists.txt          |    2 +-
 po/uk/curconvd.po             |   20 +-
 po/uk/keurocalc.po            |  940 +++++++++++++--------------
 po/zh_TW/CMakeLists.txt       |    2 +-
 po/zh_TW/curconvd.po          |   28 +-
 po/zh_TW/keurocalc.po         |  940 +++++++++++++--------------
 161 files changed, 21643 insertions(+), 26127 deletions(-)

diff --cc debian/changelog
index f45dabb,0000000..fded77a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,144 -1,0 +1,150 @@@
++keurocalc (1.2.1-1) unstable; urgency=medium
++
++  * Imported Upstream version 1.2.1
++
++ -- Michael Meskes <meskes at debian.org>  Sat, 25 Jan 2014 12:05:56 +0100
++
 +keurocalc (1.2.0-1) unstable; urgency=low
 +
 +  * Fixed syntax in local-options file.
 +  * Imported Upstream version 1.2.0
 +  * Fixed description to list correct sources of exchange rates downloaded.
 +  * Bumped Standards-Version to 3.9.3, no changes needed.
 +  * Slightly updated copyright file.
 +
 + -- Michael Meskes <meskes at debian.org>  Wed, 29 Feb 2012 12:37:49 +0100
 +
 +keurocalc (1.1.0-1) unstable; urgency=low
 +
 +  * Imported Upstream version 1.1.0
 +  * Bumped Standards-Version to 3.9.1, no changes needed.
 +
 + -- Michael Meskes <meskes at debian.org>  Sun, 23 Jan 2011 17:11:30 +0100
 +
 +keurocalc (1.0.3-2) unstable; urgency=low
 +
 +  * Rename /usr/share/doc/kde4 to /usr/share/doc/kde. (Closes: #584382)
 +
 + -- Michael Meskes <meskes at debian.org>  Thu, 03 Jun 2010 16:15:46 +0200
 +
 +keurocalc (1.0.3-1) unstable; urgency=low
 +
 +  * Imported Upstream version 1.0.3
 +
 + -- Michael Meskes <meskes at debian.org>  Mon, 31 May 2010 12:36:06 +0200
 +
 +keurocalc (1.0.2-3) unstable; urgency=low
 +
 +  * Added cmake build dependency which is no longer provided by
 +    kdelibs5-dev.
 +  * Bumped Standards-Version to 3.8.4, no changes needed.
 +  * Added source/format file.
 +  * Updated copright notice.
 +
 + -- Michael Meskes <meskes at debian.org>  Thu, 06 May 2010 11:01:20 +0200
 +
 +keurocalc (1.0.2-2) unstable; urgency=low
 +
 +  * Released to unstable.
 +  * Bumped Standards-Version to 3.8.1, no changes needed.
 +
 + -- Michael Meskes <meskes at debian.org>  Tue, 07 Apr 2009 13:08:55 +0200
 +
 +keurocalc (1.0.2-1) experimental; urgency=low
 +
 +  * New upstream version.
 +
 + -- Michael Meskes <meskes at debian.org>  Mon, 12 Jan 2009 12:56:30 +0100
 +
 +keurocalc (1.0.1-2) experimental; urgency=low
 +
 +  * Added missing icon files.
 +
 + -- Michael Meskes <meskes at debian.org>  Mon, 05 Jan 2009 12:24:51 +0100
 +
 +keurocalc (1.0.1-1) experimental; urgency=low
 +
 +  * New upstream version for KDE4.
 +  * Removed patches that were not needed anymore and simplified packaging.
 +  * Migrated to cdbs.
 +
 + -- Michael Meskes <meskes at debian.org>  Fri, 02 Jan 2009 20:34:52 +0100
 +
 +keurocalc (0.9.7-1) unstable; urgency=low
 +
 +  * New maintainer, closes: #484541
 +  * Updated standards to 3.8.0
 +  * New upstream version
 +  * Removed relibtoolize patch
 +  * Added patch to update Makefile.in files.
 +  * Do not build depend on autotools-dev
 +  * Fixed watch file, closes: #450111
 +  * Downgraded recommendation on keurocalc in data package to a suggestion,
 +    closes: #378609
 +  * Adusted menu file to new structure.
 +  * keurocalc-data now replaces keurocalc, closes: #373149
 +  * Do not call configure twice.
 +
 + -- Michael Meskes <meskes at debian.org>  Fri, 06 Jun 2008 11:27:07 +0200
 +
 +keurocalc (0.9.6-1) unstable; urgency=low
 +
 +  * New Upstream Release
 +  * Split into a binary-independent data package and a binary package
 +  * Adjusted the relibtoolize patch
 +  * Upgrade debhelper compatibility level to 5
 +  * Bump Standards-Version to 3.7.2
 +
 + -- Claudio Moratti <maxer at knio.it>  Mon, 15 May 2006 12:04:01 +0200
 +
 +keurocalc (0.9.4-5) unstable; urgency=low
 +
 +  * Added Patch for libtool
 +  * Added a dh_desktop call
 +  * Fixed the category tag in .desktop file
 +  * Added debian/watch file
 +
 + -- Claudio Moratti <maxer at knio.it>  Sat,  3 Dec 2005 15:45:01 +0100
 +
 +keurocalc (0.9.4-4) unstable; urgency=low
 +
 +  * Fixed a bug in po/Makefile that adds a Makefile in .diff file 
 +
 + -- Claudio Moratti <maxer at knio.it>  Sun, 18 Sep 2005 01:27:34 +0200
 +
 +keurocalc (0.9.4-3) unstable; urgency=low
 +
 +  * Package rebuilt from scratch, because of an missing Makefile
 +  * Changed license of manpage, from GFDL to GPL
 +  * Added an lintian override file for a source-contains-cvs-conflict-copy
 +    error
 +  * Added keurocalc homepage in long description
 +  * Changed Free Software Foundation address
 +
 + -- Claudio Moratti <maxer at knio.it>  Sat, 10 Sep 2005 23:05:31 +0200
 +
 +keurocalc (0.9.4-2) unstable; urgency=low
 +
 +  * Rebuilt after C++ ABI transition 
 +
 + -- Claudio Moratti <maxer at knio.it>  Sat, 10 Sep 2005 00:38:59 +0200
 +
 +keurocalc (0.9.4-1) unstable; urgency=low
 +
 +  * New Upstream Release 
 +
 + -- Claudio Moratti <maxer at knio.it>  Sat, 10 Sep 2005 00:20:31 +0200
 +
 +keurocalc (0.9.2-1) unstable; urgency=low
 +
 +  * Closed ITP bug for wnpp, Closes: #309782
 +  * New upstream release
 +
 + -- Claudio Moratti <maxer at knio.it>  Thu,  2 Jun 2005 11:14:35 +0200
 +
 +keurocalc (0.9.1-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Claudio Moratti <maxer at knio.it>  Thu, 12 May 2005 20:09:51 +0200
 +

-- 
keurocalc Debian packaging



More information about the pkg-kde-commits mailing list