[Pkg-gnupg-commit] [gnupg2] 183/205: speedo: Also try patch files w/o version number.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed May 11 08:38:38 UTC 2016


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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 9ea258fa5b45bb5454ee3f5906df5d5eebdec0dd
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 14:31:46 2016 +0200

    speedo: Also try patch files w/o version number.
    
    * build-aux/speedo.mk (SPKG_template): Try such a patch file.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 build-aux/speedo.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 2812773..d286655 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -866,9 +866,13 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
                  | sed -e 's,\.tar.*$$$$,,'`;		\
 	   mv $$$${base} $(1);				\
 	   patch="$(patdir)/$(1)-$$$${base#$(1)-}.patch";\
+	   patchx="$(patdir)/$(1).patch";               \
 	   if [ -x "$$$${patch}" ]; then  		\
              echo "speedo: applying patch $$$${patch}"; \
              cd $(1); "$$$${patch}"; 	 		\
+	   elif [ -x "$$$${patchx}" ]; then  		\
+             echo "speedo: applying patch $$$${patchx}";\
+             cd $(1); "$$$${patchx}"; 	 		\
 	   elif [ -f "$$$${patch}" ]; then  		\
              echo "speedo: warning: $$$${patch} is not executable"; \
 	   fi;						\

-- 
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