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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-09-11 15:02:21 +0200 (Tue, 11 Sep 2007)
New Revision: 523

Added:
   trunk/src/qt.conf
Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/inst-qt.nsi
Log:
2007-09-11  Marcus Brinkmann  <marcus at g10code.de>

	* packages/packages.current: Bump gnupg to 2.0.7.
	* src/qt.conf: New file.
	* src/inst-qt.nsi: Install qt.conf.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-10 15:05:00 UTC (rev 522)
+++ trunk/ChangeLog	2007-09-11 13:02:21 UTC (rev 523)
@@ -1,3 +1,9 @@
+2007-09-11  Marcus Brinkmann  <marcus at g10code.de>
+
+	* packages/packages.current: Bump gnupg to 2.0.7.
+	* src/qt.conf: New file.
+	* src/inst-qt.nsi: Install qt.conf.
+
 2007-09-10  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update gpgme and libassuan to

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2007-09-10 15:05:00 UTC (rev 522)
+++ trunk/packages/packages.current	2007-09-11 13:02:21 UTC (rev 523)
@@ -237,9 +237,9 @@
 file gnupg/gnupg-1.4.7.tar.bz2
 chk  22149105845c79068771837c8deb7d5ba0854927
 
-name gnupg2-2.0.6.tar.bz2
-file gnupg/gnupg-2.0.6.tar.bz2
-chk  4aa9a3ecc954126cfc0a30bef94ec6e1fbbc7009
+name gnupg2-2.0.7.tar.bz2
+file gnupg/gnupg-2.0.7.tar.bz2
+chk  f7d9ae7695bd9b849475b482bb7b027ec6fadbae
 
 file libgpg-error/libgpg-error-1.5.tar.bz2
 chk  1f83d9af8e8ed3bcbf3a5e9018db257dc6336655

Modified: trunk/src/inst-qt.nsi
===================================================================
--- trunk/src/inst-qt.nsi	2007-09-10 15:05:00 UTC (rev 522)
+++ trunk/src/inst-qt.nsi	2007-09-11 13:02:21 UTC (rev 523)
@@ -32,6 +32,9 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_qt_src}"
 !else
+  # Qt needs some help to find itself.
+  File qt.conf
+
   File ${prefix}/bin/Qt3Support4.dll
   File ${prefix}/bin/QtAssistantClient4.dll
   File ${prefix}/bin/QtCore4.dll

Added: trunk/src/qt.conf
===================================================================
--- trunk/src/qt.conf	2007-09-10 15:05:00 UTC (rev 522)
+++ trunk/src/qt.conf	2007-09-11 13:02:21 UTC (rev 523)
@@ -0,0 +1,12 @@
+[Paths]
+Prefix=
+Documentation=doc
+Headers=include
+Libraries=lib
+Binaries=
+Plugins=plugins
+Data=
+Translations=translations
+Settings=etc
+Examples=examples
+Demos=demos