Make gnupg-2.0.x patches version independent
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 4 Jul 2016 11:44:41 +0000 (13:44 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 4 Jul 2016 11:44:41 +0000 (13:44 +0200)
* patches/gnupg2-2.0.29: Move to gnupg2 patches.
* Makfile.am (EXTRA_DIST): Update accordingly.

--
Forgetting to update the patches directory led to regressions
with gpg4win 2.3.1 and it is unlikely that the patches
will be applied to a gnupg-2.0.x release. They are upstream
in 2.1.x.

Makefile.am
patches/gnupg2/0001-Enable-wildcard-expansion-with-mingw-w64.patch [moved from patches/gnupg2-2.0.29/0001-Enable-wildcard-expansion-with-mingw-w64.patch with 100% similarity]
patches/gnupg2/0002-Let-wchar_to_native-convert-to-console-codepage.patch [moved from patches/gnupg2-2.0.29/0002-Let-wchar_to_native-convert-to-console-codepage.patch with 100% similarity]
patches/gnupg2/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch [moved from patches/gnupg2-2.0.29/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch with 100% similarity]
patches/gnupg2/0006-gpgsm-Add-command-option-offline.patch [moved from patches/gnupg2-2.0.29/0006-gpgsm-Add-command-option-offline.patch with 100% similarity]

index 741f0ec..85a75c5 100644 (file)
@@ -29,10 +29,10 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         build-aux/git-log-footer build-aux/git-log-fix \
         patches/dirmngr-1.1.1/dirmngr-pth.patch \
         patches/glib-2.41.5/01-socket.patch \
-        patches/gnupg2-2.0.29/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
-        patches/gnupg2-2.0.29/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
-        patches/gnupg2-2.0.29/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
-        patches/gnupg2-2.0.29/0006-gpgsm-Add-command-option-offline.patch \
+        patches/gnupg2/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
+        patches/gnupg2/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
+        patches/gnupg2/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
+        patches/gnupg2/0006-gpgsm-Add-command-option-offline.patch \
         patches/gnupg2/01-version.patch \
         patches/gnupg2/01-version.patch.in \
         patches/gnutls-2.12.23/01-openssl-wincrypt.patch \