mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2012-08-27 14:27:43 -04:00
commit 4f0411cd3b
9 changed files with 106 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -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

8
doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t/comment_1_cafb58eca97a0a66110ac39b169d8de3._comment Normal file
View file

@ -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!
"""]]

3
doc/forum/DBus_on_Ubuntu_12.04__63__.mdwn Normal file
View file

@ -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?

28
doc/forum/DBus_on_Ubuntu_12.04__63__/comment_1_dc14a40b64b7eda94d1a3fd766cd39cc._comment Normal file
View file

@ -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.
"""]]

10
doc/forum/DBus_on_Ubuntu_12.04__63__/comment_2_608a30e274e6a691a39f69503720e320._comment Normal file
View file

@ -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\"
"""]]

40
doc/forum/DBus_on_Ubuntu_12.04__63__/comment_3_791b9978b410c1aff7fd8ef05c38f5f9._comment Normal file
View file

@ -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
"""]]

8
doc/forum/DBus_on_Ubuntu_12.04__63__/comment_4_8665c95299916138c4af375626d9ec7d._comment Normal file
View file

@ -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.
"""]]

6
doc/news/version_3.20120825.mdwn Normal file
View file

@ -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."""]]

2
git-annex.cabal
View file

@ -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>