summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-21 16:42:54 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-21 16:42:54 -0400
commitd5026f8fafea5044a276f23138821ffc090f7c05 (patch)
tree5c02d4c0eb6de48de176cd5249592f1572c8585c
parent048078fdb6086bae88500a2509c67001555ae942 (diff)
use BuildVersion in debian, which fixes windows build
-rw-r--r--Build/Version.hs3
-rwxr-xr-xdebian/create-standalone-changelog2
2 files changed, 1 insertions, 4 deletions
diff --git a/Build/Version.hs b/Build/Version.hs
index 82cca034f..da9d1bbcb 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 40b0c6964..d972f4e30 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,')