diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-22 22:47:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-22 22:47:20 -0400 |
| commit | 660b0321e453a5ac994a9abc581be1136d6a9ad5 (patch) | |
| tree | dfcbd5926b9fee88cd6599cb3ac49dcfcd577121 | |
| parent | ee0d60ee055f57cfa352d3c83b0027a1a68482b8 (diff) | |
pin term
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | standalone/android/Makefile | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8c28323f8..2e0e3cf80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ git-annex (4.20130921) UNRELEASED; urgency=low * Use cryptohash rather than SHA for hashing when no external hash program is available. This is a significant speedup for SHA256 on OSX, for example. + * Android build redone from scratch, many dependencies updated, + and entire build can now be done using provided scripts. -- Joey Hess <joeyh@debian.org> Sun, 22 Sep 2013 19:42:29 -0400 diff --git a/standalone/android/Makefile b/standalone/android/Makefile index bf1802ca6..494b052c0 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -121,7 +121,8 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg/build-stamp: touch $@ $(GIT_ANNEX_ANDROID_SOURCETREE)/term/build-stamp: term.patch icons - cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && git reset --hard + # This is a known-good version that the patch works with. + cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && git reset --hard 3d34b3c42295c215b62e70f3ee696dd664ba08ce cat term.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && patch -p1) (cd icons && tar c .) | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term/res && tar x) # This renaming has a purpose. It makes the path to the app's |