summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-06-14 11:18:50 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-06-14 11:19:32 +0200
commit33588dfec197d4e6170085a27ce1e56a3c04c6fa (patch)
tree0fa27e071a667f78b204f41fc20c2abed111a4ed
parent904288c1e92f9ed707dce9c73f6c807b1af04023 (diff)
downloadptxdist-33588dfec197d4e6170085a27ce1e56a3c04c6fa.tar.gz
ptxdist-33588dfec197d4e6170085a27ce1e56a3c04c6fa.tar.xz
arora: version bump 0.10.2 -> 0.11.0HEADmaster
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/arora-0.10.2/add-missing-include.diff25
-rw-r--r--patches/arora-0.10.2/series1
-rw-r--r--rules/arora.make4
3 files changed, 2 insertions, 28 deletions
diff --git a/patches/arora-0.10.2/add-missing-include.diff b/patches/arora-0.10.2/add-missing-include.diff
deleted file mode 100644
index c3e4e6272..000000000
--- a/patches/arora-0.10.2/add-missing-include.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: add missing include
-
-QHash is not defined otherwise.
-
-20091014 mol: this patch is already upstream (but not in 0.10 branch).
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- src/network/networkaccessmanager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: b/src/network/networkaccessmanager.h
-===================================================================
---- a/src/network/networkaccessmanager.h
-+++ b/src/network/networkaccessmanager.h
-@@ -65,6 +65,7 @@
-
- #include <qnetworkaccessmanager.h>
- #include <qsslconfiguration.h>
-+#include <qhash.h>
- #include "networkaccessmanagerproxy.h"
-
- class SchemeAccessHandler;
diff --git a/patches/arora-0.10.2/series b/patches/arora-0.10.2/series
deleted file mode 100644
index e7b0e4083..000000000
--- a/patches/arora-0.10.2/series
+++ /dev/null
@@ -1 +0,0 @@
-add-missing-include.diff
diff --git a/rules/arora.make b/rules/arora.make
index bb885d56c..e3b635c1a 100644
--- a/rules/arora.make
+++ b/rules/arora.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_ARORA) += arora
#
# Paths and names
#
-ARORA_VERSION := 0.10.2
-ARORA_MD5 := ccef0f214e0f03828cde8c521f7a5225
+ARORA_VERSION := 0.11.0
+ARORA_MD5 := 64334ce4198861471cad9316d841f0cb
ARORA := arora-$(ARORA_VERSION)
ARORA_SUFFIX := tar.gz
ARORA_URL := http://arora.googlecode.com/files/$(ARORA).$(ARORA_SUFFIX)