[Gpg4win-commits] r1008 - in trunk: . packages src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-10-28 18:47:32 +0100 (Tue, 28 Oct 2008)
New Revision: 1008

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/inst-kleopatra.nsi
Log:
Adjust for changed kleopatra packages


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-28 16:13:32 UTC (rev 1007)
+++ trunk/ChangeLog	2008-10-28 17:47:32 UTC (rev 1008)
@@ -2,6 +2,8 @@
 
 	Release 1.9.9.
 	
+	* src/inst-kleopatra.nsi: Move files around
+
 	* README (Instructions): Update.
 
 	* configure.ac: Make gnutls depend on libgcrypt.

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-10-28 16:13:32 UTC (rev 1007)
+++ trunk/packages/packages.current	2008-10-28 17:47:32 UTC (rev 1008)
@@ -432,11 +432,17 @@
 chk  7b269465911b3ec753922f0e885f2c86db6120f7
 
 # FIXME: These belong in the bin package.
-name kleopatra-20081028-lib.zip
-file kleopatra-20081028-doc.zip
-chk  649d08bd02104d5c89f2d2fcb42d5740026e0054
+# Broken.  For fixed version see below.
+#name kleopatra-20081028-lib.zip
+#file kleopatra-20081028-doc.zip
+#chk  649d08bd02104d5c89f2d2fcb42d5740026e0054
 
 file kleopatra-20081028-src.zip
 chk  cb21cdf3f94eeebad7294c8c941d01fe02074038
 
+server ftp://ftp.g10code.com/g10code/scratch
+file kleopatra-20081028-lib.zip
+chk  f6bc32a3f29f41fb39412ad0f0fa344435d30ff6 
 
+
+

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2008-10-28 16:13:32 UTC (rev 1007)
+++ trunk/src/inst-kleopatra.nsi	2008-10-28 17:47:32 UTC (rev 1008)
@@ -117,19 +117,12 @@
   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
@@ -142,22 +135,13 @@
   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
-  File ${prefix}/share/locale/de/LC_MESSAGES/kcertpart.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kcm_phonon.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kcmcrypto.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kcmkabconfig.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kcmkontactnt.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kdepimresources.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kdepimwizards.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kdgantt1.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kfile_vcf.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kfileaudiopreview4.mo
-  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
@@ -194,7 +178,6 @@
   File ${prefix}/share/locale/de/LC_MESSAGES/kres_scalix.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kres_tvanytime.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/kres_xmlrpc.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditor_plugins.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/ktimetracker.mo
   File ${prefix}/share/locale/de/LC_MESSAGES/ktnef.mo
@@ -216,11 +199,32 @@
   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
+
+
+  # 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/desktop_kdelibs.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/desktop_l10n.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/katepart4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kcertpart.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kcm_phonon.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kcmcrypto.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kdeqt.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kfileaudiopreview4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kio4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/kio_help4.mo
+  File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditor_plugins.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
-  File ${prefix}/share/locale/de/LC_MESSAGES/kdeqt.mo
 
+  
   SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
 
   File ${prefix}/share/doc/HTML/en/kleopatra/admin-key-filters.html