summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-12 17:23:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-12 17:23:39 -0400
commit6ca8426717af44744d184f4e605e965e840dd16f (patch)
treee5c6fb46030af822b8bdee86495756626d1eb1ff
parentd03bfb7355d11e271664d4dea51449f8f5059780 (diff)
parentf9b910f07d94557d6e656d37504eeb00e20613d9 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/assistant_ignore_.gitignore/comment_2_22f75af80c779dcb4d6033b90373f74e._comment10
-rw-r--r--doc/bugs/assistant_ignore_.gitignore/comment_3_8b2a400e1d44a1c9b183e2b7861efbe3._comment8
-rw-r--r--doc/install/Android/comment_5_40cb6cb72c4ad4aa19a4a40f41a6a757._comment13
-rw-r--r--doc/install/Android/comment_6_b0f723538e7328d5070c563f070858bd._comment8
-rw-r--r--doc/install/Android/comment_7_c6dc23d0e6f4138c4bf8e3452755676f._comment8
5 files changed, 18 insertions, 29 deletions
diff --git a/doc/bugs/assistant_ignore_.gitignore/comment_2_22f75af80c779dcb4d6033b90373f74e._comment b/doc/bugs/assistant_ignore_.gitignore/comment_2_22f75af80c779dcb4d6033b90373f74e._comment
new file mode 100644
index 000000000..893be9055
--- /dev/null
+++ b/doc/bugs/assistant_ignore_.gitignore/comment_2_22f75af80c779dcb4d6033b90373f74e._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao"
+ nickname="maurizio"
+ subject="git-annex from wheezy-backports should depend on a more recent git version on debian wheezy (7.2) "
+ date="2013-11-12T18:57:52Z"
+ content="""
+It is correct that the bug is solved on the git-annex package found on wheezy-backports, but this package does not force an update of git to a more recent version. Therefore the bug still affects wheezy users. The way to solve it is to install git also from wheezy-backports.
+
+
+"""]]
diff --git a/doc/bugs/assistant_ignore_.gitignore/comment_3_8b2a400e1d44a1c9b183e2b7861efbe3._comment b/doc/bugs/assistant_ignore_.gitignore/comment_3_8b2a400e1d44a1c9b183e2b7861efbe3._comment
new file mode 100644
index 000000000..e58d46084
--- /dev/null
+++ b/doc/bugs/assistant_ignore_.gitignore/comment_3_8b2a400e1d44a1c9b183e2b7861efbe3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.246"
+ subject="comment 3"
+ date="2013-11-12T19:10:48Z"
+ content="""
+Agreed, I've made the changes so the next update of the backport will do so.
+"""]]
diff --git a/doc/install/Android/comment_5_40cb6cb72c4ad4aa19a4a40f41a6a757._comment b/doc/install/Android/comment_5_40cb6cb72c4ad4aa19a4a40f41a6a757._comment
deleted file mode 100644
index 74c207306..000000000
--- a/doc/install/Android/comment_5_40cb6cb72c4ad4aa19a4a40f41a6a757._comment
+++ /dev/null
@@ -1,13 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnljkMF1zhScDfvJYMhXXubnar_DakLoas"
- nickname="Tony"
- subject="broken under 4.3?"
- date="2013-07-28T00:36:51Z"
- content="""
-Things seem broken under the recently released 4.3 release for nexus devices:
-
->Falling back to hardcoded app location; cannot find expected files in /data/app-lib
->u0_a33@mako:/sdcard/git-annex.home $ git annex webapp
->CANNOT LINK EXECUTABLE: git-annex invalid R_ARM_COPY relocation against DT_SYMBOLIC shared library libc.so (built. with -Bsymbolic?)
->1|u0_a33@mako:/sdcard/git-annex.home $
-"""]]
diff --git a/doc/install/Android/comment_6_b0f723538e7328d5070c563f070858bd._comment b/doc/install/Android/comment_6_b0f723538e7328d5070c563f070858bd._comment
deleted file mode 100644
index e6a7aa072..000000000
--- a/doc/install/Android/comment_6_b0f723538e7328d5070c563f070858bd._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="justjohn"
- ip="71.233.149.123"
- subject="Broken on 4.3 on Nexus 7"
- date="2013-07-28T16:14:18Z"
- content="""
-I'm seeing the same error as the previous comment from Tony on my Nexus 7 after I updated it to the stock (albeit rooted) 4.3 release from Google.
-"""]]
diff --git a/doc/install/Android/comment_7_c6dc23d0e6f4138c4bf8e3452755676f._comment b/doc/install/Android/comment_7_c6dc23d0e6f4138c4bf8e3452755676f._comment
deleted file mode 100644
index 61c1a916b..000000000
--- a/doc/install/Android/comment_7_c6dc23d0e6f4138c4bf8e3452755676f._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
- nickname="Richard"
- subject="comment 7"
- date="2013-07-30T15:02:51Z"
- content="""
-@Tony @justjohn: I created a proper bug for this: [[bugs/git-annex_broken_on_Android_4.3]]
-"""]]