aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-03 17:11:19 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-03 17:11:19 -0400
commit6bd265b6448fa00030b0491c35d8bc160b0ed644 (patch)
tree55dd9eb680695ce2aeb5621fd22dda25079a49cb
parentb30cf8d2587e7b6cdcb0db7848e05f83284f84f4 (diff)
git pull in distributionupdate
-rw-r--r--Makefile1
-rw-r--r--doc/bugs/info_file_contains_wrong_version.mdwn1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c1972d7cf..facacfe2e 100644
--- a/Makefile
+++ b/Makefile
@@ -247,6 +247,7 @@ hdevtools:
hdevtools check git-annex.hs -g -cpp -g -i -g -idist/build/git-annex/git-annex-tmp -g -i. -g -idist/build/autogen -g -Idist/build/autogen -g -Idist/build/git-annex/git-annex-tmp -g -IUtility -g -DWITH_TESTSUITE -g -DWITH_S3 -g -DWITH_ASSISTANT -g -DWITH_INOTIFY -g -DWITH_DBUS -g -DWITH_PAIRING -g -DWITH_XMPP -g -optP-include -g -optPdist/build/autogen/cabal_macros.h -g -odir -g dist/build/git-annex/git-annex-tmp -g -hidir -g dist/build/git-annex/git-annex-tmp -g -stubdir -g dist/build/git-annex/git-annex-tmp -g -threaded -g -Wall -g -XHaskell98 -g -XPackageImports
distributionupdate:
+ git pull
ghc --make Build/DistributionUpdate
./Build/DistributionUpdate
diff --git a/doc/bugs/info_file_contains_wrong_version.mdwn b/doc/bugs/info_file_contains_wrong_version.mdwn
index ab59f431a..629fd6399 100644
--- a/doc/bugs/info_file_contains_wrong_version.mdwn
+++ b/doc/bugs/info_file_contains_wrong_version.mdwn
@@ -17,3 +17,4 @@ The script producing the .info file along with the binary tarball seems to gener
This may look anecdotical, but at least the `git-annex-bin` package of Arch Linux uses the .info data to retrieve the version information.
+> [[fixed|done]] --[[Joey]]