[Gpg4win-commits] r849 - in trunk: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jul 8 12:37:31 CEST 2008
Author: marcus
Date: 2008-07-08 12:37:30 +0200 (Tue, 08 Jul 2008)
New Revision: 849
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/packages/packages.current
trunk/src/inst-gpa.nsi
trunk/src/inst-kleopatra.nsi
trunk/src/make-msi.guids
trunk/src/uninst-kleopatra.nsi
Log:
2008-07-08 Marcus Brinkmann <marcus at g10code.de>
* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.
* packages/packages.current: Update kdelibs and kleopatra.
* configure.ac: Make kleopatra a GNUWIN32 package to catch the
german translations.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-07-07 15:13:00 UTC (rev 848)
+++ trunk/ChangeLog 2008-07-08 10:37:30 UTC (rev 849)
@@ -1,3 +1,10 @@
+2008-07-08 Marcus Brinkmann <marcus at g10code.de>
+
+ * src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.
+ * packages/packages.current: Update kdelibs and kleopatra.
+ * configure.ac: Make kleopatra a GNUWIN32 package to catch the
+ german translations.
+
2008-07-04 Werner Koch <wk at g10code.com>
* packages/packages.current: Update gpgme.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-07-07 15:13:00 UTC (rev 848)
+++ trunk/configure.ac 2008-07-08 10:37:30 UTC (rev 849)
@@ -218,7 +218,8 @@
GPG4WIN_BPKG_GNUWIN32([qt], [kdesupport])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
-GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 kdelibs])
+#GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 kdelibs])
+GPG4WIN_BPKG_GNUWIN32([kleopatra], [gpgme gnupg2 kdelibs])
GPG4WIN_FINALIZE
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2008-07-07 15:13:00 UTC (rev 848)
+++ trunk/packages/packages.current 2008-07-08 10:37:30 UTC (rev 849)
@@ -377,27 +377,30 @@
server ftp://ftp.kdab.net/pub/gpg4win
-name kdelibs-20080625-2-bin.zip
-file kdelibs-for-kleo-20080625-2-bin.zip
-chk 64546d4a70a8dabce4ffcc894e7ef98ebefedf3c
+name kdelibs-20080706-bin.zip
+file kdelibs-for-kleo-20080706-bin.zip
+chk 4b73e86e9b45e64a95407b465e3e68fa0cf0a9af
-name kdelibs-20080625-2-lib.zip
-file kdelibs-for-kleo-20080625-2-dev.zip
-chk 076d83746bd4db2f4719899ca0cdd723df418ddf
+name kdelibs-20080706-lib.zip
+file kdelibs-for-kleo-20080706-dev.zip
+chk b51bb9593beb4bff00b9539b538aeb20a80af720
-name kdelibs-20080625-2-src.zip
-file kdelibs-for-kleo-20080625-2-src.zip
-chk 990eb139dece3a8dc0d3837f9c919c17c5c19b74
+name kdelibs-20080706-src.zip
+file kdelibs-for-kleo-20080706-src.zip
+chk bca9e5ec870da8f5df25a7b30db3448c5e8f8f63
# Kleopatra
server ftp://ftp.kdab.net/pub/gpg4win
-file kleopatra-20080625-2-bin.zip
-chk 4af0c8abf9fcb6e3afaf6a02ae0aa4f2ca8f83dc
+file kleopatra-20080706-bin.zip
+chk 5050a8393e34376825a5915299e41326a2885591
-file kleopatra-20080625-2-src.zip
-chk 796abb71a32b71b28192f975c030fb9dfe91b907
+# FIXME: These belong in the bin package.
+name kleopatra-20080706-lib.zip
+file kleopatra-20080706-doc.zip
+chk 3a8b9d529f8682b6249bd77fc521129c8e5e6a70
-
+file kleopatra-20080706-src.zip
+chk a01812755881dc7519ecd820486db30ba5f39fb4
Modified: trunk/src/inst-gpa.nsi
===================================================================
--- trunk/src/inst-gpa.nsi 2008-07-07 15:13:00 UTC (rev 848)
+++ trunk/src/inst-gpa.nsi 2008-07-08 10:37:30 UTC (rev 849)
@@ -50,9 +50,6 @@
File ${prefix}/share/locale/ru/LC_MESSAGES/gpa.mo
SetOutPath "$INSTDIR\share\gpa"
- # tip files are not anymore used with newer GPAs.
- File /nonfatal ${prefix}/share/gpa/gpa_tips.en
- File /nonfatal ${prefix}/share/gpa/gpa_tips.de
File ${prefix}/share/gpa/gpa_logo.ppm
File ${prefix}/share/gpa/gpa.png
Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi 2008-07-07 15:13:00 UTC (rev 848)
+++ trunk/src/inst-kleopatra.nsi 2008-07-08 10:37:30 UTC (rev 849)
@@ -112,17 +112,34 @@
File ${prefix}/share/kde4/services/kleopatra_config_dirserv.desktop
File ${prefix}/share/kde4/services/kleopatra_config_dnorder.desktop
File ${prefix}/share/kde4/services/kleopatra_config_smimevalidation.desktop
+ File ${prefix}/share/kde4/services/kleopatra_signencryptfolders.desktop
+ File ${prefix}/share/kde4/services/kleopatra_decryptverifyfolders.desktop
+ File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
+ File ${prefix}/share/kde4/services/kleopatra_decryptverifyfiles.desktop
+
+ # FIXME: From the lib package. This is wrong.
+!undef prefix
+!define prefix ${ipdir}/kleopatra-dev-${gpg4win_pkg_kleopatra_version}
+
SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+ File ${prefix}/share/locale/de/LC_MESSAGES/akonaditray.mo
File ${prefix}/share/locale/de/LC_MESSAGES/akregator.mo
File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdelibs.mo
File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepim.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepimlibs.mo
File ${prefix}/share/locale/de/LC_MESSAGES/desktop_l10n.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kabc2mutt.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_dir.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_file.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_ldapkio.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_net.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kabc_slox.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kabcakonadi.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kabcclient.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabcformat_binary.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kaddressbook.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kalarm.mo
File ${prefix}/share/locale/de/LC_MESSAGES/katepart4.mo
@@ -141,7 +158,15 @@
File ${prefix}/share/locale/de/LC_MESSAGES/kio4.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kio_groupwise.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kio_help4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_imap4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_ldap.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_mbox.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_nntp.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_pop3.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_sieve.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_smtp.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kitchensync.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kjots.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kleopatra.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kmail.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_calendar_plugin.mo
@@ -155,6 +180,7 @@
File ${prefix}/share/locale/de/LC_MESSAGES/kode.mo
File ${prefix}/share/locale/de/LC_MESSAGES/konsolekalendar.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kontact.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kontactinterfaces.mo
File ${prefix}/share/locale/de/LC_MESSAGES/korganizer.mo
File ${prefix}/share/locale/de/LC_MESSAGES/korn.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kpilot.mo
@@ -175,19 +201,25 @@
File ${prefix}/share/locale/de/LC_MESSAGES/kwatchgnupg.mo
File ${prefix}/share/locale/de/LC_MESSAGES/kxforms.mo
File ${prefix}/share/locale/de/LC_MESSAGES/libakonadi.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkblog.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkcal.mo
File ${prefix}/share/locale/de/LC_MESSAGES/libkdepim.mo
File ${prefix}/share/locale/de/LC_MESSAGES/libkholidays.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkldap.mo
File ${prefix}/share/locale/de/LC_MESSAGES/libkleopatra.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkmime.mo
File ${prefix}/share/locale/de/LC_MESSAGES/libkpgp.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkpimidentities.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkpimutils.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkresources.mo
File ${prefix}/share/locale/de/LC_MESSAGES/libksieve.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libktnef.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkxmlrpcclient.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libmailtransport.mo
File ${prefix}/share/locale/de/LC_MESSAGES/libphonon.mo
File ${prefix}/share/locale/de/LC_MESSAGES/phonon_kde.mo
File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo
- SetOutPath "$INSTDIR\share\locale\de"
-
- File ${prefix}/share/locale/de/entry.desktop
-
!endif
${MementoSectionEnd}
Modified: trunk/src/make-msi.guids
===================================================================
--- trunk/src/make-msi.guids 2008-07-07 15:13:00 UTC (rev 848)
+++ trunk/src/make-msi.guids 2008-07-08 10:37:30 UTC (rev 849)
@@ -12,6 +12,7 @@
7a0ce0e2-f75c-4f08-83dd-fd8fc4bcddfe /PRODUCT/1.9.0.691
7498403e-77cd-4bed-9a65-d8cc29a5dc01 /PRODUCT/1.9.0.741
088e4467-e83f-4da5-bbdc-6e45e2101266 /PRODUCT/1.9.0.795
+521ae57f-c5a0-4d9f-8c17-2f34ab452fbd /PRODUCT/1.9.1.804
fb54db39-2456-4fcc-9550-2790db663015 /REGISTRY/HKLM/Software\GNU\GnuPG/Install Directory
ad23691b-1734-4dec-b91a-d4ff286190ea /REGISTRY/HKLM/Software\GNU\GnuPG/gpgProgram
e0807a2f-4e70-48f8-b047-c5d3e219c3e7 /UPGRADE/1
@@ -102,6 +103,7 @@
22438687-b122-4e40-976b-6dd2d26b167d kgpgconf.exe
92c55686-77ac-4be1-9c11-b4b29ae221ee kleopatra.bat
476c0bd9-e925-4799-b8ba-4f08b087c58c kleopatra.exe
+b932b01a-7401-45b6-b2de-3b5f9ad39ead kwatchgnupg.exe
30e04a1f-e9d3-4e1c-bfa6-404dc4e7be1d lib\claws-mail\plugins\pgpcore.dll
6094a185-ac8e-4acb-808f-5112d1c67d84 lib\claws-mail\plugins\pgpinline.deps
5e4270af-56f7-4dd6-a169-69d0bf9b8885 lib\claws-mail\plugins\pgpinline.dll
@@ -151,6 +153,7 @@
3faefe08-8263-460b-809d-74b6b41bf1b6 lib\locale\ru\LC_MESSAGES\atk10.mo
b9d1f0bc-fc62-4d98-88a6-2ad4f5b63b0d lib\locale\ru\LC_MESSAGES\gtk20-properties.mo
3fe4f87e-10bc-4093-940a-627f8656128c lib\locale\ru\LC_MESSAGES\gtk20.mo
+b39ae719-5b23-4076-94fd-ba9e5f307e4c libadns-1.dll
b7eb067b-886c-4797-82d1-38a43e03e7c9 libatk-1.0-0.dll
12c77de4-ff42-4ce6-8e34-18f4a7222ee2 libcairo-2.dll
a36b79c8-0394-4e90-9019-a9cb18690fbf libdbus-1.dll
@@ -296,6 +299,9 @@
d115318a-50be-4fe3-bba0-ff87bef7c091 share\apps\kleopatra\pics\kleopatra_splashscreen.svgz
b5071d73-efa9-4a44-a4ae-f6d21befb5b0 share\apps\kleopatra\pics\kleopatra_wizard.png
c43ec930-8830-423f-947b-b9e64939bd74 share\apps\kleopatra\pics\kleopatra_wizard.svgz
+c6cd0842-cdbf-414d-b83e-17a65a61e8e9 share\apps\kwatchgnupg\kwatchgnupgui.rc
+32c82abe-cb57-498c-992d-9ec7906df31b share\apps\kwatchgnupg\pics\kwatchgnupg.png
+a37b37fc-6844-4620-b8af-341d6843eba4 share\apps\kwatchgnupg\pics\kwatchgnupg2.png
d7843f8f-6c59-4304-8724-df9fc5f947f2 share\apps\libkleopatra\pics\chiasmus_chi.png
7f963d02-2670-49e7-bfcd-05cf5332826d share\apps\libkleopatra\pics\key.png
467ecd20-9654-4ac2-bbbd-94aa7d3e509b share\apps\libkleopatra\pics\key_bad.png
Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi 2008-07-07 15:13:00 UTC (rev 848)
+++ trunk/src/uninst-kleopatra.nsi 2008-07-08 10:37:30 UTC (rev 849)
@@ -40,6 +40,10 @@
Delete "$INSTDIR\share\kde4\services\kleopatra_config_dnorder.desktop"
Delete "$INSTDIR\share\kde4\services\kleopatra_config_dirserv.desktop"
Delete "$INSTDIR\share\kde4\services\kleopatra_config_appear.desktop"
+ Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfolders.desktop"
+ Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfolders.desktop"
+ Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfiles.desktop"
+ Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfiles.desktop"
Delete "$INSTDIR\kcm_kleopatra.dll"
Delete "$INSTDIR\libkleo.dll"
@@ -48,15 +52,24 @@
Delete "$INSTDIR\libkleopatraclientcore.dll"
Delete "$INSTDIR\libkleopatraclientgui.dll"
- Delete "$INSTDIR\share\locale\de\entry.desktop"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\phonon_kde.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libphonon.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libmailtransport.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkxmlrpcclient.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libktnef.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libksieve.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkresources.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimutils.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimidentities.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpgp.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkmime.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkleopatra.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkldap.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkholidays.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkdepim.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkcal.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkblog.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libakonadi.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kxforms.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kwatchgnupg.mo"
@@ -77,6 +90,7 @@
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kpilot.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korn.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontactinterfaces.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontact.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\konsolekalendar.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kode.mo"
@@ -90,7 +104,15 @@
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_calendar_plugin.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kleopatra.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kjots.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kitchensync.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_smtp.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_sieve.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_pop3.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_nntp.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_mbox.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_ldap.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_imap4.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_help4.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_groupwise.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio4.mo"
@@ -109,14 +131,23 @@
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\katepart4.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kalarm.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcformat_binary.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcclient.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\kabc_net.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_ldapkio.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_file.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_dir.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc2mutt.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_l10n.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepimlibs.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
+
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"
More information about the Gpg4win-commits
mailing list