From ffb2f51f1ae5e7e048c866e780091ff36481246a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Apr 2015 15:56:28 -0400 Subject: reuse Build.Version to generate version --- Build/Version.hs | 3 +++ debian/create-standalone-changelog | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Build/Version.hs b/Build/Version.hs index da9d1bbcb..82cca034f 100644 --- a/Build/Version.hs +++ b/Build/Version.hs @@ -67,3 +67,6 @@ cabalSetup cabalfile = do | otherwise = s where fullfield = field ++ ": " + +main :: IO () +main = putStr =<< getVersion diff --git a/debian/create-standalone-changelog b/debian/create-standalone-changelog index d1e5bbf5c..40b0c6964 100755 --- a/debian/create-standalone-changelog +++ b/debian/create-standalone-changelog @@ -9,7 +9,7 @@ umask 022 # This is the same method that the configure script uses when git-annex is # built from git master. -ANNEX_VERSION=$(git log -n 1 --format=format:'%ci %h'| sed -e 's/-//g' -e 's/ .* /-g/') +ANNEX_VERSION=$(runghc Build/Version.hs) ANNEX_NDVERSION=$( echo ${ANNEX_VERSION} | sed -e 's,-,+git,' -e 's,$,-1~ndall+1,') -- cgit v1.2.3