[Pkg-gnupg-commit] [libassuan] 19/19: Refresh patches

[Eric Dorland]

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

eric pushed a commit to branch master
in repository libassuan.

commit 812f944fae6ce1d7f0a7bb3e37b095b2cc02fafb
Author: Eric Dorland <eric at debian.org>
Date:   Sat Nov 25 01:16:25 2017 -0500

    Refresh patches
---
 debian/changelog                                       |  1 +
 ...d-linker-errors-when-cross-building-for-win32.patch | 10 +++++-----
 .../patches/0002-avoid-self-describing-as-a-beta.patch | 18 +++++++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30f2158..033227e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libassuan (2.4.4-1) unstable; urgency=medium
   * New upstream release.
   * debian/control: Mark libassuan-mingw-w64-dev as priority optional.
   * debian/control: Standards-Version to 4.1.1.
+  * debian/patches/*: Refresh patches.
 
  -- Eric Dorland <eric at debian.org>  Sat, 25 Nov 2017 00:54:20 -0500
 
diff --git a/debian/patches/0001-avoid-linker-errors-when-cross-building-for-win32.patch b/debian/patches/0001-avoid-linker-errors-when-cross-building-for-win32.patch
index dbb0c12..88ce71a 100644
--- a/debian/patches/0001-avoid-linker-errors-when-cross-building-for-win32.patch
+++ b/debian/patches/0001-avoid-linker-errors-when-cross-building-for-win32.patch
@@ -19,17 +19,17 @@ make[5]: Leaving directory '/home/dkg/src/pkg-gnupg/libassuan/build-win32/src'
  src/libassuan.def | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/libassuan.def b/src/libassuan.def
-index c320151..dfce924 100644
---- a/src/libassuan.def
-+++ b/src/libassuan.def
+Index: libassuan/src/libassuan.def
+===================================================================
+--- libassuan.orig/src/libassuan.def	2017-11-25 01:07:57.401767816 -0500
++++ libassuan/src/libassuan.def	2017-11-25 01:07:57.365768247 -0500
 @@ -1,3 +1,4 @@
 +EXPORTS
  ; assuan.def - List of symbols to export.
  ; Copyright (C) 2005, 2009 g10 Code GmbH
  ;
 @@ -18,7 +19,6 @@
- ; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ ; SPDX-License-Identifier: LGPL-2.1+
  
  
 -EXPORTS
diff --git a/debian/patches/0002-avoid-self-describing-as-a-beta.patch b/debian/patches/0002-avoid-self-describing-as-a-beta.patch
index 1b1d665..22cc82c 100644
--- a/debian/patches/0002-avoid-self-describing-as-a-beta.patch
+++ b/debian/patches/0002-avoid-self-describing-as-a-beta.patch
@@ -16,21 +16,21 @@ See discussion at:
  autogen.sh | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/autogen.sh b/autogen.sh
-index 90e7d7f..210409b 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -214,7 +214,7 @@ if [ "$myhost" = "find-version" ]; then
+Index: libassuan/autogen.sh
+===================================================================
+--- libassuan.orig/autogen.sh	2017-11-25 01:12:42.178361210 -0500
++++ libassuan/autogen.sh	2017-11-25 01:13:39.989669412 -0500
+@@ -229,7 +229,7 @@
      esac
  
      beta=no
--    if [ -d .git ]; then
+-    if [ -e .git ]; then
 +    if false; then
        ingit=yes
        tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
-       if [ -n "$tmp" ]; then
-@@ -228,8 +228,8 @@ if [ "$myhost" = "find-version" ]; then
-       rvd=$((0x$(echo ${rev} | head -c 4)))
+       tmp=$(echo "$tmp" | sed s/^"$package"//)
+@@ -245,8 +245,8 @@
+       rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
      else
        ingit=no
 -      beta=yes

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