2010-02-10 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Wed, 10 Feb 2010 10:36:08 +0000 (10:36 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Wed, 10 Feb 2010 10:36:08 +0000 (10:36 +0000)
* patches/gpgex-0.9.5/01-default-no-suffix.patch: Add patch.
* Makefile.am (EXTRA_DIST): Add this and remove gpgex-0.9.3 patches.

ChangeLog
Makefile.am
patches/gpgex-0.9.5/01-default-no-suffix.patch [new file with mode: 0755]

index 4ec6776..2bfee7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-10  Marcus Brinkmann  <marcus@g10code.de>
+
+       * patches/gpgex-0.9.5/01-default-no-suffix.patch: Add patch.
+       * Makefile.am (EXTRA_DIST): Add this and remove gpgex-0.9.3 patches.
+
 2010-02-03  Werner Koch  <wk@g10code.com>
 
        Release 2.0.2rc1.
index 3b74761..bbe52c2 100644 (file)
@@ -37,8 +37,7 @@ EXTRA_DIST = autogen.sh README.SVN ONEWS \
        patches/gpgme-1.2.0/03-w32-socket.patch \
        patches/winpt/01-gpg-path.patch \
        patches/gpgex/01-no-checksums.patch \
-       patches/gpgex-0.9.3/01-full-browser.patch \
-       patches/gpgex-0.9.3/02-doc.patch \
+       patches/gpgex-0.9.5/01-default-no-suffix.patch \
        patches/gnupg2/01-version.patch.in \
        patches/gnupg2-2.0.9/01-close-all-handle.patch \
        patches/gnupg2-2.0.9/02-de.po-fix.patch \
diff --git a/patches/gpgex-0.9.5/01-default-no-suffix.patch b/patches/gpgex-0.9.5/01-default-no-suffix.patch
new file mode 100755 (executable)
index 0000000..e13a054
--- /dev/null
@@ -0,0 +1,17 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Correct default if there is no suffix.
+
+--- src/gpgex.cc       2009-07-17 18:19:12.000000000 +0200
++++ src/gpgex.cc       2010-02-10 11:29:17.000000000 +0100
+@@ -213,6 +213,8 @@
+                         if (gpg == false)
+                           this->all_files_gpg = FALSE;
+                       }
++                    else
++                      this->all_files_gpg = FALSE;
+                     this->filenames.push_back (filename);
+                   }