[Pkg-gnupg-commit] [gnupg2] 02/14: drop renumbering patch

Daniel Kahn Gillmor dkg at fifthhorseman.net
Fri Apr 1 16:20:29 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental-move-to-gnupg
in repository gnupg2.

commit 1618d8faf20753f7b716b1fbb4fc84ebf4b2ae2e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Feb 17 19:01:53 2016 -0500

    drop renumbering patch
---
 debian/patches/0001-rename-gnupg2.patch | 30 ------------------------------
 debian/patches/series                   |  1 -
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/0001-rename-gnupg2.patch b/debian/patches/0001-rename-gnupg2.patch
deleted file mode 100644
index 0ded98e..0000000
--- a/debian/patches/0001-rename-gnupg2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Debian GnuPG Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>
-Date: Tue, 14 Apr 2015 10:02:31 -0400
-Subject: rename gnupg2
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 266eae5..323d1c4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ min_automake_version="1.14"
- # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force".  Please
- # bump the version number immediately *after* the release and do
- # another commit and push so that the git magic is able to work.
--m4_define([mym4_package],[gnupg])
-+m4_define([mym4_package],[gnupg2])
- m4_define([mym4_major], [2])
- m4_define([mym4_minor], [1])
- m4_define([mym4_micro], [11])
-@@ -73,7 +73,7 @@ NEED_SQLITE_VERSION=3.7
- 
- development_version=mym4_isbeta
- PACKAGE=$PACKAGE_NAME
--PACKAGE_GT=${PACKAGE_NAME}2
-+PACKAGE_GT=${PACKAGE_NAME}
- VERSION=$PACKAGE_VERSION
- 
- AC_CONFIG_AUX_DIR([build-aux])
diff --git a/debian/patches/series b/debian/patches/series
index 540d51d..78524b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-rename-gnupg2.patch
 0002-avoid-beta-warning.patch
 0003-Avoid-simple-memory-dumps-via-ptrace.patch
 0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list