[Debian-ha-commits] [resource-agents] 02/06: Never use a -dirty version in git builds

[Christoph Berg]

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

myon pushed a commit to branch master
in repository resource-agents.

commit 7b58ab773f7fdd405f6f5dd615ab6f6b6a5e93c3
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Tue Feb 2 16:58:34 2016 +0100

    Never use a -dirty version in git builds
---
 debian/patches/no-dirty-version | 22 ++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/no-dirty-version b/debian/patches/no-dirty-version
new file mode 100644
index 0000000..b800456
--- /dev/null
+++ b/debian/patches/no-dirty-version
@@ -0,0 +1,22 @@
+--- a/make/git-version-gen
++++ b/make/git-version-gen
+@@ -136,19 +136,6 @@ fi
+ 
+ v=`echo "$v" |sed 's/^v//'`
+ 
+-# Don't declare a version "dirty" merely because a time stamp has changed.
+-git update-index --refresh > /dev/null 2>&1
+-
+-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+-case "$dirty" in
+-    '') ;;
+-    *) # Append the suffix only if there isn't one already.
+-	case $v in
+-	  *-dirty) ;;
+-	  *) v="$v-dirty" ;;
+-	esac ;;
+-esac
+-
+ # Omit the trailing newline, so that m4_esyscmd can use the result directly.
+ echo "$v" | tr -d "$nl"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 44d3e6c..4269bad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_docbook_patch.patch
 02_spelling_fixes.patch
 mysql-path.patch
+no-dirty-version

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/resource-agents.git