From 367e30cca0d18713c50155ef26bc323d874624cd Mon Sep 17 00:00:00 2001 From: "http://grossmeier.net/" Date: Wed, 8 May 2013 17:38:05 +0000 Subject: Added a comment: All PPAs are outdated --- .../comment_4_3a8bbd0a7450a7f5323cd13144824aea._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Ubuntu_PPA/comment_4_3a8bbd0a7450a7f5323cd13144824aea._comment diff --git a/doc/forum/Ubuntu_PPA/comment_4_3a8bbd0a7450a7f5323cd13144824aea._comment b/doc/forum/Ubuntu_PPA/comment_4_3a8bbd0a7450a7f5323cd13144824aea._comment new file mode 100644 index 000000000..335cc57ba --- /dev/null +++ b/doc/forum/Ubuntu_PPA/comment_4_3a8bbd0a7450a7f5323cd13144824aea._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://grossmeier.net/" + nickname="greg" + subject="All PPAs are outdated" + date="2013-05-08T17:38:04Z" + content=""" +My work preinstalled Ubuntu machine is now on Raring, and even there the version of git-annex is only 3.20121112ubuntu3; too old to have the webapp option enabled :/ The two PPAs mentioned here aren't configured to build for Raring, so even though the one from François has a build from May 1st (7 days ago), it doesn't help me ;) + +François: mind updating your PPA to support Raring? Thanks much if you do! + +Either that, or I'll take the time some day to do a proper install on this machine (read: Debian). ;-) +"""]] -- cgit v1.2.3 From d7a6c94db9690772f9a2cbfcd6993819b4939d04 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 May 2013 14:01:47 -0400 Subject: fix unix-time build to include cbits, and fix cbits to build --- .../unix-time_0.1.4_0001-hacks-for-android.patch | 33 +++++++++++++--------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/standalone/android/haskell-patches/unix-time_0.1.4_0001-hacks-for-android.patch b/standalone/android/haskell-patches/unix-time_0.1.4_0001-hacks-for-android.patch index 31de6a862..cff7e76e3 100644 --- a/standalone/android/haskell-patches/unix-time_0.1.4_0001-hacks-for-android.patch +++ b/standalone/android/haskell-patches/unix-time_0.1.4_0001-hacks-for-android.patch @@ -1,18 +1,24 @@ -From 4e484f4eba21da64f94604e68391bf2e211ed8d6 Mon Sep 17 00:00:00 2001 +From 4023b952871ad2bc248db887716d06932ac0dbb9 Mon Sep 17 00:00:00 2001 From: Joey Hess -Date: Tue, 7 May 2013 16:08:28 -0400 +Date: Wed, 8 May 2013 14:00:19 -0400 Subject: [PATCH] hacks for android --- - cbits/conv.c | 2 +- - unix-time.cabal | 29 ++--------------------------- - 2 files changed, 3 insertions(+), 28 deletions(-) + cbits/conv.c | 4 +--- + unix-time.cabal | 28 ++-------------------------- + 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/cbits/conv.c b/cbits/conv.c -index 3b6a129..895e6b7 100644 +index 3b6a129..5a68f91 100644 --- a/cbits/conv.c +++ b/cbits/conv.c -@@ -51,7 +51,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) { +@@ -1,5 +1,3 @@ +-#include "config.h" +- + #if IS_LINUX + /* Linux cheats AC_CHECK_FUNCS(strptime_l), sigh. */ + #define THREAD_SAFE 0 +@@ -51,7 +49,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) { #else strptime(src, fmt, &dst); #endif @@ -22,7 +28,7 @@ index 3b6a129..895e6b7 100644 void c_format_unix_time(char *fmt, time_t src, char* dst, int siz) { diff --git a/unix-time.cabal b/unix-time.cabal -index a905d63..cb69ce5 100644 +index a905d63..f32d952 100644 --- a/unix-time.cabal +++ b/unix-time.cabal @@ -8,7 +8,7 @@ Synopsis: Unix time parser/formatter and utilities @@ -34,15 +40,15 @@ index a905d63..cb69ce5 100644 Extra-Source-Files: cbits/conv.c cbits/config.h.in configure configure.ac Extra-Tmp-Files: config.log config.status autom4te.cache cbits/config.h -@@ -21,33 +21,8 @@ Library +@@ -21,34 +21,10 @@ Library Data.UnixTime.Types Data.UnixTime.Sys Build-Depends: base >= 4 && < 5 - , bytestring + , bytestring (>= 0.10.3.0) , old-time -- C-Sources: cbits/conv.c -- + C-Sources: cbits/conv.c + -Test-Suite doctests - Type: exitcode-stdio-1.0 - HS-Source-Dirs: test @@ -66,9 +72,10 @@ index a905d63..cb69ce5 100644 - , QuickCheck - , time - , unix-time - +- Source-Repository head Type: git + Location: https://github.com/kazu-yamamoto/unix-time -- -1.8.2.rc3 +1.7.10.4 -- cgit v1.2.3 From 1f4765571cf8130a9836326f2afc0ecfe354fb5f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 May 2013 16:48:29 -0400 Subject: more fixes --- standalone/android/install-haskell-packages | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index 370cb0c32..63f7dd368 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -63,7 +63,7 @@ install_pkgs () { mkdir tmp cd tmp - onlycross unpatched bytestring-0.10.3.0 text-0.11.2.3 parsec-3.1.3 + onlycross unpatched bytestring-0.10.3.0 text-0.11.3.1 parsec-3.1.3 patched network 2.4.1.0 unpatched cereal-0.3.5.2 patched socks 0.4.2 @@ -121,7 +121,7 @@ install_pkgs () { patched file-embed 0.0.4.7 patched gsasl 0.3.5 \ --ghc-options=-I$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/include/ \ - --ld-options="-L $HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/lib/" + --ld-options="-L$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/lib/" onlycross patched network-protocol-xmpp 0.4.4 onlynative network-protocol-xmpp patched shakespeare-css 1.0.2 @@ -164,7 +164,7 @@ if [ "$1" = native ]; then fi install_pkgs else - native=0 + native= PATH=$HOME/.ghc/android-14/arm-linux-androideabi-4.7/bin:$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin:$PATH if [ ! -e $HOME/.ghc/android-14/arm-linux-androideabi-4.7/cabal/packages/hackage.haskell.org ]; then cabal update -- cgit v1.2.3