[Pkg-gnupg-commit] [gnupg1] 22/30: refresh patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Aug 2 06:35:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg1.
commit 17350ac4c5e480ca6395a0f5a215c22a7b4ee35a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Tue Aug 1 12:36:32 2017 -0400
refresh patches
---
...id-looking-for-git-info-during-autoreconf.patch | 4 ++--
.../patches/0002-Update-Danish-translation.patch | 2 +-
.../0003-change-package-name-to-gnupg1.patch | 4 ++--
...hange-default-digest-algorithm-to-SHA256.patch} | 0
...0005-spelling-correct-achived-to-achieved.patch | 22 -----------------
...ch => 0006-po-Update-Spanish-translation.patch} | 28 +++++++++++-----------
debian/patches/series | 5 ++--
7 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/debian/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch b/debian/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
index f7e64b4..eceb1b3 100644
--- a/debian/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
+++ b/debian/patches/0001-avoid-looking-for-git-info-during-autoreconf.patch
@@ -7,10 +7,10 @@ Subject: avoid looking for git info during autoreconf
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 8133537..0179f1d 100644
+index f6ed9c2..e705b88 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.21])
+@@ -32,13 +32,10 @@ m4_define([mym4_version], [1.4.22])
# the decimalized short revision number, a beta version string and a
# flag indicating a development version (mym4_isgit). Note that the
# m4 processing is done by autoconf and not during the configure run.
diff --git a/debian/patches/0002-Update-Danish-translation.patch b/debian/patches/0002-Update-Danish-translation.patch
index 0e647c4..dc90d33 100644
--- a/debian/patches/0002-Update-Danish-translation.patch
+++ b/debian/patches/0002-Update-Danish-translation.patch
@@ -7,7 +7,7 @@ Subject: Update-Danish-translation
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/po/da.po b/po/da.po
-index b35c8a6..f7474ca 100644
+index 239bb09..69267a5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@
diff --git a/debian/patches/0003-change-package-name-to-gnupg1.patch b/debian/patches/0003-change-package-name-to-gnupg1.patch
index 99636fb..2f4fe01 100644
--- a/debian/patches/0003-change-package-name-to-gnupg1.patch
+++ b/debian/patches/0003-change-package-name-to-gnupg1.patch
@@ -9,14 +9,14 @@ We're moving to calling this gnupg1; this change should affect libexec
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 0179f1d..572dc14 100644
+index e705b88..63f27ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ m4_define([mym4_betastring],[])
m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
--AC_INIT([gnupg],[mym4_full_version], [http://bugs.gnupg.org])
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
+AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
diff --git a/debian/patches/0006-gpg-Change-default-digest-algorithm-to-SHA256.patch b/debian/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
similarity index 100%
rename from debian/patches/0006-gpg-Change-default-digest-algorithm-to-SHA256.patch
rename to debian/patches/0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
diff --git a/debian/patches/0005-spelling-correct-achived-to-achieved.patch b/debian/patches/0005-spelling-correct-achived-to-achieved.patch
deleted file mode 100644
index 3471344..0000000
--- a/debian/patches/0005-spelling-correct-achived-to-achieved.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Mon, 29 Aug 2016 10:35:44 -0400
-Subject: spelling: correct achived to achieved
-
-Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
----
- doc/gpg.texi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/gpg.texi b/doc/gpg.texi
-index 12a6d60..e9935c3 100644
---- a/doc/gpg.texi
-+++ b/doc/gpg.texi
-@@ -1894,7 +1894,7 @@ opposite meaning. The options are:
- a formerly deleted key does not automatically gain an ownertrust
- values merely due to import. On the other hand it is sometimes
- necessary to re-import a trusted set of keys again but keeping
-- already assigned ownertrust values. This can be achived by using
-+ already assigned ownertrust values. This can be achieved by using
- this option.
-
- @item repair-pks-subkey-bug
diff --git a/debian/patches/0007-Updated-Spanish-translation-from-Venturi.patch b/debian/patches/0006-po-Update-Spanish-translation.patch
similarity index 77%
rename from debian/patches/0007-Updated-Spanish-translation-from-Venturi.patch
rename to debian/patches/0006-po-Update-Spanish-translation.patch
index 412cc6b..e805ff9 100644
--- a/debian/patches/0007-Updated-Spanish-translation-from-Venturi.patch
+++ b/debian/patches/0006-po-Update-Spanish-translation.patch
@@ -1,15 +1,16 @@
From: Manuel Venturi Porras Peralta <venturi at openmailbox.org>
-Date: Mon, 14 Nov 2016 08:14:32 +0900
-Subject: Updated Spanish translation from Venturi
+Date: Tue, 1 Aug 2017 12:45:41 -0400
+Subject: po: Update Spanish translation
-Debian-bug-id: 814541
+Debian-Bug-Id: 814541
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+(cherry picked from commit 76239356bcb3bfeec5327637ed87429594868fef)
---
- po/es.po | 21 ++++++++++-----------
- 1 file changed, 10 insertions(+), 11 deletions(-)
+ po/es.po | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/po/es.po b/po/es.po
-index 69a9955..33bff90 100644
+index 4b04638..0f261c3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,14 +5,14 @@
@@ -23,9 +24,8 @@ index 69a9955..33bff90 100644
msgstr ""
"Project-Id-Version: GnuPG 1.4.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
--"POT-Creation-Date: 2016-08-17 15:21+0200\n"
+ "POT-Creation-Date: 2017-07-19 11:21+0200\n"
-"PO-Revision-Date: 2014-11-23 01:52+0100\n"
-+"POT-Creation-Date: 2015-12-20 08:53+0100\n"
+"PO-Revision-Date: 2016-01-22 21:28+0100\n"
"Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi at openmailbox."
"org>\n"
@@ -39,7 +39,7 @@ index 69a9955..33bff90 100644
#: cipher/primegen.c:119
#, c-format
-@@ -3604,13 +3604,12 @@ msgstr ""
+@@ -3604,13 +3604,11 @@ msgstr ""
#: g10/keyedit.c:3007
msgid "WARNING: Your encryption subkey expires soon.\n"
@@ -48,33 +48,33 @@ index 69a9955..33bff90 100644
#: g10/keyedit.c:3008
-#, fuzzy
- #| msgid "You can't change the expiration date of a v3 key\n"
+-#| msgid "You can't change the expiration date of a v3 key\n"
msgid "You may want to change its expiration date too.\n"
-msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
+msgstr "Quizás también desee cambiar su fecha de expiración.\n"
#: g10/keyedit.c:3069
msgid ""
-@@ -4951,10 +4950,10 @@ msgid "unknown option `%s'\n"
+@@ -4951,10 +4949,9 @@ msgid "unknown option `%s'\n"
msgstr "opción desconocida `%s'\n"
#: g10/misc.c:1331
-#, fuzzy, c-format
+-#| msgid "Unknown signature type `%s'\n"
+#, c-format
- #| msgid "Unknown signature type `%s'\n"
msgid "Unknown weak digest '%s'\n"
-msgstr "Clase de firma desconocida `%s'\n"
+msgstr "Resumen débil desconocido '%s'\n"
#: g10/openfile.c:88
#, c-format
-@@ -5704,10 +5703,10 @@ msgid "NOTE: signature key %s expired %s\n"
+@@ -5704,10 +5701,9 @@ msgid "NOTE: signature key %s expired %s\n"
msgstr "NOTA: clave de la firma %s caducada el %s\n"
#: g10/sig-check.c:254
-#, fuzzy, c-format
+-#| msgid "%s signature, digest algorithm %s\n"
+#, c-format
- #| msgid "%s signature, digest algorithm %s\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "firma %s, algoritmo de resumen %s\n"
+msgstr "Nota: se rechazarán las firmas que usan el algoritmo %s\n"
diff --git a/debian/patches/series b/debian/patches/series
index 09b3370..2ebe713 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
0002-Update-Danish-translation.patch
0003-change-package-name-to-gnupg1.patch
0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
-0005-spelling-correct-achived-to-achieved.patch
-0006-gpg-Change-default-digest-algorithm-to-SHA256.patch
-0007-Updated-Spanish-translation-from-Venturi.patch
+0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
+0006-po-Update-Spanish-translation.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg1.git
More information about the Pkg-gnupg-commit
mailing list