[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-160-gbb6ebc2
by Andre Heinecke
cvs at cvs.gnupg.org
Fri May 3 19:00:57 CEST 2013
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 bb6ebc26e922d25836eaf4b6dbce1cf4065e12a2 (commit)
from 838f2be17173a2d44cc5ace003bf8c83d538a285 (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 bb6ebc26e922d25836eaf4b6dbce1cf4065e12a2
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri May 3 16:42:22 2013 +0000
Update kleopatra build
This build now comes from the gpg4win branch and has
some reduced dependencies. It also includes additional
needed configuration files.
* packages/packages.current: Update kleopatra
* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update
installation
diff --git a/packages/packages.current b/packages/packages.current
index c202feb..e691800 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -502,8 +502,8 @@ chk a9384cd6fe240a362f5bbb3bbc0e918af63531dc
#
server http://files.kolab.org/local/gpg4win
-file kleopatra-20130426-2-bin.tar.bz2
-chk f978a93765fc2dc4da2e8af0f5e2fae66d9ee189
+file kleopatra-20130503-1-bin.tar.bz2
+chk f8c0999340c7e860d05ce4178716c1a7c124fca1
-file kleopatra-20130426-src.tar.bz2
-chk 647450abb26bdd0449bc4be5d10184571cb94b8e
+file kleopatra-20130503-src.tar.bz2
+chk 2ae32cc4f630fd18d5efac97a025eb2838930427
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 51a4ff9..26fb73f 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -34,23 +34,28 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
# Relocate this when dbus-daemon is relocated.
SetOutPath "$INSTDIR\bin"
File ${prefix}/bin/kleopatra.exe
+ File ${prefix}/bin/kdebugdialog.exe
+ File ${prefix}/bin/kgpgconf.exe
+ File ${prefix}/bin/kwatchgnupg.exe
+ File ${prefix}/bin/kbuildsycoca4.exe
+
+ # Path lookups are relative to libkdecore so it currently needs to be
+ # in bin
+ File ${prefix}/bin/libkdecore.dll
SetOutPath "$INSTDIR"
File /oname=kleopatra.exe "${BUILD_DIR}/kleowrap.exe"
+ File /oname=kdebugdialog.exe "${BUILD_DIR}/kleowrap.exe"
+ File /oname=kbuildsycoca4.exe "${BUILD_DIR}/kleowrap.exe"
+ File /oname=kgpgconf.exe "${BUILD_DIR}/kleowrap.exe"
+ File /oname=kwatchgnupg.exe "${BUILD_DIR}/kleowrap.exe"
- File ${prefix}/bin/kgpgconf.exe
- File ${prefix}/bin/kwatchgnupg.exe
- File ${prefix}/bin/kdebugdialog.exe
# File ${prefix}/bin/kcmdwrapper.exe
- File ${prefix}/bin/kbuildsycoca4.exe
File ${prefix}/bin/libattica.dll
File ${prefix}/bin/libdbusmenu-qt.dll
File ${prefix}/bin/libgcc_s_sjlj-1.dll
File ${prefix}/bin/libgpgme++.dll
- File ${prefix}/bin/wconv.dll
File ${prefix}/bin/libintl.dll
- File ${prefix}/bin/libjasper.dll
File ${prefix}/bin/libkcmutils.dll
- File ${prefix}/bin/libkdecore.dll
File ${prefix}/bin/libkdeui.dll
File ${prefix}/bin/libkdewin.dll
File ${prefix}/bin/libkleo.dll
@@ -108,7 +113,7 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
SetOutPath "$INSTDIR\share\config"
- #File ${prefix}/share/config/libkleopatrarc
+ File ${prefix}/share/config/libkleopatrarc
# TODO
SetOutPath "$INSTDIR\share\doc\HTML\common"
@@ -328,10 +333,20 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
# File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
# File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
+ SetOutPath "$INSTDIR\share\xdg\menus"
+
+ File ${prefix}/share/xdg/menus/applications.menu
+
SetOutPath "$INSTDIR\share\locale"
File ${prefix}/share/locale/all_languages
+ SetOutPath "$INSTDIR\share\locale\en_US"
+ File ${prefix}/share/locale/en_US/entry.desktop
+
+ SetOutPath "$INSTDIR\share\locale\de"
+ File ${prefix}/share/locale/de/entry.desktop
+
SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
# TODO This is way too much
File ${prefix}/share/locale/de/LC_MESSAGES/akonaditray.mo
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index e9abd84..9b70a0e 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -36,8 +36,18 @@ Section "-un.kleopatra"
# FIXME: See inst-kleopatra.nsi
Delete "$INSTDIR\bin\kleopatra.exe"
+ Delete "$INSTDIR\bin\kwatchgnupg.exe"
+ Delete "$INSTDIR\bin\kgpgconf.exe"
+ Delete "$INSTDIR\bin\kbuildsycoca4.exe"
+ Delete "$INSTDIR\bin\kdebugdialog.exe"
+ Delete "$INSTDIR\bin\libkdecore.dll"
RMDir "$INSTDIR\bin"
+
Delete "$INSTDIR\kleopatra.exe"
+ Delete "$INSTDIR\kwatchgnupg.exe"
+ Delete "$INSTDIR\kgpgconf.exe"
+ Delete "$INSTDIR\kbuildsycoca4.exe"
+ Delete "$INSTDIR\kdebugdialog.exe"
Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfolders.desktop"
Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfiles.desktop"
@@ -165,7 +175,8 @@ Section "-un.kleopatra"
Delete "$INSTDIR\share\doc\HTML\de\\common\\lgpl-translated.html"
Delete "$INSTDIR\share\doc\HTML\de\\common\\kde-localised.css"
-# Delete "$INSTDIR\share\config\libkleopatrarc"
+ Delete "$INSTDIR\share\config\libkleopatrarc"
+ Delete "$INSTDIR\share\apps\xdg\menus\applications.menu"
Delete "$INSTDIR\share\apps\libkleopatra\pics\smartcard.xpm"
Delete "$INSTDIR\share\apps\libkleopatra\pics\key_unknown.png"
Delete "$INSTDIR\share\apps\libkleopatra\pics\key_ok.png"
@@ -195,19 +206,12 @@ Section "-un.kleopatra"
Delete "$INSTDIR\libkleopatraclientgui.dll"
Delete "$INSTDIR\libkleopatraclientcore.dll"
Delete "$INSTDIR\libkleo.dll"
- Delete "$INSTDIR\kwatchgnupg.exe"
- Delete "$INSTDIR\kgpgconf.exe"
-# Delete "$INSTDIR\kcmdwrapper.exe"
- Delete "$INSTDIR\kbuildsycoca4.exe"
Delete "$INSTDIR\libattica.dll"
Delete "$INSTDIR\libdbusmenu-qt.dll"
Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
Delete "$INSTDIR\libgpgme++.dll"
- Delete "$INSTDIR\wconv.dll"
- Delete "$INSTDIR\libintl.dll"
- Delete "$INSTDIR\libjasper.dll"
+ Delete "$INSTDIR\libinitl.dll"
Delete "$INSTDIR\libkcmutils.dll"
- Delete "$INSTDIR\libkdecore.dll"
Delete "$INSTDIR\libkdeui.dll"
Delete "$INSTDIR\libkdewin.dll"
Delete "$INSTDIR\libkleo.dll"
@@ -218,7 +222,6 @@ Section "-un.kleopatra"
# Parts formerly in the kdelibs section
- Delete "$INSTDIR\kdebugdialog.exe"
Delete "$INSTDIR\kded_globalaccel.dll"
Delete "$INSTDIR\libkdeui.dll"
Delete "$INSTDIR\libkdecore.dll"
@@ -233,6 +236,7 @@ Section "-un.kleopatra"
Delete "$INSTDIR\share\locale\all_languages"
+ Delete "$INSTDIR\share\locale\de\entry.desktop"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc.mo"
@@ -338,6 +342,12 @@ Section "-un.kleopatra"
Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
+ Delete "$INSTDIR\share\locale\en_US\entry.desktop"
+
+ RMDir "$INSTDIR\share\locale\en_US"
+ RMDir "$INSTDIR\share\xdg\menus"
+ RMDir "$INSTDIR\share\xdg"
+ RMDir "$INSTDIR\share\locale\de"
RMDir "$INSTDIR\share\locale"
RMDir "$INSTDIR\share\kde4\servicetypes"
RMDir "$INSTDIR\share\kde4\services\kded"
-----------------------------------------------------------------------
Summary of changes:
packages/packages.current | 8 ++++----
src/inst-kleopatra.nsi | 31 +++++++++++++++++++++++--------
src/uninst-kleopatra.nsi | 30 ++++++++++++++++++++----------
3 files changed, 47 insertions(+), 22 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list