2018-01-14 20:39 GMT+03:00 Rafael Sadowski <raf...@sizeofvoid.org>: > Hi ports@, Hi Vadim, > > simple update to the latest stable version. I've freed SHARED_LIBS from > tabs and add cmake in MODULES. > > Runs fine on amd64. Ok, Comments?
Please go ahead. I'll fix things if something will break here eventually. :) > Index: Makefile > =================================================================== > RCS file: /cvs/ports/productivity/kmymoney/Makefile,v > retrieving revision 1.17 > diff -u -p -u -p -r1.17 Makefile > --- Makefile 2 Dec 2017 12:44:33 -0000 1.17 > +++ Makefile 14 Jan 2018 17:37:18 -0000 > @@ -3,17 +3,17 @@ COMMENT = accounting for KDE 4 > CATEGORIES = productivity x11 > HOMEPAGE = https://kmymoney.org/ > MAINTAINER = Vadim Zhukov <z...@openbsd.org> > -VERSION = 4.8.0 > +VERSION = 4.8.1.1 > DISTNAME = kmymoney-${VERSION} > -REVISION = 4 > > -SHARED_LIBS = kmm_kdchart 1.1 > -SHARED_LIBS += kmm_mymoney 1.1 > -SHARED_LIBS += kmm_plugin 1.1 > -SHARED_LIBS += kmm_widgets 1.1 > -SHARED_LIBS += payeeidentifier_iban_bic 0.0 # 4.14 > -SHARED_LIBS += payeeidentifier_iban_bic_widgets 0.0 # 4.14 > -SHARED_LIBS += payeeidentifier_nationalAccount 0.0 # 4.14 > +SHARED_LIBS += kmm_kdchart 1.1 # 0.0 > +SHARED_LIBS += kmm_mymoney 1.1 # 0.0 > +SHARED_LIBS += kmm_payeeidentifier 0.0 # 0.0 > +SHARED_LIBS += kmm_plugin 1.1 # 0.0 > +SHARED_LIBS += kmm_widgets 1.1 # 0.0 > +SHARED_LIBS += payeeidentifier_iban_bic 0.0 # 4.14 > +SHARED_LIBS += payeeidentifier_iban_bic_widgets 0.0 # 4.14 > +SHARED_LIBS += payeeidentifier_nationalAccount 0.0 # 4.14 > > # GPLv2+ > PERMIT_PACKAGE_CDROM = Yes > @@ -32,13 +32,16 @@ WANTLIB += ${KDE4LIB}/akonadi-contact ${ > WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kmime > WANTLIB += ${KDE4LIB}/kpimidentities ${KDE4LIB}/kpimutils > WANTLIB += alkimia assuan gmp gpg-error gpgme++-pthread gpgme > -WANTLIB += ical icalss iconv intl ofx osp qgpgme soprano > +WANTLIB += ical icalss ofx osp qgpgme soprano > WANTLIB += aqbanking gwengui-cpp gwengui-qt4 gwenhywfar > WANTLIB += QtDeclarative QtScript krosscore > > MASTER_SITES = ${MASTER_SITE_KDE:=stable/kmymoney/${VERSION}/src/} > > -MODULES = x11/kde4 lang/python multimedia/phonon > +MODULES = devel/cmake \ > + x11/kde4 \ > + lang/python \ > + multimedia/phonon > MODKDE4_USE = pim > > BUILD_DEPENDS = devel/boost \ > @@ -67,6 +70,7 @@ CONFIGURE_ARGS = -DENABLE_KBANKING:Bool= > TEST_IS_INTERACTIVE = X11 > > post-install: > - ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py > ${PREFIX}/share/apps/kmm_weboob/weboob.py > + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ > + ${PREFIX}/share/apps/kmm_weboob/weboob.py > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/productivity/kmymoney/distinfo,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 distinfo > --- distinfo 14 Jan 2017 11:19:04 -0000 1.3 > +++ distinfo 14 Jan 2018 17:37:18 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (kmymoney-4.8.0.tar.xz) = wqY1cQqvppJaSYA8SA4EPgv0vFtiQwaJql65Vhn0isI= > -SIZE (kmymoney-4.8.0.tar.xz) = 20785888 > +SHA256 (kmymoney-4.8.1.1.tar.xz) = > Kxy9FB1Ro/QUfDDADH0hAi52HYEh9aIGCSzzVI+AWjQ= > +SIZE (kmymoney-4.8.1.1.tar.xz) = 20963444 > Index: patches/patch-CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/productivity/kmymoney/patches/patch-CMakeLists_txt,v > retrieving revision 1.1 > diff -u -p -u -p -r1.1 patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 14 Jan 2017 11:19:04 -0000 1.1 > +++ patches/patch-CMakeLists_txt 14 Jan 2018 17:37:18 -0000 > @@ -1,8 +1,9 @@ > $OpenBSD: patch-CMakeLists_txt,v 1.1 2017/01/14 11:19:04 zhuk Exp $ > Unbreak configuring: there is no separate gwengui-cpp CMake config. > ---- CMakeLists.txt.orig Tue Jun 14 22:17:54 2016 > -+++ CMakeLists.txt Thu Jan 12 19:42:47 2017 > -@@ -177,11 +177,11 @@ option(ENABLE_KBANKING "Enable KBanking plugin" ON) > +Index: CMakeLists.txt > +--- CMakeLists.txt.orig > ++++ CMakeLists.txt > +@@ -198,11 +198,11 @@ option(ENABLE_KBANKING "Enable KBanking plugin" ON) > if(ENABLE_KBANKING) > find_package(GWENHYWFAR CONFIG "4.13.0") > find_package(gwengui-qt4 CONFIG "4.13.0") > Index: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt > =================================================================== > RCS file: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt > diff -N patches/patch-kmymoney_dialogs_settings_CMakeLists_txt > --- patches/patch-kmymoney_dialogs_settings_CMakeLists_txt 24 Aug 2017 > 09:31:35 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,33 +0,0 @@ > -$OpenBSD: patch-kmymoney_dialogs_settings_CMakeLists_txt,v 1.1 2017/08/24 > 09:31:35 dcoppa Exp $ > - > -commit b0a68ca075928aa29ee1e0007bfb14d714f5a948 > -Author: Ralf Habacker <ralf.habac...@freenet.de> > -Date: Thu Aug 10 13:45:04 2017 +0200 > - > -Fix 'Compile error on Fedora 26' > - > -CMake build system used some outdated variables which has been replaced > -by cmake built-in variables to fix the issue. > - > -* Unbreaks Ninja builds too > - > -Index: kmymoney/dialogs/settings/CMakeLists.txt > ---- kmymoney/dialogs/settings/CMakeLists.txt.orig > -+++ kmymoney/dialogs/settings/CMakeLists.txt > -@@ -1,12 +1,12 @@ > - add_custom_command( > -- OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h > ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp > -- DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg > ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc > -- COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ > ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg > ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc > -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h > ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp > -+ DEPENDS ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg > ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc > -+ COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ > ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg > ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc > - ) > - > - > - set (libsettings_a_SOURCES > -- ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h > -+ ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp > - ksettingscolors.cpp > - ksettingsfonts.cpp > - ksettingsforecast.cpp > Index: patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt > =================================================================== > RCS file: patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt > diff -N patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt > --- patches/patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt 24 > Aug 2017 09:31:35 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,24 +0,0 @@ > -$OpenBSD: patch-kmymoney_plugins_onlinetasks_national_CMakeLists_txt,v 1.1 > 2017/08/24 09:31:35 dcoppa Exp $ > - > -commit 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5 > -Author: Ralf Habacker <ralf.habac...@freenet.de> > -Date: Tue May 23 19:52:20 2017 +0200 > - > -Fix 'duplicated symbol' compile error on Windows. > - > -Because the whole project uses cmake automoc support additional > -calls to automoc4 causes 'duplicated symbol' errors on Windows. > - > -* Unbreaks Ninja builds too > - > -Index: kmymoney/plugins/onlinetasks/national/CMakeLists.txt > ---- kmymoney/plugins/onlinetasks/national/CMakeLists.txt.orig > -+++ kmymoney/plugins/onlinetasks/national/CMakeLists.txt > -@@ -20,7 +20,6 @@ kde4_add_ui_files( konlinetasks_national_SCRS > - ) > - > - # Make this plugin unit testable > --automoc4(konlinetasks_national_OBJECTS konlinetasks_national_SCRS) > - add_library( konlinetasks_national_OBJECTS OBJECT > ${konlinetasks_national_SCRS} ) > - > - # Add plugin which is not allowed in the unit test > Index: patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt > =================================================================== > RCS file: patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt > diff -N patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt > --- patches/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt 24 > Aug 2017 09:31:35 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,54 +0,0 @@ > -$OpenBSD: patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists_txt,v 1.2 > 2017/08/24 09:31:35 dcoppa Exp $ > - > -commit 6d235f2cd835d5d3e00dee43ed29bdf2c5ca80d5 > -Author: Ralf Habacker <ralf.habac...@freenet.de> > -Date: Tue May 23 19:52:20 2017 +0200 > - > -Fix 'duplicated symbol' compile error on Windows. > - > -Because the whole project uses cmake automoc support additional > -calls to automoc4 causes 'duplicated symbol' errors on Windows. > - > -* Unbreaks Ninja builds too > - > -Index: kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt > ---- kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt.orig > -+++ kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt > -@@ -12,7 +12,6 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS > - ui/sepacredittransferedit.ui > - ) > - > --automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS) > - add_library( konlinetasks_sepa_OBJECTS OBJECT ${sepaOnlineTasks_SRCS} ) > - > - # Add actual plugin here it is not part of the objects > -@@ -27,21 +26,21 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-se > - > configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-sepastorageplugin.desktop.in > ${CMAKE_CURRENT_BINARY_DIR}/kmymoney-sepastorageplugin.desktop) > - > - target_link_libraries( konlinetasks_sepa > -+ payeeidentifier_nationalAccount > -+ payeeidentifier_iban_bic_widgets > -+ onlinetask_interfaces > - kmm_mymoney > - kmm_widgets > - kmm_config > - kmm_plugin > - kmm_utils_validators > -- onlinetask_interfaces > -- payeeidentifier_nationalAccount > -- payeeidentifier_iban_bic_widgets > -- ${QT_QTCORE_LIBRARIES} > -- ${QT_QTGUI_LIBRARIES} > -- ${KDE4_KDECORE_LIBS} > -- ${KDE4_KDEUI_LIBS} > -+ ${LIBALKIMIA_LIBRARY} > - ${KDE4_KIO_LIBS} > -+ ${KDE4_KDEUI_LIBS} > -+ ${KDE4_KDECORE_LIBS} > -+ ${QT_QTGUI_LIBRARIES} > - ${QT_QTXML_LIBRARY} > -- ${LIBALKIMIA_LIBRARY} > -+ ${QT_QTCORE_LIBRARIES} > - ${GMP_LIBRARIES} # TODO: remove when alkimia cmake config file got fixed > - ) > - > Index: patches/patch-kmymoney_views_kmymoneyview_cpp > =================================================================== > RCS file: > /cvs/ports/productivity/kmymoney/patches/patch-kmymoney_views_kmymoneyview_cpp,v > retrieving revision 1.1 > diff -u -p -u -p -r1.1 patch-kmymoney_views_kmymoneyview_cpp > --- patches/patch-kmymoney_views_kmymoneyview_cpp 14 Jan 2017 11:19:04 > -0000 1.1 > +++ patches/patch-kmymoney_views_kmymoneyview_cpp 14 Jan 2018 17:37:18 > -0000 > @@ -1,23 +1,24 @@ > $OpenBSD: patch-kmymoney_views_kmymoneyview_cpp,v 1.1 2017/01/14 11:19:04 > zhuk Exp $ > Add new Belarusian Ruble (since mid 2016): 1 BYN = 10,000 BYR. > ---- kmymoney/views/kmymoneyview.cpp.orig Tue Jun 14 22:16:15 2016 > -+++ kmymoney/views/kmymoneyview.cpp Thu Jan 12 19:38:36 2017 > -@@ -1508,7 +1508,7 @@ void KMyMoneyView::loadDefaultCurrencies() > +Index: kmymoney/views/kmymoneyview.cpp > +--- kmymoney/views/kmymoneyview.cpp.orig > ++++ kmymoney/views/kmymoneyview.cpp > +@@ -1509,7 +1509,7 @@ void KMyMoneyView::loadDefaultCurrencies() > loadDefaultCurrency(MyMoneySecurity("BDT", i18n("Bangladeshi Taka")), > create); > loadDefaultCurrency(MyMoneySecurity("BBD", i18n("Barbados Dollar"), > "$"), create); > loadDefaultCurrency(MyMoneySecurity("BTC", i18n("Bitcoin"), > "BTC"), create); > -- loadDefaultCurrency(MyMoneySecurity("BYR", i18n("Belarusian Ruble"), > "BYR", 1, 1), create); > -+ loadDefaultCurrency(MyMoneySecurity("BYN", i18n("Belarusian Ruble"), > "Br"), create); > +- loadDefaultCurrency(MyMoneySecurity("BYN", i18n("Belarusian Ruble"), > "Br"), create); > ++ loadDefaultCurrency(MyMoneySecurity("BYR", i18n("Belarusian Ruble"), > "BYR", 1, 1), create); > loadDefaultCurrency(MyMoneySecurity("BZD", i18n("Belize Dollar"), > "$"), create); > loadDefaultCurrency(MyMoneySecurity("BMD", i18n("Bermudian Dollar"), > "$"), create); > loadDefaultCurrency(MyMoneySecurity("BTN", i18n("Bhutan Ngultrum")), > create); > -@@ -1725,6 +1725,9 @@ void KMyMoneyView::loadAncientCurrencies() > +@@ -1726,9 +1726,6 @@ void KMyMoneyView::loadAncientCurrencies() > > // Source: https://en.wikipedia.org/wiki/Litas > loadAncientCurrency("LTL", i18n("Lithuanian Litas"), "Lt", QDate(2015, 1, > 1), MyMoneyMoney(100000, 345280), "EUR"); > -+ > -+ // Source: https://en.wikipedia.org/wiki/Belarusian_ruble > -+ loadAncientCurrency("BYR", i18n("Belarusian Ruble (old)"), "BYR", > QDate(2016, 7, 1), MyMoneyMoney(1, 10000), "BYN"); > +- > +- // Source: https://en.wikipedia.org/wiki/Belarusian_ruble > +- loadAncientCurrency("BYR", i18n("Belarusian Ruble (old)"), "BYR", > QDate(2016, 7, 1), MyMoneyMoney(1, 10000), "BYN"); > } > > void KMyMoneyView::viewAccountList(const QString& /*selectAccount*/) > Index: patches/patch-po_ru_kmymoney_po > =================================================================== > RCS file: patches/patch-po_ru_kmymoney_po > diff -N patches/patch-po_ru_kmymoney_po > --- patches/patch-po_ru_kmymoney_po 14 Jan 2017 11:19:04 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,15 +0,0 @@ > -$OpenBSD: patch-po_ru_kmymoney_po,v 1.1 2017/01/14 11:19:04 zhuk Exp $ > -Add new Belarusian Ruble (since mid 2016): 1 BYN = 10,000 BYR. > ---- po/ru/kmymoney.po.orig Tue Jun 14 22:16:58 2016 > -+++ po/ru/kmymoney.po Thu Jan 12 19:38:36 2017 > -@@ -15099,6 +15099,10 @@ msgstr "Словацкая крона" > - msgid "Lithuanian Litas" > - msgstr "Литовский лит" > - > -+#: kmymoney/views/kmymoneyview.cpp:1711 > -+msgid "Belarusian Ruble (old)" > -+msgstr "Белорусский рубль (неденоминированный)" > -+ > - #: kmymoney/views/kmymoneyview.cpp:2011 > - #, kde-format > - msgid "" > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/productivity/kmymoney/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 PLIST > --- pkg/PLIST 14 Jan 2017 11:19:04 -0000 1.3 > +++ pkg/PLIST 14 Jan 2018 17:37:18 -0000 > @@ -81,10 +81,12 @@ include/kde4/kmymoney/onlinetasks/interf > include/kde4/kmymoney/onlinetasks/interfaces/onlinetask.h > include/kde4/kmymoney/onlinetasks/interfaces/onlinetaskconverter.h > include/kde4/kmymoney/onlinetasks/interfaces/onlinetasksettingsfactory.h > -include/kde4/kmymoney/onlinetasks/national/ > -include/kde4/kmymoney/onlinetasks/national/germanonlinetransfer.h > include/kde4/kmymoney/onlinetasks/sepa/ > include/kde4/kmymoney/onlinetasks/sepa/sepaonlinetransfer.h > +include/kde4/kmymoney/payeeidentifier/ > +include/kde4/kmymoney/payeeidentifier/ibanandbic/ > +include/kde4/kmymoney/payeeidentifier/ibanandbic/ibanbic.h > +include/kde4/kmymoney/payeeidentifier/payeeidentifier.h > include/kde4/kmymoney/pluginloader.h > include/kde4/kmymoney/register.h > include/kde4/kmymoney/registeritem.h > @@ -109,24 +111,23 @@ lib/kde4/kmm_ofximport.so > lib/kde4/kmm_printcheck.so > lib/kde4/kmm_reconciliationreport.so > lib/kde4/kmm_weboob.so > -lib/kde4/konlinetasks_national.so > -lib/kde4/konlinetasks_sepa.so > +lib/kde4/libkonlinetasks_sepa.so > lib/kde4/payeeidentifier_iban_bic_delegates.so > lib/kde4/payeeidentifier_ibanbic_storageplugin.so > lib/kde4/payeeidentifier_nationalAccount_ui.so > lib/kde4/payeeidentifier_nationalaccount_storageplugin.so > @lib lib/libkmm_kdchart.so.${LIBkmm_kdchart_VERSION} > @lib lib/libkmm_mymoney.so.${LIBkmm_mymoney_VERSION} > -lib/libkmm_payeeidentifier.so > +@lib lib/libkmm_payeeidentifier.so.${LIBkmm_payeeidentifier_VERSION} > @lib lib/libkmm_plugin.so.${LIBkmm_plugin_VERSION} > @lib lib/libkmm_widgets.so.${LIBkmm_widgets_VERSION} > @lib > lib/libpayeeidentifier_iban_bic.so.${LIBpayeeidentifier_iban_bic_VERSION} > @lib > lib/libpayeeidentifier_iban_bic_widgets.so.${LIBpayeeidentifier_iban_bic_widgets_VERSION} > @lib > lib/libpayeeidentifier_nationalAccount.so.${LIBpayeeidentifier_nationalAccount_VERSION} > share/applications/kde4/kmymoney-developer.desktop > -share/applications/kde4/kmymoney.desktop > +share/applications/kde4/org.kde.kmymoney.desktop > share/apps/appdata/ > -share/apps/appdata/kmymoney.appdata.xml > +share/apps/appdata/org.kde.kmymoney.appdata.xml > share/apps/kconf_update/kmymoney.upd > share/apps/kmm_csvexport/ > share/apps/kmm_csvexport/kmm_csvexport.rc > @@ -191,8 +192,6 @@ share/apps/kmymoney/html/images/tr.png > share/apps/kmymoney/html/images/trans_logo.png > share/apps/kmymoney/html/kmymoney.css > share/apps/kmymoney/html/welcome.css > -share/apps/kmymoney/ibanbicdata/ > -share/apps/kmymoney/ibanbicdata/bankdata.de.db > share/apps/kmymoney/icons/ > share/apps/kmymoney/icons/hicolor/ > share/apps/kmymoney/icons/hicolor/16x16/ > @@ -703,7 +702,9 @@ share/apps/kmymoney/templates/de_DE/othe > share/apps/kmymoney/templates/de_DE/otherloan.kmt > share/apps/kmymoney/templates/de_DE/skr03.kmt > share/apps/kmymoney/templates/de_DE/skr04.kmt > +share/apps/kmymoney/templates/de_DE/skr49.kmt > share/apps/kmymoney/templates/de_DE/studium.kmt > +share/apps/kmymoney/templates/de_DE/wohnungsw.kmt > share/apps/kmymoney/templates/dk/ > share/apps/kmymoney/templates/dk/car.kmt > share/apps/kmymoney/templates/dk/common.kmt > @@ -896,25 +897,29 @@ share/apps/kmymoney/templates/it/renter. > share/apps/kmymoney/templates/it/retiremt.kmt > share/apps/kmymoney/templates/it/spouseinc.kmt > share/apps/kmymoney/templates/it/spouseretire.kmt > -share/apps/kmymoney/templates/jp/ > -share/apps/kmymoney/templates/jp/brokerage.kmt > -share/apps/kmymoney/templates/jp/business.kmt > -share/apps/kmymoney/templates/jp/carloan.kmt > -share/apps/kmymoney/templates/jp/cdmoneymkt.kmt > -share/apps/kmymoney/templates/jp/checkbook.kmt > -share/apps/kmymoney/templates/jp/childcare.kmt > -share/apps/kmymoney/templates/jp/common.kmt > -share/apps/kmymoney/templates/jp/eduloan.kmt > -share/apps/kmymoney/templates/jp/fixedassets.kmt > -share/apps/kmymoney/templates/jp/homeloan.kmt > -share/apps/kmymoney/templates/jp/homeown.kmt > -share/apps/kmymoney/templates/jp/otherloan.kmt > -share/apps/kmymoney/templates/jp/renter.kmt > -share/apps/kmymoney/templates/jp/retiremt.kmt > -share/apps/kmymoney/templates/jp/spouseinc.kmt > -share/apps/kmymoney/templates/jp/spouseretire.kmt > +share/apps/kmymoney/templates/ja_JP/ > +share/apps/kmymoney/templates/ja_JP/brokerage.kmt > +share/apps/kmymoney/templates/ja_JP/business.kmt > +share/apps/kmymoney/templates/ja_JP/carloan.kmt > +share/apps/kmymoney/templates/ja_JP/cdmoneymkt.kmt > +share/apps/kmymoney/templates/ja_JP/checkbook.kmt > +share/apps/kmymoney/templates/ja_JP/childcare.kmt > +share/apps/kmymoney/templates/ja_JP/common.kmt > +share/apps/kmymoney/templates/ja_JP/eduloan.kmt > +share/apps/kmymoney/templates/ja_JP/fixedassets.kmt > +share/apps/kmymoney/templates/ja_JP/full.kmt > +share/apps/kmymoney/templates/ja_JP/homeloan.kmt > +share/apps/kmymoney/templates/ja_JP/homeown.kmt > +share/apps/kmymoney/templates/ja_JP/otherloan.kmt > +share/apps/kmymoney/templates/ja_JP/renter.kmt > +share/apps/kmymoney/templates/ja_JP/retiremt.kmt > +share/apps/kmymoney/templates/ja_JP/spouseinc.kmt > +share/apps/kmymoney/templates/ja_JP/spouseretire.kmt > share/apps/kmymoney/templates/nl_NL/ > +share/apps/kmymoney/templates/nl_NL/checkbook.kmt > share/apps/kmymoney/templates/nl_NL/default_accounts.kmt > +share/apps/kmymoney/templates/nl_NL/full.kmt > +share/apps/kmymoney/templates/nl_NL/rgs_1.1.kmt > share/apps/kmymoney/templates/pt_BR/ > share/apps/kmymoney/templates/pt_BR/brokerage.kmt > share/apps/kmymoney/templates/pt_BR/carloan.kmt > @@ -953,7 +958,11 @@ share/apps/kmymoney/templates/ro_RO/comm > share/apps/kmymoney/templates/ro_RO/default_categories-template.kmt > share/apps/kmymoney/templates/ro_RO/homeloan.kmt > share/apps/kmymoney/templates/ru_RU/ > +share/apps/kmymoney/templates/ru_RU/common.kmt > share/apps/kmymoney/templates/ru_RU/default_accounts.kmt > +share/apps/kmymoney/templates/ru_RU/homeloan.kmt > +share/apps/kmymoney/templates/ru_RU/homeown.kmt > +share/apps/kmymoney/templates/ru_RU/renter.kmt > share/apps/kmymoney/templates/sk/ > share/apps/kmymoney/templates/sk/brokerage.kmt > share/apps/kmymoney/templates/sk/carloan.kmt > @@ -1046,6 +1055,7 @@ share/doc/HTML/de/kmymoney/details-repor > share/doc/HTML/de/kmymoney/details-schedules.docbook > share/doc/HTML/de/kmymoney/details-search.docbook > share/doc/HTML/de/kmymoney/details-settings.docbook > +share/doc/HTML/de/kmymoney/details-tags.docbook > share/doc/HTML/de/kmymoney/details-widgets.docbook > share/doc/HTML/de/kmymoney/faq.docbook > share/doc/HTML/de/kmymoney/firsttime.docbook > @@ -1646,6 +1656,7 @@ share/icons/hicolor/128x128/apps/kmymone > share/icons/hicolor/128x128/mimetypes/application-x-kmymoney.png > share/icons/hicolor/16x16/apps/kmymoney.png > share/icons/hicolor/16x16/mimetypes/application-x-kmymoney.png > +share/icons/hicolor/22x22/apps/kmymoney.png > share/icons/hicolor/22x22/mimetypes/application-x-kmymoney.png > share/icons/hicolor/32x32/apps/kmymoney.png > share/icons/hicolor/32x32/mimetypes/application-x-kmymoney.png > @@ -1660,8 +1671,6 @@ share/icons/locolor/16x16/apps/kmymoney. > share/icons/locolor/32x32/ > share/icons/locolor/32x32/apps/ > share/icons/locolor/32x32/apps/kmymoney.png > -share/kde4/services/ibanbicdata/ > -share/kde4/services/ibanbicdata/germany.desktop > share/kde4/services/kcm_kmm_icalendarexport.desktop > share/kde4/services/kcm_kmm_printcheck.desktop > share/kde4/services/kmm_csvexport.desktop > @@ -1676,9 +1685,6 @@ share/kde4/services/kmymoney-ibanbic-del > share/kde4/services/kmymoney-ibanbic-storageplugin.desktop > share/kde4/services/kmymoney-nationalaccount-delegate.desktop > share/kde4/services/kmymoney-nationalaccount-storageplugin.desktop > -share/kde4/services/kmymoney-nationalorders.desktop > -share/kde4/services/kmymoney-nationalordersui.desktop > -share/kde4/services/kmymoney-nationalstorageplugin.desktop > share/kde4/services/kmymoney-sepaorders.desktop > share/kde4/services/kmymoney-sepaordersui.desktop > share/kde4/services/kmymoney-sepastorageplugin.desktop > @@ -1717,7 +1723,6 @@ share/locale/sk/LC_MESSAGES/kmymoney.mo > share/locale/sv/LC_MESSAGES/kmymoney.mo > share/locale/tr/LC_MESSAGES/kmymoney.mo > share/locale/uk/LC_MESSAGES/kmymoney.mo > -share/locale/zh_CN/LC_MESSAGES/kmymoney.mo > share/locale/zh_TW/LC_MESSAGES/kmymoney.mo > share/mime/packages/x-kmymoney.xml > @exec %D/bin/update-desktop-database