summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--debian/changelog5
-rw-r--r--debian/control4
-rw-r--r--git-annex.cabal2
4 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 93d4567ec..c7e5e5e12 100644
--- a/Makefile
+++ b/Makefile
@@ -100,4 +100,8 @@ sdist: clean
@cabal sdist
@mv git-annex.cabal.orig git-annex.cabal
+# Upload to hackage.
+hackage: sdist
+ @cabal upload dist/*.tar.gz
+
.PHONY: $(bins) test install
diff --git a/debian/changelog b/debian/changelog
index f626dc315..d3c8f9a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-git-annex (3.20120107) UNRELEASED; urgency=low
+git-annex (3.20120113) unstable; urgency=low
* log: Add --gource mode, which generates output usable by gource.
* map: Fix display of remote repos
* Add annex-trustlevel configuration settings, which can be used to
override the trust level of a remote.
* git-annex, git-union-merge: Support GIT_DIR and GIT_WORK_TREE.
+ * Add libghc-testpack-dev to build depends on all arches.
- -- Joey Hess <joeyh@debian.org> Sat, 07 Jan 2012 18:12:09 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 13 Jan 2012 15:35:17 -0400
git-annex (3.20120106) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6a312c6b1..c292d8295 100644
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,11 @@ Build-Depends:
libghc-http-dev,
libghc-utf8-string-dev,
libghc-hs3-dev (>= 0.5.6),
- libghc-testpack-dev [any-i386 any-amd64],
+ libghc-testpack-dev,
+ libghc-quickcheck2-dev,
libghc-monad-control-dev (>= 0.3),
libghc-lifted-base-dev,
libghc-json-dev,
- libghc-quickcheck2-dev,
ikiwiki,
perlmagick,
git,
diff --git a/git-annex.cabal b/git-annex.cabal
index b0b6d76f9..4aee161b6 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 3.20120106
+Version: 3.20120113
Cabal-Version: >= 1.6
License: GPL
Maintainer: Joey Hess <joey@kitenet.net>