From a15e1158c6d3c5e14a2eaf93d9e8f0b74f7c9920 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Apr 2015 16:42:54 -0400 Subject: [PATCH] use BuildVersion in debian, which fixes windows build --- Build/Version.hs | 3 --- debian/create-standalone-changelog | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Build/Version.hs b/Build/Version.hs index 82cca034f6..da9d1bbcba 100644 --- a/Build/Version.hs +++ b/Build/Version.hs @@ -67,6 +67,3 @@ 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 40b0c69644..d972f4e306 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=$(runghc Build/Version.hs) +ANNEX_VERSION=$(runghc Build/BuildVersion.hs) ANNEX_NDVERSION=$( echo ${ANNEX_VERSION} | sed -e 's,-,+git,' -e 's,$,-1~ndall+1,')