[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-195-g4f2841e
by Andre Heinecke
cvs at cvs.gnupg.org
Wed May 15 17:14:14 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 4f2841e09b306aaacdce06e611c639e419a671ed (commit)
via 935c30f6287eaad9095477a8b12f307a511eef72 (commit)
via b527cebf468847835aed5e9eba01e049edb78170 (commit)
via 353ccc60061b85db3f2c9d174395d442c6753873 (commit)
via e60dc832fc6f1d2aa4937c0ec99283b069a01bba (commit)
from d35f2d23cd94ed1fbcdec67359373b1ed6b777dd (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 4f2841e09b306aaacdce06e611c639e419a671ed
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed May 15 14:55:11 2013 +0000
Update Kleopatra package to gpg4win HEAD
This includes a fix for frozen windows in combination
with gpgOl
* packages/packages.current: Update kleopatra version
diff --git a/packages/packages.current b/packages/packages.current
index b4e9f2d..85ec2c0 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -503,8 +503,8 @@ chk c48227c5f3b475c7792abc36c415479d3233468c
#
server http://files.kolab.org/local/gpg4win
-file kleopatra-20130514-bin.tar.bz2
-chk 8c953a3dec27c21748cd0d34a8c2f2d9ffb1f9bc
+file kleopatra-20130515-bin.tar.bz2
+chk 655cb63543ce51fd84be948928e3414bc0719b26
-file kleopatra-20130514-src.tar.bz2
-chk 541296ff5af0fcf91388632860eea79415d98338
+file kleopatra-20130515-src.tar.bz2
+chk 44547d00ca0d98e5100a7a34796d15ea2eb6ab6b
commit 935c30f6287eaad9095477a8b12f307a511eef72
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed May 15 14:46:52 2013 +0000
Add uninstallation compatibility to 2.1.0
This also deletes files that were installed by previous
versions of gpg4win
* src/uninst-gnutls.nsi: Remove libgnutls-openlss-26.dll
* src/uninst-qt.nsi: Remove files provided in old qt package
* src/uninst-kleopatra.nsi: Remove various files installed
by kdesupport, kdelibs et. al
diff --git a/src/uninst-gnutls.nsi b/src/uninst-gnutls.nsi
index 25e6607..6576cd6 100644
--- a/src/uninst-gnutls.nsi
+++ b/src/uninst-gnutls.nsi
@@ -32,6 +32,7 @@ Section "-un.gnutls"
Delete "$INSTDIR\libgnutls-26.dll"
Delete "$INSTDIR\libgnutls-extra-26.dll"
+ Delete "$INSTDIR\libgnutls-openssl-26.dll"
Delete "$INSTDIR\libgnutls-openssl-27.dll"
RMDir "$INSTDIR"
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index acb2208..ff07a80 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -343,8 +343,83 @@ Section "-un.kleopatra"
Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
+ # Files installed by old versions, mainly from the former
+ # kdesupport package
+ Delete "$INSTDIR\giflib4.dll"
+ Delete "$INSTDIR\libexpatw.dll"
+ Delete "$INSTDIR\libexslt.dll"
+ Delete "$INSTDIR\libkdewin32.dll"
+ Delete "$INSTDIR\libxml2.dll"
+ Delete "$INSTDIR\libxslt.dll"
+ Delete "$INSTDIR\mingw-pcrecpp.dll"
+ Delete "$INSTDIR\mingwm10.dll"
+ Delete "$INSTDIR\pcre.dll"
+ Delete "$INSTDIR\pcrecpp.dll"
+ Delete "$INSTDIR\pcregrep.exe"
+ Delete "$INSTDIR\pcreposix.dll"
+ Delete "$INSTDIR\update-mime-database.exe"
+ Delete "$INSTDIR\xmlcatalog.exe"
+ Delete "$INSTDIR\xmllint.exe"
+ Delete "$INSTDIR\xsltproc.exe"
+ Delete "$INSTDIR\bin\kcmdwrapper.exe"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepimlibs.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_l10n.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc2mutt.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcakonadi.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_slox.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkabconfig.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkontactnt.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimresources.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimwizards.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdgantt1.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfile_vcf.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_groupwise.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kitchensync.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_calendar_plugin.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_vcard_plugin.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_xdiff_plugin.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools_at_engine.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kode.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korn.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kpilot.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_birthday.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_featureplan.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupware.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupwise.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_kolab.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_scalix.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_tvanytime.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_xmlrpc.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kxforms.mo"
+ Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucrls.html"
+ Delete "$INSTDIR\share\doc\HTML\common\CMakeLists.txt"
+ Delete "$INSTDIR\share\doc\HTML\common\Doxyfile.global"
+ Delete "$INSTDIR\share\doc\HTML\common\README.Doxygen"
+ Delete "$INSTDIR\share\apps\kdeui\about\bottom-left.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bottom-middle.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bottom-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\top-right.png"
+ Delete "$INSTDIR\share\icons\oxygen\scalable\apps\kleopatra.svgz"
+ Delete "$INSTDIR\share\icons\oxygen\64x64\apps\kleopatra.png"
+ Delete "$INSTDIR\share\icons\oxygen\48x48\apps\kleopatra.png"
+ Delete "$INSTDIR\share\icons\oxygen\32x32\apps\kleopatra.png"
+ Delete "$INSTDIR\share\icons\oxygen\256x256\apps\kleopatra.png"
+ Delete "$INSTDIR\share\icons\oxygen\22x22\apps\kleopatra.png"
+ Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kleopatra.png"
+ Delete "$INSTDIR\share\icons\oxygen\128x128\apps\kleopatra.png"
+ Delete "$INSTDIR\share\icons\oxygen\index.theme"
+ Delete "$INSTDIR\share\kde4\servicetypes\kconfigbackend.desktop"
+ Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
+ Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
+ Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
+
Delete "$INSTDIR\share\locale\en_US\entry.desktop"
+ RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\ar"
RMDir "$INSTDIR\share\locale\en_US"
RMDir "$INSTDIR\share\xdg\menus"
RMDir "$INSTDIR\share\xdg"
@@ -390,6 +465,23 @@ Section "-un.kleopatra"
RMDir "$INSTDIR\share\icons\hicolor\128x128\apps"
RMDir "$INSTDIR\share\icons\hicolor\128x128"
RMDir "$INSTDIR\share\icons\hicolor"
+ RMDir "$INSTDIR\share\icons\oxygen\scalable\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\scalable"
+ RMDir "$INSTDIR\share\icons\oxygen\64x64\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\64x64"
+ RMDir "$INSTDIR\share\icons\oxygen\48x48\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\48x48"
+ RMDir "$INSTDIR\share\icons\oxygen\32x32\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\32x32"
+ RMDir "$INSTDIR\share\icons\oxygen\256x256\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\256x256"
+ RMDir "$INSTDIR\share\icons\oxygen\22x22\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\22x22"
+ RMDir "$INSTDIR\share\icons\oxygen\16x16\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\16x16"
+ RMDir "$INSTDIR\share\icons\oxygen\128x128\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\128x128"
+ RMDir "$INSTDIR\share\icons\oxygen"
RMDir "$INSTDIR\share\icons"
RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
RMDir "$INSTDIR\share\doc\HTML\en"
diff --git a/src/uninst-qt.nsi b/src/uninst-qt.nsi
index e874f58..cdd4533 100644
--- a/src/uninst-qt.nsi
+++ b/src/uninst-qt.nsi
@@ -48,6 +48,57 @@ Section "-un.qt"
Delete "$INSTDIR\plugins\imageformats\qsvg4.dll"
Delete "$INSTDIR\plugins\imageformats\qtiff4.dll"
+ # Files installed by previous versions
+ Delete "$INSTDIR\mingwm10.dll"
+ Delete "$INSTDIR\Qt3Support4.dll"
+ Delete "$INSTDIR\QtHelp4.dll"
+ Delete "$INSTDIR\QtOpenGL4.dll"
+ Delete "$INSTDIR\QtScript4.dll"
+ Delete "$INSTDIR\QtSql4.dll"
+ Delete "$INSTDIR\translations\assistant_adp_de.qm"
+ Delete "$INSTDIR\translations\assistant_de.qm"
+ Delete "$INSTDIR\translations\designer_de.qm"
+ Delete "$INSTDIR\translations\linguist_de.qm"
+ Delete "$INSTDIR\translations\qt_de.qm"
+ Delete "$INSTDIR\translations\qt_help_de.qm"
+
+ Delete "$INSTDIR\plugins\accessible\qtaccessiblecompatwidgets4.dll"
+ Delete "$INSTDIR\plugins\accessible\qtaccessiblewidgets4.dll"
+
+ RMDir "$INSTDIR\plugins\accessible"
+
+ Delete "$INSTDIR\plugins\codecs\qcncodecs4.dll"
+ Delete "$INSTDIR\plugins\codecs\qjpcodecs4.dll"
+ Delete "$INSTDIR\plugins\codecs\qkrcodecs4.dll"
+ Delete "$INSTDIR\plugins\codecs\qtwcodecs4.dll"
+
+ RMDir "$INSTDIR\plugins\codecs"
+
+ Delete "$INSTDIR\plugins\designer\qwebview.dll"
+ Delete "$INSTDIR\plugins\designer\qt3supportwidgets.dll"
+ # Not in Qt anymore since 4.3.3.
+ Delete "$INSTDIR\plugins\designer\arthurplugin.dll"
+ Delete "$INSTDIR\plugins\designer\containerextension.dll"
+ Delete "$INSTDIR\plugins\designer\customwidgetplugin.dll"
+ Delete "$INSTDIR\plugins\designer\taskmenuextension.dll"
+ Delete "$INSTDIR\plugins\designer\worldtimeclockplugin.dll"
+
+ RMDir "$INSTDIR\plugins\designer"
+
+ Delete "$INSTDIR\plugins\iconengines\qsvg4.dll"
+ Delete "$INSTDIR\plugins\iconengines\qsvgicon4.dll"
+
+ RMDir "$INSTDIR\plugins\iconengines"
+
+ Delete "$INSTDIR\plugins\script\qtscriptdbus4.dll"
+ RMDir "$INSTDIR\plugins\script"
+
+ Delete "$INSTDIR\plugins\sqldrivers\qsqlite4.dll"
+ RMDir "$INSTDIR\plugins\sqldrivers"
+
+
+ RMDir "$INSTDIR\translations"
+
RMDir "$INSTDIR\plugins\imageformats"
RMDir "$INSTDIR\plugins"
commit b527cebf468847835aed5e9eba01e049edb78170
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed May 15 14:37:47 2013 +0000
Update oxygen icons to include missing icons
This fixes cpu spikes in the about dialog, and help menu.
Really.
* packages/packages.current: Update Package versions.
* src/inst-oxygen-icons.nsi, src/uninst-oxygen-icons.nsi:
Install / Uninstall files.
diff --git a/packages/packages.current b/packages/packages.current
index 2c08325..b4e9f2d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -490,11 +490,11 @@ chk f03ffd02333f786a5e540c4430d3109952b5553e
server http://files.kolab.org/local/gpg4win
-file oxygen-icons-4.10.2-bin.tar.bz2
-chk b9a7063b7edade07d8a517b147720e1590bf0a75
+file oxygen-icons-20130515-bin.tar.bz2
+chk 653870001dd4a477ad064420d0ce08f0d023a734
-file oxygen-icons-4.10.2-src.tar.bz2
-chk a9384cd6fe240a362f5bbb3bbc0e918af63531dc
+file oxygen-icons-20130515-src.tar.bz2
+chk c48227c5f3b475c7792abc36c415479d3233468c
#
diff --git a/src/inst-oxygen-icons.nsi b/src/inst-oxygen-icons.nsi
index d38e4f6..b7ba541 100644
--- a/src/inst-oxygen-icons.nsi
+++ b/src/inst-oxygen-icons.nsi
@@ -140,6 +140,7 @@ Section "-oxygen-icons" SEC_oxygen_icons
SetOutPath "$INSTDIR\share\icons\oxygen\16x16\apps"
File ${prefix}/share/icons/oxygen/16x16/apps/kde.png
+ File ${prefix}/share/icons/oxygen/16x16/apps/internet-mail.png
SetOutPath "$INSTDIR\share\icons\oxygen\16x16\categories"
@@ -222,6 +223,8 @@ Section "-oxygen-icons" SEC_oxygen_icons
SetOutPath "$INSTDIR\share\icons\oxygen\22x22\apps"
File ${prefix}/share/icons/oxygen/22x22/apps/kde.png
+ File ${prefix}/share/icons/oxygen/22x22/apps/internet-mail.png
+ File ${prefix}/share/icons/oxygen/22x22/apps/preferences-desktop-locale.png
SetOutPath "$INSTDIR\share\icons\oxygen\22x22\categories"
diff --git a/src/uninst-oxygen-icons.nsi b/src/uninst-oxygen-icons.nsi
index 82444e0..e25821f 100644
--- a/src/uninst-oxygen-icons.nsi
+++ b/src/uninst-oxygen-icons.nsi
@@ -199,6 +199,9 @@ Section "-un.oxygen-icons"
Delete "$INSTDIR\share\icons\oxygen\22x22\categories\preferences-system-network.png"
Delete "$INSTDIR\share\icons\oxygen\22x22\categories\applications-graphics.png"
Delete "$INSTDIR\share\icons\oxygen\22x22\apps\kde.png"
+ Delete "$INSTDIR\share\icons\oxygen\22x22\apps\preferences-desktop-locale.png"
+ Delete "$INSTDIR\share\icons\oxygen\22x22\apps\internet-mail.png"
+ Delete "$INSTDIR\share\icons\oxygen\16x16\apps\internet-mail.png"
Delete "$INSTDIR\share\icons\oxygen\22x22\animations\process-working-kde.png"
Delete "$INSTDIR\share\icons\oxygen\22x22\actions\window-close.png"
Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-refresh.png"
commit 353ccc60061b85db3f2c9d174395d442c6753873
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 14 12:57:26 2013 +0000
Update Qt and Kleopatra builds
Qt is now built withot usage of CPU extensions and Kleopatra
contains an updated kdelibs that fixes a problem in the
Window Management on Windows
* packages/packages.current: Update Qt and Kleopatra builds
diff --git a/packages/packages.current b/packages/packages.current
index c994796..2c08325 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -459,14 +459,14 @@ chk ef483090edcdd85ae672aa3bab21526b1e335ae3
#
server http://files.kolab.org/local/gpg4win/libs/
-file qt-x86-mingw4-4.8.4-20130426-bin.tar.bz2
-chk 48f84d4f483e5ff4eeceff2402f56225878ed558
+file qt-x86-mingw4-4.8.4-20130514-bin.tar.bz2
+chk 7bb89e83cacfd69b01aa7e607bf8f9be61e9ba8c
-file qt-x86-mingw4-4.8.4-20130426-lib.tar.bz2
-chk df86e6513cc5639d79881dd812197153f830be67
+file qt-x86-mingw4-4.8.4-20130514-lib.tar.bz2
+chk 0d698cdf3a35575d982f2c351e00e49a45fcd638
-file qt-x86-mingw4-4.8.4-20130426-src.tar.bz2
-chk 66c56babca65fb38c6919cf63405dc51acf00ac6
+file qt-x86-mingw4-4.8.4-20130514-src.tar.bz2
+chk 1e0477b026838c7cf38923be781ed578c36e61df
#
# Qt links DBus and Kleopatra / KDE libs needs it
@@ -503,8 +503,8 @@ chk a9384cd6fe240a362f5bbb3bbc0e918af63531dc
#
server http://files.kolab.org/local/gpg4win
-file kleopatra-20130510-bin.tar.bz2
-chk e5091f8c1c69a2b9b30a690c2fa7137b2fff8171
+file kleopatra-20130514-bin.tar.bz2
+chk 8c953a3dec27c21748cd0d34a8c2f2d9ffb1f9bc
-file kleopatra-20130510-src.tar.bz2
-chk 2c44440c8a9522c314566bcfb5c892ccacb6fc53
+file kleopatra-20130514-src.tar.bz2
+chk 541296ff5af0fcf91388632860eea79415d98338
commit e60dc832fc6f1d2aa4937c0ec99283b069a01bba
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 14 08:45:09 2013 +0000
Fix libpng server url
The libpng-1.4.12 has been moved to a subdirectory
* packages/packages.current: Add subdirectory to libpng server url
diff --git a/packages/packages.current b/packages/packages.current
index 5eb0f4c..c994796 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -328,7 +328,7 @@ chk d063e705812e1ee7feb8f35d51b3cad04ca13b0d
# note: 2012-03-28 wk - Changed server from sf.net
# checked: 2013-04-29 wk
-server ftp://ftp.simplesystems.org/pub/png/src
+server ftp://ftp.simplesystems.org/pub/png/src/libpng14
file libpng-1.4.12.tar.bz2
chk 275cfa90c0558601f6216019317fc37a03ebee01
-----------------------------------------------------------------------
Summary of changes:
packages/packages.current | 30 +++++++-------
src/inst-oxygen-icons.nsi | 3 +
src/uninst-gnutls.nsi | 1 +
src/uninst-kleopatra.nsi | 92 +++++++++++++++++++++++++++++++++++++++++++
src/uninst-oxygen-icons.nsi | 3 +
src/uninst-qt.nsi | 51 ++++++++++++++++++++++++
6 files changed, 165 insertions(+), 15 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list