[svn] gpgme - r1109 - in trunk/tests: . gpg

[svn author marcus]

Author: marcus
Date: 2005-10-01 22:41:41 +0200 (Sat, 01 Oct 2005)
New Revision: 1109

Removed:
   trunk/tests/gpg/gpg.conf
Modified:
   trunk/tests/ChangeLog
   trunk/tests/gpg/Makefile.am
Log:
2005-10-01  Marcus Brinkmann  <marcus at g10code.de>

	* gpg/Makefile.am (EXTRA_DIST): Remove gpg.conf.
	(DISTCLEANFILES): Add gpg.conf.
	(all-local): Add gpg.conf.
	(./gpg.conf): New target.
	* gpg/gpg.conf: Remove file.



Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog	2005-10-01 20:17:03 UTC (rev 1108)
+++ trunk/tests/ChangeLog	2005-10-01 20:41:41 UTC (rev 1109)
@@ -1,5 +1,11 @@
 2005-10-01  Marcus Brinkmann  <marcus at g10code.de>
 
+	* gpg/Makefile.am (EXTRA_DIST): Remove gpg.conf.
+	(DISTCLEANFILES): Add gpg.conf.
+	(all-local): Add gpg.conf.
+	(./gpg.conf): New target.
+	* gpg/gpg.conf: Remove file.
+
 	* gpg/Makefile.am (EXTRA_DIST): Add gpg.conf.
 
 	* gpg/Makefile.am (TESTS): Add t-sig-notation.

Modified: trunk/tests/gpg/Makefile.am
===================================================================
--- trunk/tests/gpg/Makefile.am	2005-10-01 20:17:03 UTC (rev 1108)
+++ trunk/tests/gpg/Makefile.am	2005-10-01 20:41:41 UTC (rev 1109)
@@ -32,10 +32,10 @@
 	t-file-name
 
 CLEANFILES = secring.gpg pubring.gpg trustdb.gpg
-DISTCLEANFILES = pubring.gpg~ random_seed
+DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf
 
 EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
-	geheim.txt pubkey-1.asc seckey-1.asc gpg.conf
+	geheim.txt pubkey-1.asc seckey-1.asc
 
 INCLUDES = -I$(top_srcdir)/gpgme
 
@@ -49,11 +49,16 @@
 clean-local:
 	$(srcdir)/mkdemodirs --clean
 
-all-local: ./pubring.gpg
+all-local: ./pubring.gpg ./gpg.conf
 
 ./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg 
 	$(GPG) --homedir . --import $(srcdir)/pubdemo.asc
-	$(GPG) --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
+	$(GPG) --homedir . --allow-secret-key-import \
+		--import Alpha/Secret.gpg Zulu/Secret.gpg
 
 ./Alpha/Secret.gpg: secdemo.asc 
 	srcdir=$(srcdir) $(srcdir)/mkdemodirs 
+
+./gpg.conf:
+# This is required for t-sig-notations.
+	echo no-force-v3-sigs > ./gpg.conf

Deleted: trunk/tests/gpg/gpg.conf