diff options
10 files changed, 54 insertions, 2 deletions
diff --git a/Assistant/Install/AutoStart.hs b/Assistant/Install/AutoStart.hs index 7e0c7507b..7e1fd2d1f 100644 --- a/Assistant/Install/AutoStart.hs +++ b/Assistant/Install/AutoStart.hs @@ -12,8 +12,8 @@ module Assistant.Install.AutoStart where import Utility.FreeDesktop #ifdef darwin_HOST_OS import Utility.OSX -import Utility.Path import System.Directory +import System.FilePath #endif installAutoStart :: FilePath -> FilePath -> IO () diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs index d7fb373c8..411121568 100644 --- a/Build/DistributionUpdate.hs +++ b/Build/DistributionUpdate.hs @@ -32,7 +32,7 @@ signingKey = "89C809CB" autobuilds :: [(URLString, FilePath)] autobuilds = (map linuxarch ["i386", "amd64", "armel"]) ++ - (map androidversion ["4.0", "4.3"]) ++ + (map androidversion ["4.0", "4.3", "5.0"]) ++ [ (autobuild "x86_64-apple-yosemite/git-annex.dmg", "git-annex/OSX/current/10.10_Yosemite/git-annex.dmg") , (autobuild "windows/git-annex-installer.exe", "git-annex/windows/current/git-annex-installer.exe") ] diff --git a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn index 2aa4ae2ca..57a8b9756 100644 --- a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn +++ b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn @@ -16,3 +16,5 @@ Currently nightly on Android 5.0 (Nexus 5) # End of transcript or log. """]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_13_bec0fb96b4b26382c20511a3c9ed537c._comment b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_13_bec0fb96b4b26382c20511a3c9ed537c._comment new file mode 100644 index 000000000..878a6b376 --- /dev/null +++ b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_13_bec0fb96b4b26382c20511a3c9ed537c._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="etset" + subject="Seems to be fixed" + date="2015-01-07T22:14:57Z" + content=""" +I didn't have an opportunity to do a sync with it yet, but the main problem seems to be gone with this last build: it now successfully opens and shows the assistant web interface. Thanks a lot! :D +"""]] diff --git a/doc/devblog/day_245__yak_shaving.mdwn b/doc/devblog/day_245__yak_shaving.mdwn new file mode 100644 index 000000000..0e1a7dbaf --- /dev/null +++ b/doc/devblog/day_245__yak_shaving.mdwn @@ -0,0 +1,9 @@ +Worked more on the `relativepaths` branch last night, and I am actually +fairly happy with it now, and plan to merge it after I've run it for a bit +longer myself. + +It seems that I did manage to get a git-annex executable that is built PIE +so it will work on Android 5.0. But all the C programs like busybox +included in the Android app also have to be built that way. Arranging for +everything to get built twice and with the right options took up most of +today. diff --git a/doc/forum/is_there_a_way_to_automatically_retry_when_special_remotes_fail__63__/comment_2_160e80583b647eae53aa120ca734e34a._comment b/doc/forum/is_there_a_way_to_automatically_retry_when_special_remotes_fail__63__/comment_2_160e80583b647eae53aa120ca734e34a._comment new file mode 100644 index 000000000..cb2188efd --- /dev/null +++ b/doc/forum/is_there_a_way_to_automatically_retry_when_special_remotes_fail__63__/comment_2_160e80583b647eae53aa120ca734e34a._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="http://digiuser.livejournal.com/" + subject="Is there a way to make this upload all files that have not been uploaded yet?" + date="2015-01-08T02:37:51Z" + content=""" +Let's say I want my S3 repo to have all files in it that are in my current repo. Is there a variation of this while loop that will keep uploading until it's done? + +I recognize I could use annex assistant but let's say I just want to do it this way. +"""]] diff --git a/doc/forum/is_there_a_way_to_automatically_retry_when_special_remotes_fail__63__/comment_3_6d81a41edf052e310e1f80cc6add3c09._comment b/doc/forum/is_there_a_way_to_automatically_retry_when_special_remotes_fail__63__/comment_3_6d81a41edf052e310e1f80cc6add3c09._comment new file mode 100644 index 000000000..05e0cd3e3 --- /dev/null +++ b/doc/forum/is_there_a_way_to_automatically_retry_when_special_remotes_fail__63__/comment_3_6d81a41edf052e310e1f80cc6add3c09._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + subject="comment 3" + date="2015-01-08T18:13:47Z" + content=""" +That's what the while loop above does; runs the git-annex command, and retries it until it succeeds. +"""]] diff --git a/doc/install/Android.mdwn b/doc/install/Android.mdwn index 036d19bab..62ecfb638 100644 --- a/doc/install/Android.mdwn +++ b/doc/install/Android.mdwn @@ -10,6 +10,7 @@ of the app. Go to Setup -> Security, and enable "Unknown Sources". Then download the git-annex.apk for your version of Android, and open it to install. +* [Android 5.0 git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/5.0/git-annex.apk) * [Android 4.4 and 4.3 git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/4.3/git-annex.apk) * [Android 4.0 to 4.2 git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/4.0/git-annex.apk) diff --git a/doc/tips/owncloudannex/comment_8_6579203d726f4a39db02fcdda156e12c._comment b/doc/tips/owncloudannex/comment_8_6579203d726f4a39db02fcdda156e12c._comment new file mode 100644 index 000000000..c0295be03 --- /dev/null +++ b/doc/tips/owncloudannex/comment_8_6579203d726f4a39db02fcdda156e12c._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawn97aJ3CN48pBix54RDHRhqtBzeklNEbSA" + nickname="Manuel" + subject="advantage of owncloudannex over webdav remote?" + date="2015-01-08T18:00:48Z" + content=""" +It seems that owncloud can also be accessed using the webdav remote. Does owncloudannex offer any features which aren't implemented in the webdav remote? +"""]] diff --git a/doc/tips/using_Amazon_S3/comment_10_43f3f12a83e3ace1674eae395b865409._comment b/doc/tips/using_Amazon_S3/comment_10_43f3f12a83e3ace1674eae395b865409._comment new file mode 100644 index 000000000..fa306212f --- /dev/null +++ b/doc/tips/using_Amazon_S3/comment_10_43f3f12a83e3ace1674eae395b865409._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkPIqJZ88VZEVqLhLOd1LMdYXcy6bAW9qE" + nickname="Lemao" + subject="comment 10" + date="2015-01-07T23:53:32Z" + content=""" +My bad. I didn't realize git annex creates a new branch. After I pushed it, the clone was able to enableremote and I was able to get the file. + +"""]] |