[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-218-g4c89855

by Andre Heinecke cvs at cvs.gnupg.org
Tue Mar 28 08:09:23 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  4c8985535d5a1c3c710a43ca1c120cd86d9af3a8 (commit)
       via  ace4dd4978bdee94a91f5fbe8c9424641b2add15 (commit)
      from  9722b40b7520eccd37707a62563efa2c2f8ee381 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4c8985535d5a1c3c710a43ca1c120cd86d9af3a8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Mar 28 08:08:26 2017 +0200

    Update KDE localisation
    
    * packages/packages.current (kde-l10n): Update.
    * src/inst-kde-l10n.nsi, src/uninst-kde-l10n.nsi: Install some
    additional files.
    * src/kde-l10n.sh: Adjust to new repo names and enable download.

diff --git a/packages/packages.current b/packages/packages.current
index 6601973..36a8db4 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -539,11 +539,11 @@ chk 117a9402892c4bd5b0fb384bf79c932ef9132413b0bbc55c0a92fd95759ad0f8
 # last changed: 2016-02-19
 # by: ah
 # verified: Tarball created by ah with script kde-l10n.sh
-file kde-l10n/kde-l10n-201602191116-bin.tar.xz
-chk 3e73412a8444cd22262a5ebbe0a6f546cc68b24fa66bd5c6705df54f45a4d68b
+file kde-l10n/kde-l10n-201703280719-bin.tar.xz
+chk 52241cd0291209ef94743e2cc336b23d8a19bc54d51624ff91159339d619691d
 
-file kde-l10n/kde-l10n-201602191116-src.tar.xz
-chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
+file kde-l10n/kde-l10n-201703280719-src.tar.xz
+chk c1c6cae8103d7437c46846f1a5775a5169b8a8e7d7da8536dcc0b801a9830942
 
 # Kleopatra
 # last changed: see package date.
diff --git a/src/inst-kde-l10n.nsi b/src/inst-kde-l10n.nsi
index 2af75ef..9d57c63 100644
--- a/src/inst-kde-l10n.nsi
+++ b/src/inst-kde-l10n.nsi
@@ -1017,6 +1017,7 @@ Section "-kde-l10n" SEC_kde-l10n
   File ${kwidgetsaddons_prefix}/share/locale/sr/LC_MESSAGES/kwidgetsaddons5_qt.qm
   File ${kwindowsystem_prefix}/share/locale/sr/LC_MESSAGES/kwindowsystem5_qt.qm
   File ${prefix}/share/locale/sr/LC_MESSAGES/libkleopatra.mo
+  File ${prefix}/share/locale/sr/LC_MESSAGES/kwatchgnupg.mo
   SetOutPath "$INSTDIR\share\locale\sr at ijekavian"
   File ${kcfg_prefix}/share/locale/sr at ijekavian/kf5_entry.desktop
   SetOutPath "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES"
@@ -1032,6 +1033,7 @@ Section "-kde-l10n" SEC_kde-l10n
   File ${kwidgetsaddons_prefix}/share/locale/sr at ijekavian/LC_MESSAGES/kwidgetsaddons5_qt.qm
   File ${kwindowsystem_prefix}/share/locale/sr at ijekavian/LC_MESSAGES/kwindowsystem5_qt.qm
   File ${prefix}/share/locale/sr at ijekavian/LC_MESSAGES/libkleopatra.mo
+  File ${prefix}/share/locale/sr at ijekavian/LC_MESSAGES/kwatchgnupg.mo
   SetOutPath "$INSTDIR\share\locale\sr at ijekavianlatin"
   File ${kcfg_prefix}/share/locale/sr at ijekavianlatin/kf5_entry.desktop
   SetOutPath "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES"
@@ -1047,6 +1049,7 @@ Section "-kde-l10n" SEC_kde-l10n
   File ${kwidgetsaddons_prefix}/share/locale/sr at ijekavianlatin/LC_MESSAGES/kwidgetsaddons5_qt.qm
   File ${kwindowsystem_prefix}/share/locale/sr at ijekavianlatin/LC_MESSAGES/kwindowsystem5_qt.qm
   File ${prefix}/share/locale/sr at ijekavianlatin/LC_MESSAGES/libkleopatra.mo
+  File ${prefix}/share/locale/sr at ijekavianlatin/LC_MESSAGES/kwatchgnupg.mo
   SetOutPath "$INSTDIR\share\locale\sr at latin"
   File ${kcfg_prefix}/share/locale/sr at latin/kf5_entry.desktop
   SetOutPath "$INSTDIR\share\locale\sr at latin\LC_MESSAGES"
@@ -1062,6 +1065,7 @@ Section "-kde-l10n" SEC_kde-l10n
   File ${kwidgetsaddons_prefix}/share/locale/sr at latin/LC_MESSAGES/kwidgetsaddons5_qt.qm
   File ${kwindowsystem_prefix}/share/locale/sr at latin/LC_MESSAGES/kwindowsystem5_qt.qm
   File ${prefix}/share/locale/sr at latin/LC_MESSAGES/libkleopatra.mo
+  File ${prefix}/share/locale/sr at latin/LC_MESSAGES/kwatchgnupg.mo
   SetOutPath "$INSTDIR\share\locale\sv"
   File ${kcfg_prefix}/share/locale/sv/kf5_entry.desktop
   SetOutPath "$INSTDIR\share\locale\sv\LC_MESSAGES"
diff --git a/src/kde-l10n.sh b/src/kde-l10n.sh
index 9846a58..5ee652d 100755
--- a/src/kde-l10n.sh
+++ b/src/kde-l10n.sh
@@ -41,8 +41,8 @@ QFRAMEWORKS="kconfig kcompletion kcodecs kcoreaddons kitemviews kwidgetsaddons k
 KFRAMEWORKS="kconfigwidgets ki18n kiconthemes kxmlgui"
 
 POFILES="pim/libkleopatra.po \
-    kdepim/kwatchgnupg.po
-    kdepim/kleopatra.po"
+    pim/kwatchgnupg.po
+    pim/kleopatra.po"
 # See: https://websvn.kde.org/*checkout*/trunk/l10n-kf5/subdirs
 LANGS="af \
 ar \
@@ -231,8 +231,8 @@ for lang in $LANGS; do
     mkdir -p $lang
     cd $lang
     for pofile in $POFILES; do
-#        svn export svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5/$lang/messages/$pofile \
-#        `basename $pofile` 2>/dev/null || \
+        svn export svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5/$lang/messages/$pofile \
+        `basename $pofile` 2>/dev/null || \
         echo "$pofile not found in $lang"
     done
     cd ..
diff --git a/src/uninst-kde-l10n.nsi b/src/uninst-kde-l10n.nsi
index 35a24dc..e253ee7 100644
--- a/src/uninst-kde-l10n.nsi
+++ b/src/uninst-kde-l10n.nsi
@@ -1058,6 +1058,7 @@ RMDir "$INSTDIR\share\locale\sq"
   Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\kwidgetsaddons5_qt.qm"
   Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\kwindowsystem5_qt.qm"
   Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\libkleopatra.mo"
+  Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\kwatchgnupg.mo"
 RMDir "$INSTDIR\share\locale\sr\LC_MESSAGES"
 RMDir "$INSTDIR\share\locale\sr\LC_MESSAGES"
 RMDir "$INSTDIR\share\locale\sr"
@@ -1074,6 +1075,7 @@ RMDir "$INSTDIR\share\locale\sr"
   Delete "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES\kwidgetsaddons5_qt.qm"
   Delete "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES\kwindowsystem5_qt.qm"
   Delete "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES\libkleopatra.mo"
+  Delete "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES\kwatchgnupg.mo"
 RMDir "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES"
 RMDir "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES"
 RMDir "$INSTDIR\share\locale\sr at ijekavian"
@@ -1090,6 +1092,7 @@ RMDir "$INSTDIR\share\locale\sr at ijekavian"
   Delete "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES\kwidgetsaddons5_qt.qm"
   Delete "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES\kwindowsystem5_qt.qm"
   Delete "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES\libkleopatra.mo"
+  Delete "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES\kwatchgnupg.mo"
 RMDir "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES"
 RMDir "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES"
 RMDir "$INSTDIR\share\locale\sr at ijekavianlatin"
@@ -1106,6 +1109,7 @@ RMDir "$INSTDIR\share\locale\sr at ijekavianlatin"
   Delete "$INSTDIR\share\locale\sr at latin\LC_MESSAGES\kwidgetsaddons5_qt.qm"
   Delete "$INSTDIR\share\locale\sr at latin\LC_MESSAGES\kwindowsystem5_qt.qm"
   Delete "$INSTDIR\share\locale\sr at latin\LC_MESSAGES\libkleopatra.mo"
+  Delete "$INSTDIR\share\locale\sr at latin\LC_MESSAGES\kwatchgnupg.mo"
 RMDir "$INSTDIR\share\locale\sr at latin\LC_MESSAGES"
 RMDir "$INSTDIR\share\locale\sr at latin\LC_MESSAGES"
 RMDir "$INSTDIR\share\locale\sr at latin"

commit ace4dd4978bdee94a91f5fbe8c9424641b2add15
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Mar 28 08:07:00 2017 +0200

    Update gettext and iconv
    
    * packages/packages.current (gettext, iconv): Update.
    * packages/inst-gettext.nsi, packages/uninst-gettext.nsi: Adjust
    to new ABI version.
    
    --
    This should fix reported problems with newer mingw / gcc variants.

diff --git a/packages/packages.current b/packages/packages.current
index 6f3eb67..6601973 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -30,13 +30,17 @@ chk  c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 
 server ftp://ftp.gnu.org/pub/gnu
 
-#checked: 2016-04-05 jochen
-file libiconv/libiconv-1.14.tar.gz
-chk  72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
+# last-changed: 2017-02-15
+# by: ah
+# verified: Sig 68D9 4D8A AEEA D48A E7DC  5B90 4F49 4A94 2E46 16C2
+file libiconv/libiconv-1.15.tar.gz
+chk  ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
 
-#checked: 2016-04-05 jochen
-file gettext/gettext-0.19.5.tar.xz
-chk  3410a61c5c05d0392533c92133e135de828973fee27477a6d6dd3d3e36f2a2dd
+# last-changed: 2017-02-15
+# by: ah
+# verified: Sig 4622 25C3 B46F 3487 9FC8  496C D605 848E D7E6 9871
+file gettext/gettext-0.19.8.tar.xz
+chk  9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f
 
 #
 # GLIB
diff --git a/src/inst-gettext.nsi b/src/inst-gettext.nsi
index 2bd3891..96ba6c8 100644
--- a/src/inst-gettext.nsi
+++ b/src/inst-gettext.nsi
@@ -33,8 +33,8 @@ Section "-gettext" SEC_gettext
   File ${gpg4win_pkg_gettext}
 !else
   SetOutPath "$INSTDIR\bin"
-  File ${prefix}/bin/libintl-8.dll
-  File /oname=intl.dll ${prefix}/bin/libintl-8.dll
+  File ${prefix}/bin/libintl-9.dll
+  File /oname=intl.dll ${prefix}/bin/libintl-9.dll
 
 !ifdef DEBUG
   # We install a couple of binaries that may be useful for testing.
diff --git a/src/uninst-gettext.nsi b/src/uninst-gettext.nsi
index f04eafe..23d2492 100644
--- a/src/uninst-gettext.nsi
+++ b/src/uninst-gettext.nsi
@@ -30,7 +30,7 @@ Section "-un.gettext"
   Push "${gpg4win_pkg_gettext}"
   Call un.SourceDelete
 !else
-  Delete /REBOOTOK "$INSTDIR\bin\libintl-8.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libintl-9.dll"
   Delete /REBOOTOK "$INSTDIR\bin\intl.dll"
 !ifdef DEBUG
   Delete "$INSTDIR\bin\gettext.exe"

-----------------------------------------------------------------------

Summary of changes:
 packages/packages.current | 24 ++++++++++++++----------
 src/inst-gettext.nsi      |  4 ++--
 src/inst-kde-l10n.nsi     |  4 ++++
 src/kde-l10n.sh           |  8 ++++----
 src/uninst-gettext.nsi    |  2 +-
 src/uninst-kde-l10n.nsi   |  4 ++++
 6 files changed, 29 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org



More information about the Gpg4win-commits mailing list