[Pkg-gnupg-commit] [libgpg-error] 01/14: prepare yat2m for shipping using upstream patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Feb 5 23:59:30 UTC 2018
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository libgpg-error.
commit e48d314bd7180dd7c2b6822aafae08d11dcfeb32
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Jan 25 14:17:49 2018 -0500
prepare yat2m for shipping using upstream patches
---
.../0013-yat2m-Use-version-from-libgpg-error.patch | 45 ++++++++++++++++++++++
.../0014-yat2m-Change-bug-report-address.patch | 31 +++++++++++++++
debian/patches/0015-build-Install-yat2m.patch | 40 +++++++++++++++++++
debian/patches/series | 3 ++
4 files changed, 119 insertions(+)
diff --git a/debian/patches/0013-yat2m-Use-version-from-libgpg-error.patch b/debian/patches/0013-yat2m-Use-version-from-libgpg-error.patch
new file mode 100644
index 0000000..04eed7f
--- /dev/null
+++ b/debian/patches/0013-yat2m-Use-version-from-libgpg-error.patch
@@ -0,0 +1,45 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Wed, 5 Jul 2017 10:14:00 +0200
+Subject: yat2m: Use version from libgpg-error.
+
+* doc/yat2m.c (VERSION): Define as PACKAGE_VERSION.
+* doc/Makefile.am (yat2m): Pass PACKAGE_VERSION with -D.
+
+Signed-off-by: Werner Koch <wk at gnupg.org>
+(cherry picked from commit 0148ea8d5acde2ad5d0376fb7eaa2221e88f258a)
+---
+ doc/Makefile.am | 3 ++-
+ doc/yat2m.c | 6 +++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 565bb09..c914527 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -35,7 +35,8 @@ myman_pages = gpg-error-config.1
+ man_MANS = $(myman_pages)
+
+ yat2m: yat2m.c
+- $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
++ $(CC_FOR_BUILD) -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
++ -o $@ $(srcdir)/yat2m.c
+
+
+ yat2m-stamp: $(myman_sources)
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 184d27b..27db491 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -128,7 +128,11 @@
+
+
+ #define PGM "yat2m"
+-#define VERSION "1.0"
++#ifdef PACKAGE_VERSION
++# define VERSION PACKAGE_VERSION
++#else
++# define VERSION "1.0"
++#endif
+
+ /* The maximum length of a line including the linefeed and one extra
+ character. */
diff --git a/debian/patches/0014-yat2m-Change-bug-report-address.patch b/debian/patches/0014-yat2m-Change-bug-report-address.patch
new file mode 100644
index 0000000..fdfaba5
--- /dev/null
+++ b/debian/patches/0014-yat2m-Change-bug-report-address.patch
@@ -0,0 +1,31 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Wed, 5 Jul 2017 10:18:53 +0200
+Subject: yat2m: Change bug report address.
+
+--
+
+(cherry picked from commit 9de27cbabed8062bfb4eafffba9ff38108f5377e)
+---
+ doc/yat2m.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 27db491..8c6319c 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
+@@ -1521,13 +1521,13 @@ main (int argc, char **argv)
+ " -I DIR also search in include DIR\n"
+ " -D gpgone the only usable define\n\n"
+ "With no FILE, or when FILE is -, read standard input.\n\n"
+- "Report bugs to <bugs at g10code.com>.");
++ "Report bugs to <https://bugs.gnupg.org>.");
+ exit (0);
+ }
+ else if (!strcmp (*argv, "--version"))
+ {
+ puts (PGM " " VERSION "\n"
+- "Copyright (C) 2005 g10 Code GmbH\n"
++ "Copyright (C) 2005, 2017 g10 Code GmbH\n"
+ "This program comes with ABSOLUTELY NO WARRANTY.\n"
+ "This is free software, and you are welcome to redistribute it\n"
+ "under certain conditions. See the file COPYING for details.");
diff --git a/debian/patches/0015-build-Install-yat2m.patch b/debian/patches/0015-build-Install-yat2m.patch
new file mode 100644
index 0000000..548dbc0
--- /dev/null
+++ b/debian/patches/0015-build-Install-yat2m.patch
@@ -0,0 +1,40 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Wed, 5 Jul 2017 10:08:13 +0200
+Subject: build: Install yat2m.
+
+* doc/Makefile.am (install-exec-hook): New.
+(uninstall-local): Uninstall yat2m.
+
+Signed-off-by: Werner Koch <wk at gnupg.org>
+(cherry picked from commit d81b1379edbc6007a89c3b2fff1b51c8dfe2e868)
+---
+ doc/Makefile.am | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index c914527..d052283 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -72,9 +72,22 @@ errorref.txt.x : errorref.txt
+ sed '/^##/ d' $< >$@
+ echo "# Installed by $(PACKAGE_NAME) $(PACKAGE_VERSION)" >>$@
+
++install-exec-hook:
++if CROSS_COMPILING
++ @echo "not install yat2m while cross-compiling"
++else
++ @echo "installing yat2m on the build system"; \
++ $(MKDIR_P) "$(DESTDIR)$(bindir)"; \
++ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) \
++ yat2m "$(DESTDIR)$(bindir)/yat2m"
++endif
++
+ install-data-local: errorref.txt.x
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ $(INSTALL_DATA) errorref.txt.x $(DESTDIR)$(pkgdatadir)/errorref.txt
+
+ uninstall-local:
+ - at rm $(DESTDIR)$(pkgdatadir)/errorref.txt
++if !CROSS_COMPILING
++ - at rm $(DESTDIR)$(bindir)/yat2m
++endif
diff --git a/debian/patches/series b/debian/patches/series
index e3cbb03..304c652 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,6 @@
0010-doc-Typo-fix.patch
0011-yat2m-Take-care-of-SOURCE_DATE_EPOCH.patch
0012-syscfg-Add-lock-obj-pub-file-for-ia64-unknown-linux-.patch
+0013-yat2m-Use-version-from-libgpg-error.patch
+0014-yat2m-Change-bug-report-address.patch
+0015-build-Install-yat2m.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libgpg-error.git
More information about the Pkg-gnupg-commit
mailing list