diff options
author | 2012-08-27 14:27:43 -0400 | |
---|---|---|
committer | 2012-08-27 14:27:43 -0400 | |
commit | 4f0411cd3b76bc33cddbfecba825e86751cae3ac (patch) | |
tree | 6276f81691ac657024b7e182510501fe84f074aa | |
parent | 7c816e78d8de8219600dd06c3c8472dca768f96e (diff) | |
parent | ddf4e48854a26906c9c1182fd9b3e40c1bfaa081 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
9 files changed, 106 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 2a3ecc604..f91887b0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -git-annex (3.20120808) UNRELEASED; urgency=low +git-annex (3.20120825) unstable; urgency=low * S3: Add fileprefix setting. * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt. * Bugfix: Fix fsck in SHA*E backends, when the key contains composite extensions, as added in 3.20120721. - -- Joey Hess <joeyh@debian.org> Thu, 09 Aug 2012 13:51:47 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 25 Aug 2012 10:00:10 -0400 git-annex (3.20120807) unstable; urgency=low diff --git a/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t/comment_1_cafb58eca97a0a66110ac39b169d8de3._comment b/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t/comment_1_cafb58eca97a0a66110ac39b169d8de3._comment new file mode 100644 index 000000000..9f63dbfa9 --- /dev/null +++ b/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t/comment_1_cafb58eca97a0a66110ac39b169d8de3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawla3gLc6_rHuggFfy7o7eGMPvPztFZTrUQ" + nickname="Florian" + subject="comment 1" + date="2012-08-27T08:59:23Z" + content=""" +Works! +"""]] diff --git a/doc/forum/DBus_on_Ubuntu_12.04__63__.mdwn b/doc/forum/DBus_on_Ubuntu_12.04__63__.mdwn new file mode 100644 index 000000000..b4271d172 --- /dev/null +++ b/doc/forum/DBus_on_Ubuntu_12.04__63__.mdwn @@ -0,0 +1,3 @@ +I tried to compile the assitant branch on Ubuntu 12.04. But i depends on the DBus libraryw hich does not compile with some glibberish errors. Is there a way to solve this? + + diff --git a/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_1_dc14a40b64b7eda94d1a3fd766cd39cc._comment b/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_1_dc14a40b64b7eda94d1a3fd766cd39cc._comment new file mode 100644 index 000000000..0ef2469d3 --- /dev/null +++ b/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_1_dc14a40b64b7eda94d1a3fd766cd39cc._comment @@ -0,0 +1,28 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.246.119" + subject="comment 1" + date="2012-08-25T13:06:31Z" + content=""" +Hmm, let's see... + +If the gibberish error is ouyay orgotfay otay otay elltay emay utwhay ethay +roreay asway, then we can figure it out, surely.. + +If the gibberish error looks something like Ḩ̶̞̗̓ͯ̅͒ͪͫe̢ͦ̊ͭͭͤͣ̂͏̢̳̦͔̬ͅ ̣̘̹̄̕͢Ç̛͈͔̹̮̗͈͓̞ͨ͂͑ͅo̿ͥͮ̿͢͏̧̹̗̪͇̫m̷̢̞̙͑̊̔ͧ̍ͩ̇̚ę̜͑̀͝s̖̱̝̩̞̻͐͂̐́̂̇̆͂ + +.. your use of cabal +has accidentually summoned Cthulu! Back slowly away from the monitor! + +Otherwise, you might try installing the `libdbus-1-dev` package with apt, +which might make cabal install the haskell dbus bindings successfully. Or +you could just install the `libghc-dbus-dev` package, which contains the +necessary haskell library pre-built. But I don't know if it's in Ubuntu +12.04; it only seems to be available in quantal +<http://packages.ubuntu.com/search?keywords=libghc-dbus-dev> + +Or you could even build it with the Makefile, rather than using cabal. +The Makefile has a `-DWITH_DBUS` setting in it that can be removed to build +the fallback mode that doesn't use dbus. + +"""]] diff --git a/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_2_608a30e274e6a691a39f69503720e320._comment b/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_2_608a30e274e6a691a39f69503720e320._comment new file mode 100644 index 000000000..02bda9eaa --- /dev/null +++ b/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_2_608a30e274e6a691a39f69503720e320._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.246.119" + subject="comment 2" + date="2012-08-25T13:11:37Z" + content=""" +I fnordgot to mention, cabal can be configured to not build with dbus too. The relevant incantation is: + +cabal install git-annex --flags=\"-Dbus\" +"""]] diff --git a/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_3_791b9978b410c1aff7fd8ef05c38f5f9._comment b/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_3_791b9978b410c1aff7fd8ef05c38f5f9._comment new file mode 100644 index 000000000..84c7edf09 --- /dev/null +++ b/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_3_791b9978b410c1aff7fd8ef05c38f5f9._comment @@ -0,0 +1,40 @@ +[[!comment format=Makefile + username="https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE" + nickname="Michael" + subject="Shame on me..." + date="2012-08-25T15:43:19Z" + content=""" +The build error is: + +$ cabal install DBus +Resolving dependencies... +Configuring DBus-0.4... +checking for pkg-config... /usr/bin/pkg-config +checking pkg-config is at least version 0.9.0... yes +checking for DBUS... yes +configure: creating ./config.status +config.status: creating DBus.buildinfo +Building DBus-0.4... +Preprocessing library DBus-0.4... + +DBus/Message.hsc:1:14: + Warning: -XPatternSignatures is deprecated: use -XScopedTypeVariables or pragma {-# LANGUAGE ScopedTypeVariables #-} instead + +DBus/Message.hsc:2:12: + Warning: -fglasgow-exts is deprecated: Use individual extensions instead +[1 of 5] Compiling DBus.Shared ( dist/build/DBus/Shared.hs, dist/build/DBus/Shared.o ) +[2 of 5] Compiling DBus ( dist/build/DBus.hs, dist/build/DBus.o ) + +DBus.hsc:26:49: + Warning: In the use of `mkTyCon' + (imported from Data.Typeable): + Deprecated: \"either derive Typeable, or use mkTyCon3 instead\" +[3 of 5] Compiling DBus.Internal ( dist/build/DBus/Internal.hs, dist/build/DBus/Internal.o ) + +DBus/Internal.hsc:12:27: + Module `Control.Exception' does not export `throwDyn' +cabal: Error: some packages failed to install: +DBus-0.4 failed during the building phase. The exception was: +ExitFailure 1 + +"""]] diff --git a/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_4_8665c95299916138c4af375626d9ec7d._comment b/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_4_8665c95299916138c4af375626d9ec7d._comment new file mode 100644 index 000000000..abd154a6b --- /dev/null +++ b/doc/forum/DBus_on_Ubuntu_12.04__63__/comment_4_8665c95299916138c4af375626d9ec7d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.246.119" + subject="in the language of the ancients, small details matter" + date="2012-08-25T15:50:47Z" + content=""" +It seems that to cabal, \"DBus\" and \"dbus\" are different packages, and it seems you should install the latter, which has a current version of 0.10 which works and not some old 0.4 version. +"""]] diff --git a/doc/news/version_3.20120825.mdwn b/doc/news/version_3.20120825.mdwn new file mode 100644 index 000000000..8cc45e1b1 --- /dev/null +++ b/doc/news/version_3.20120825.mdwn @@ -0,0 +1,6 @@ +git-annex 3.20120825 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * S3: Add fileprefix setting. + * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt. + * Bugfix: Fix fsck in SHA*E backends, when the key contains composite + extensions, as added in 3.20120721."""]]
\ No newline at end of file diff --git a/git-annex.cabal b/git-annex.cabal index 8ab775939..ab3dd4fae 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120807 +Version: 3.20120825 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> |