From 387e3dc18fe2c82c0eefc5332f4f458f7f979c96 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 24 May 2016 01:00:06 -0400
Subject: Updated cabal file explictly lists source files.

The tarball on hackage will include only the files needed for cabal install;
it is NOT the full git-annex source tree. While it's totally obnoxious that
cabal files need every file listed out when basic wildcard support could
avoid hundreds of lines, and have to be maintained when files are added,
this does get the tarball size back down to 1 mb.

This also stops stack from complaining that it found modules not listed in
the cabal file.

debian/changelog, debian/NEWS, debian/copyright: Converted to symlinks
to CHANGELOG, NEWS, and COPYRIGHT, which used to symlink to these instead.
This avoids needing to include debian/ in the hackage tarball.

Setup.hs: Build man pages at install time using make and mdwn2man.
If it fails, which it probably will on windows, just skip installing
them.
---
 Build/Version.hs    |  2 +-
 Build/make-sdist.sh | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100755 Build/make-sdist.sh

(limited to 'Build')

diff --git a/Build/Version.hs b/Build/Version.hs
index 87315b0ea..d39a0fe08 100644
--- a/Build/Version.hs
+++ b/Build/Version.hs
@@ -46,7 +46,7 @@ getVersion = do
 	
 getChangelogVersion :: IO Version
 getChangelogVersion = do
-	changelog <- readFile "debian/changelog"
+	changelog <- readFile "CHANGELOG"
 	let verline = takeWhile (/= '\n') changelog
 	return $ middle (words verline !! 1)
   where
diff --git a/Build/make-sdist.sh b/Build/make-sdist.sh
deleted file mode 100755
index 6e1ddae62..000000000
--- a/Build/make-sdist.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# Workaround for `cabal sdist` requiring all included files to be listed
-# in .cabal.
-
-# Create target directory
-sdist_dir=git-annex-$(grep '^Version:' git-annex.cabal | sed -re 's/Version: *//')
-mkdir --parents dist/$sdist_dir
-
-find . \( -name .git -or -name dist -or -name cabal-dev \) -prune \
-	-or -not -name \\*.orig -not -type d -print \
-	| perl -ne "print unless length >= 100 - length q{$sdist_dir}" \
-	| grep -v ':' \
-	| xargs cp --parents --target-directory dist/$sdist_dir
-
-cd dist
-tar --format=ustar -caf $sdist_dir.tar.gz $sdist_dir
-
-# Check that tarball can be unpacked by cabal.
-# It's picky about tar longlinks etc.
-rm -rf $sdist_dir
-cabal unpack $sdist_dir.tar.gz
-- 
cgit v1.2.3