[Pkg-gnupg-commit] [libgpg-error] 28/29: refresh patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Sun Mar 5 00:41:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository libgpg-error.
commit 1f81c98139f9a699f59251c1c2d20c2efcf18086
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Sun Mar 5 01:28:44 2017 +0100
refresh patches
---
.../0001-Remove-upstream-git-fanciness.patch | 97 ++++++++++++++++++++++
.../patches/0001-avoid-identifying-as-beta.patch | 25 ------
...re-revision-by-length-of-debian-changelog.patch | 31 -------
...pace-in-gpg-error.def-linker-script-for-.patch} | 2 +-
debian/patches/series | 5 +-
5 files changed, 100 insertions(+), 60 deletions(-)
diff --git a/debian/patches/0001-Remove-upstream-git-fanciness.patch b/debian/patches/0001-Remove-upstream-git-fanciness.patch
new file mode 100644
index 0000000..bef3199
--- /dev/null
+++ b/debian/patches/0001-Remove-upstream-git-fanciness.patch
@@ -0,0 +1,97 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Sun, 5 Mar 2017 01:23:51 +0100
+Subject: Remove upstream git fanciness
+
+Debian needs to be able to build libgpg-error while using git for
+tracking the debian packaging itself. Debian also wants to autoreconf
+this stuff. However, Debian does *not* need to conform exactly to
+upstream's git configurations.
+
+This avoids mistakes like accidentally identifying running code as a
+beta.
+---
+ autogen.sh | 64 +++++---------------------------------------------------------
+ 1 file changed, 5 insertions(+), 59 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index e5ba5bf..dd73c5f 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -229,27 +229,11 @@ if [ "$myhost" = "find-version" ]; then
+ esac
+
+ beta=no
+- if [ -e .git ]; then
+- ingit=yes
+- tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
+- tmp=$(echo "$tmp" | sed s/^"$package"//)
+- if [ -n "$tmp" ]; then
+- tmp=$(echo "$tmp" | sed s/^"$package"// \
+- | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
+- else
+- tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
+- | awk -F- '$4!=0{print"-beta"$4}')
+- fi
+- [ -n "$tmp" ] && beta=yes
+- rev=$(git rev-parse --short HEAD | tr -d '\n\r')
+- rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
+- else
+- ingit=no
+- beta=yes
+- tmp="-unknown"
+- rev="0000000"
+- rvd="0"
+- fi
++ ingit=no
++ beta=no
++ tmp="-unknown"
++ rvd="$(wc -l < debian/changelog)"
++ rev="$(printf %07x $rvd)"
+
+ echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:"
+ exit 0
+@@ -432,44 +416,6 @@ EOF
+ die_p
+ fi
+
+-# Check the git setup.
+-if [ -d .git ]; then
+- CP="cp -p"
+- # If we have a GNU cp we can add -v
+- if cp --version >/dev/null 2>/dev/null; then
+- [ -z "${SILENT}" ] && CP="$CP -v"
+- fi
+- if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+- [ -z "${SILENT}" ] && cat <<EOF
+-*** Activating trailing whitespace git pre-commit hook. ***
+- For more information see this thread:
+- https://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084.html
+- To deactivate this pre-commit hook again move .git/hooks/pre-commit
+- and .git/hooks/pre-commit.sample out of the way.
+-EOF
+- $CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
+- chmod +x .git/hooks/pre-commit
+- fi
+-
+- if [ "$gettext_vers" != "n/a" ]; then
+- tmp=$(git config --get filter.cleanpo.clean)
+- if [ "$tmp" != \
+- "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
+- then
+- info "*** Adding GIT filter.cleanpo.clean configuration."
+- git config --add filter.cleanpo.clean \
+- "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
+- fi
+- fi
+- if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
+- [ -z "${SILENT}" ] && cat <<EOF
+-*** Activating commit log message check hook. ***
+-EOF
+- $CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
+- chmod +x .git/hooks/commit-msg
+- fi
+-fi
+-
+ aclocal_flags="-I m4"
+ if [ -n "${extra_aclocal_flags}" ]; then
+ aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}"
diff --git a/debian/patches/0001-avoid-identifying-as-beta.patch b/debian/patches/0001-avoid-identifying-as-beta.patch
deleted file mode 100644
index 3a5e3be..0000000
--- a/debian/patches/0001-avoid-identifying-as-beta.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Tue, 8 Sep 2015 02:49:05 -0400
-Subject: avoid identifying as beta
-
-If we build from git-buildpackage using autoreconf, it comes out
-looking like a beta because we're not on a git tag.
-
-This patch avoids that situation.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3d8bb12..3efcd1c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,7 +40,7 @@ m4_define([mym4_revision_dec],
- m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
- m4_define([mym4_betastring],
- m4_esyscmd_s([git describe --match 'libgpg-error-[0-9].*[0-9]' --long|\
-- awk -F- '$4!=0{print"-beta"$4}']))
-+ awk -F- '$4!=0{print""}']))
- m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
- m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
-
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
deleted file mode 100644
index 48f4dce..0000000
--- a/debian/patches/0002-Measure-revision-by-length-of-debian-changelog.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Tue, 9 Feb 2016 01:09:26 -0500
-Subject: Measure revision by length of debian/changelog
-
-Upstream libgpg-error's autoreconf step derives the package "revision"
-number from the first couple octets of the git commit ID.
-
-But Debian doesn't build packages from git, and we autoreconf the
-package before building. So we need to figure out a different value
-for the package revision.
-
-This patch makes the package revision reflect the number of lines in
-debian/changelog instead of trying to derive a revision number from
-the git ID.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3efcd1c..37881ab 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,7 +35,7 @@ m4_define([mym4_version_minor], [26])
- # 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],
-- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
-+ m4_esyscmd([printf %x $(wc -l < debian/changelog)]))
- m4_define([mym4_revision_dec],
- m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
- m4_define([mym4_betastring],
diff --git a/debian/patches/0003-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch b/debian/patches/0002-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
similarity index 99%
rename from debian/patches/0003-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
rename to debian/patches/0002-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
index 1d328fc..0b5afb7 100644
--- a/debian/patches/0003-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
+++ b/debian/patches/0002-avoid-whitespace-in-gpg-error.def-linker-script-for-.patch
@@ -28,7 +28,7 @@ is already a valid linker script and doesn't try to tweak it further.
1 file changed, 1 deletion(-)
diff --git a/src/gpg-error.def.in b/src/gpg-error.def.in
-index 19e87fa..f80db78 100644
+index ad65f8c..51ad46c 100644
--- a/src/gpg-error.def.in
+++ b/src/gpg-error.def.in
@@ -23,7 +23,6 @@
diff --git a/debian/patches/series b/debian/patches/series
index 46e7f1e..c9217df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-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
+0001-Remove-upstream-git-fanciness.patch
+0002-avoid-whitespace-in-gpg-error.def-linker-script-for-.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