[Pkg-samba-maint] [samba] 02/03: debian/bin/xsltproc: don't use $FAKETIME as the variable name in our wrapper script, this seems to make faketime unhappy.

[Steve Langasek]

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

vorlon pushed a commit to branch master
in repository samba.

commit 96fdbf4b7e5fbb75cd8cbe53c65045d3166fe028
Author: Steve Langasek <vorlon at debian.org>
Date:   Mon Jan 20 07:45:14 2014 +0000

    debian/bin/xsltproc: don't use $FAKETIME as the variable name in our wrapper script, this seems to make faketime unhappy.
---
 debian/bin/xsltproc | 6 +++---
 debian/changelog    | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/bin/xsltproc b/debian/bin/xsltproc
index d5eb004..0e8b099 100755
--- a/debian/bin/xsltproc
+++ b/debian/bin/xsltproc
@@ -7,11 +7,11 @@
 
 export TZ=UTC
 
-FAKETIME=`which faketime`
+FAKETIMEPROG=`which faketime`
 
-if [ -x "$FAKETIME" -a -n "$SOURCE_DATE" ]
+if [ -x "$FAKETIMEPROG" -a -n "$SOURCE_DATE" ]
 then
-	$FAKETIME "$SOURCE_DATE" /usr/bin/xsltproc "$@"
+	$FAKETIMEPROG "$SOURCE_DATE" /usr/bin/xsltproc "$@"
 else
 	/usr/bin/xsltproc "$@"
 fi
diff --git a/debian/changelog b/debian/changelog
index 790af2c..a63d523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ samba (2:4.1.4+dfsg-2) UNRELEASED; urgency=medium
     the package.  Closes: #736070.
   * Move the dhcp client hook from /etc/dhcp3 to /etc/dhcp.
     Closes: #649100.
+  * debian/bin/xsltproc: don't use $FAKETIME as the variable name in our
+    wrapper script, this seems to make faketime unhappy.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sat, 18 Jan 2014 20:26:35 +0000
 

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