[Pkg-gnupg-commit] [libgpg-error] 14/15: refresh debian patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Jun 17 00:26:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository libgpg-error.
commit 0024dd1e0af055739f055b272bd3736d85bd520f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Jun 16 19:56:31 2016 -0400
refresh debian patches
---
.../patches/0001-avoid-identifying-as-beta.patch | 2 +-
...re-revision-by-length-of-debian-changelog.patch | 4 +-
...-Add-a-powerpc-and-a-tilgegx-architecture.patch | 99 ----------------------
debian/patches/series | 1 -
4 files changed, 3 insertions(+), 103 deletions(-)
diff --git a/debian/patches/0001-avoid-identifying-as-beta.patch b/debian/patches/0001-avoid-identifying-as-beta.patch
index 5c06fca..686b844 100644
--- a/debian/patches/0001-avoid-identifying-as-beta.patch
+++ b/debian/patches/0001-avoid-identifying-as-beta.patch
@@ -11,7 +11,7 @@ This patch avoids that situation.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 784ac69..db47ec9 100644
+index c2790aa..8e71b3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ m4_define([mym4_revision_dec],
diff --git a/debian/patches/0002-Measure-revision-by-length-of-debian-changelog.patch b/debian/patches/0002-Measure-revision-by-length-of-debian-changelog.patch
index 92b651d..e1e6a87 100644
--- a/debian/patches/0002-Measure-revision-by-length-of-debian-changelog.patch
+++ b/debian/patches/0002-Measure-revision-by-length-of-debian-changelog.patch
@@ -17,10 +17,10 @@ the git ID.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index db47ec9..3ec8238 100644
+index 8e71b3c..1933c01 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -35,7 +35,7 @@ m4_define([mym4_version_minor], [22])
+@@ -35,7 +35,7 @@ m4_define([mym4_version_minor], [23])
# processing is done by autoconf and not during the configure run.
m4_define([mym4_version], [mym4_version_major.mym4_version_minor])
m4_define([mym4_revision],
diff --git a/debian/patches/0004-syscfg-Add-a-powerpc-and-a-tilgegx-architecture.patch b/debian/patches/0004-syscfg-Add-a-powerpc-and-a-tilgegx-architecture.patch
deleted file mode 100644
index 08746b7..0000000
--- a/debian/patches/0004-syscfg-Add-a-powerpc-and-a-tilgegx-architecture.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Werner Koch <wk at gnupg.org>
-Date: Sat, 7 May 2016 09:09:04 +0200
-Subject: syscfg: Add a powerpc and a tilgegx architecture.
-
-* src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h: New.
-* src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h: New.
-* src/Makefile.am (lock_obj_pub): Add them.
---
-
-Debian-bug-id: 823630, 823631
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- src/Makefile.am | 2 ++
- .../lock-obj-pub.powerpc-unknown-linux-gnuspe.h | 23 ++++++++++++++++++++
- src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h | 25 ++++++++++++++++++++++
- 3 files changed, 50 insertions(+)
- create mode 100644 src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h
- create mode 100644 src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1d88608..5623aff 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -63,6 +63,7 @@ lock_obj_pub = \
- syscfg/lock-obj-pub.powerpc-unknown-linux-gnu.h \
- syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \
- syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \
-+ syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \
- syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \
- syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \
- syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \
-@@ -71,6 +72,7 @@ lock_obj_pub = \
- syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h \
- syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h \
- syscfg/lock-obj-pub.x86_64-pc-linux-musl.h \
-+ syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h \
- syscfg/lock-obj-pub.mingw32.h
-
-
-diff --git a/src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h b/src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h
-new file mode 100644
-index 0000000..c53413b
---- /dev/null
-+++ b/src/syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h
-@@ -0,0 +1,23 @@
-+## lock-obj-pub.powerpc-unknown-linux-gnuspe.h
-+## File created by gen-posix-lock-obj - DO NOT EDIT
-+## To be included by mkheader into gpg-error.h
-+
-+typedef struct
-+{
-+ long _vers;
-+ union {
-+ volatile char _priv[24];
-+ long _x_align;
-+ long *_xp_align;
-+ } u;
-+} gpgrt_lock_t;
-+
-+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
-+ 0,0,0,0,0,0,0,0, \
-+ 0,0,0,0,0,0,0,0}}}
-+##
-+## Local Variables:
-+## mode: c
-+## buffer-read-only: t
-+## End:
-+##
-diff --git a/src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h
-new file mode 100644
-index 0000000..b99ea32
---- /dev/null
-+++ b/src/syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h
-@@ -0,0 +1,25 @@
-+## lock-obj-pub.tilegx-unknown-linux-gnu.h
-+## File created by gen-posix-lock-obj - DO NOT EDIT
-+## To be included by mkheader into gpg-error.h
-+
-+typedef struct
-+{
-+ long _vers;
-+ union {
-+ volatile char _priv[40];
-+ long _x_align;
-+ long *_xp_align;
-+ } u;
-+} gpgrt_lock_t;
-+
-+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
-+ 0,0,0,0,0,0,0,0, \
-+ 0,0,0,0,0,0,0,0, \
-+ 0,0,0,0,0,0,0,0, \
-+ 0,0,0,0,0,0,0,0}}}
-+##
-+## Local Variables:
-+## mode: c
-+## buffer-read-only: t
-+## End:
-+##
diff --git a/debian/patches/series b/debian/patches/series
index eff6432..46e7f1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-avoid-identifying-as-beta.patch
0002-Measure-revision-by-length-of-debian-changelog.patch
0003-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
-0004-syscfg-Add-a-powerpc-and-a-tilgegx-architecture.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