[Gpg4win-commits] r1192 - in trunk: . po src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Sat Jun 20 11:29:22 CEST 2009 

Author: werner
Date: 2009-06-20 11:29:21 +0200 (Sat, 20 Jun 2009)
New Revision: 1192

Modified:
   trunk/ChangeLog
   trunk/po/ar.po
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ru.po
   trunk/src/Makefile.am
Log:
Fix vesioninfo.txt formatting.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-06-19 22:56:41 UTC (rev 1191)
+++ trunk/ChangeLog	2009-06-20 09:29:21 UTC (rev 1192)
@@ -1,7 +1,13 @@
+2009-06-20  Werner Koch  <wk at g10code.com>
+
+	* src/Makefile.am (versioninfo.txt): Add old pipeline to properly
+	format the list.
+	(CLEANFILES): Add versioninfo.tmp.
+
 2009-06-20  Marcus Brinkmann  <marcus at g10code.com>
 
-	* m4/gpg4win.m4 (GPG4WIN_IPKG, GPG4WIN_SPKG, GPG4WIN_BPKG,
-	GPG4WIN_MPKG): Define new substitution variables
+	* m4/gpg4win.m4 (GPG4WIN_IPKG, GPG4WIN_SPKG, GPG4WIN_BPKG)
+	(GPG4WIN_MPKG): Define new substitution variables
 	gpg4win_pkg_PKGNAME_deps, to transfer the knowledge of the
 	dependency tree to the Makefiles.
 	* src/gpg4win.mk.in (SPKG_template, BPKG_template): Wrap it in a
@@ -9,7 +15,8 @@
 	(pkg_files): New variable, listing all package files.
 	(VERSIONINFO_macro): Removed.
 	(GETDEPS): New macro.
-	* src/Makefile.am (versioninfo.txt): Use pkg_files to create versioninfo.txt.
+	* src/Makefile.am (versioninfo.txt): Use pkg_files to create
+	versioninfo.txt.
 
 2009-06-20  Werner Koch  <wk at g10code.com>
 

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2009-06-19 22:56:41 UTC (rev 1191)
+++ trunk/po/ar.po	2009-06-20 09:29:21 UTC (rev 1192)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Gpg4Win\n"
 "Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2009-03-24 20:31+0100\n"
+"POT-Creation-Date: 2009-06-20 10:50+0200\n"
 "PO-Revision-Date: 2008-03-11 23:52+0200\n"
 "Last-Translator: Ahmad Gharbeia <ahmad at gharbeia.org>\n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -343,7 +343,7 @@
 msgid "EudoraGPG is a plugin for the Eudora mail program"
 msgstr "þEudoraGPG åí ãáÍÞÉ áÈÑãÌíÉ ÇáÈÑíÏ Eudora"
 
-#: src/inst-gnupg2.nsi:210
+#: src/inst-gnupg2.nsi:211
 #, fuzzy
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2009-06-19 22:56:41 UTC (rev 1191)
+++ trunk/po/de.po	2009-06-20 09:29:21 UTC (rev 1192)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gpg4win 2.0\n"
 "Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2009-03-24 20:31+0100\n"
+"POT-Creation-Date: 2009-06-20 10:50+0200\n"
 "PO-Revision-Date: 2008-11-12 10:39+0100\n"
 "Last-Translator: Werner Koch <wk at g10code.com>\n"
 "Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
@@ -407,7 +407,7 @@
 msgstr ""
 "EudoraGPG ist ein Plugin zur Verschlüsselung für das Eudora Mailprogramm"
 
-#: src/inst-gnupg2.nsi:210
+#: src/inst-gnupg2.nsi:211
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"
 msgstr ""

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2009-06-19 22:56:41 UTC (rev 1191)
+++ trunk/po/es.po	2009-06-20 09:29:21 UTC (rev 1192)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gpg4win 1.1.1-svn417\n"
 "Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2009-03-24 20:31+0100\n"
+"POT-Creation-Date: 2009-06-20 10:50+0200\n"
 "PO-Revision-Date: 2008-01-30 17:07+0100\n"
 "Last-Translator: Diego Escalante Urrelo <diegoe at gnome.org>\n"
 "Language-Team: Spanish <diegoe at gnome.org>\n"
@@ -353,7 +353,7 @@
 msgid "EudoraGPG is a plugin for the Eudora mail program"
 msgstr "EudoraGPG es un plugin para el cliente de correo Eudora"
 
-#: src/inst-gnupg2.nsi:210
+#: src/inst-gnupg2.nsi:211
 #, fuzzy
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2009-06-19 22:56:41 UTC (rev 1191)
+++ trunk/po/fr.po	2009-06-20 09:29:21 UTC (rev 1192)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ngoinabox\n"
 "Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2009-03-24 20:31+0100\n"
+"POT-Creation-Date: 2009-06-20 10:50+0200\n"
 "PO-Revision-Date: 2008-03-10 16:46+0100\n"
 "Last-Translator: Fabian Rodriguez <magicfab at member.fsf.org>\n"
 "Language-Team: FRENCH <aep.lists at it46.se>\n"
@@ -356,7 +356,7 @@
 msgstr ""
 "EudoraGPG est un plugin pour le logiciel de courrier électronique d'Eudora"
 
-#: src/inst-gnupg2.nsi:210
+#: src/inst-gnupg2.nsi:211
 #, fuzzy
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2009-06-19 22:56:41 UTC (rev 1191)
+++ trunk/po/ru.po	2009-06-20 09:29:21 UTC (rev 1192)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gpg4Win Installer\n"
 "Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2009-03-24 20:31+0100\n"
+"POT-Creation-Date: 2009-06-20 10:50+0200\n"
 "PO-Revision-Date: 2008-04-22 11:57+0200\n"
 "Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
 "Language-Team: Human Rights Network <moscow at hro.org>\n"
@@ -351,7 +351,7 @@
 msgid "EudoraGPG is a plugin for the Eudora mail program"
 msgstr "EudoraGPG - ðàñøèðåíèå ïî÷òîâîãî êëèåíòà Eudora"
 
-#: src/inst-gnupg2.nsi:210
+#: src/inst-gnupg2.nsi:211
 #, fuzzy
 msgctxt "DESC_SEC_gnupg2"
 msgid "GNU Privacy Guard"

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-06-19 22:56:41 UTC (rev 1191)
+++ trunk/src/Makefile.am	2009-06-20 09:29:21 UTC (rev 1192)
@@ -86,7 +86,7 @@
 
 # Need to clean the dll because we bypassed automake.
 CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \
-             installer-options.ini NEWS.tmp \
+             installer-options.ini NEWS.tmp versioninfo.tmp \
 	     gpgwrap.exe gpgwrap-2.exe kleowrap.exe
 
 # Supported source packages.
@@ -448,13 +448,15 @@
 # writes the file with DOS line endings.  This helps to avoid
 # duplicate entries in case one package has been rebuild (which is
 # common when developing a new version).
-# Support macro.  Record version number of file $(1).
-define VERSIONINFO_macro
-         $(SHA1SUM) "$(1)" >> 
-endef
-
 versioninfo.txt:
-	$(SHA1SUM) $(pkg_files) > versioninfo.txt
+	$(SHA1SUM) $(pkg_files) > versioninfo.tmp
+	set -e; \
+	( while read a b; do echo "$$a $$(basename $$b)"; \
+            done < versioninfo.tmp \
+          | sort -k2 -sf | tac | uniq -f1 ; \
+          echo '=========== SHA-1 checksum ============= == package ==' \
+         ) | tac | awk '{printf "%s\r\n", $$0}' > versioninfo.txt
+	-rm versioninfo.tmp
 
 NEWS.tmp : $(top_srcdir)/NEWS
 	sed -e '/^#/d' <$(top_srcdir)/NEWS >NEWS.tmp

More information about the Gpg4win-commits mailing list