summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--package/libroxml/Config.in2
-rw-r--r--package/libroxml/libroxml-2.0.3-fix-install.patch25
-rw-r--r--package/libroxml/libroxml.mk2
4 files changed, 3 insertions, 27 deletions
diff --git a/CHANGES b/CHANGES
index cf01121ef..46dc4881d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,7 @@
#3907: 2011.05 - Qt 4.7.3 not building on ARM
#3961: Nfs-utils: Remove SUSv3-function index
#3985: "help" target's defconfig list needs sort
+ #3997: bump libroxml to v2.1.0
2011.05, Released May 27th, 2011:
diff --git a/package/libroxml/Config.in b/package/libroxml/Config.in
index e26d239f8..b6b253fcd 100644
--- a/package/libroxml/Config.in
+++ b/package/libroxml/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBROXML
xpath handling. Roxml is a binary using libroxml to explore
xml file from shell scripts.
- http://libroxml.googlecode.com
+ http://www.libroxml.net
diff --git a/package/libroxml/libroxml-2.0.3-fix-install.patch b/package/libroxml/libroxml-2.0.3-fix-install.patch
deleted file mode 100644
index fe3cfad8f..000000000
--- a/package/libroxml/libroxml-2.0.3-fix-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH] fix make install if doxygen isn't available
-
-If doxygen isn't available, then man pages / html docs won't get created,
-so don't try to install them.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: libroxml-2.0.3/Makefile
-===================================================================
---- libroxml-2.0.3.orig/Makefile
-+++ libroxml-2.0.3/Makefile
-@@ -153,8 +153,8 @@
- $E install -D $(INC) $(DESTDIR)/usr/include
- $E install -D LGPL.txt $(DESTDIR)/usr/share/doc/libroxml/
- $E install -D docs/roxml.1 $(DESTDIR)/usr/share/man/man1/
-- $E install -D docs/man/man3/* $(DESTDIR)/usr/share/man/man3/
-- $E install -D docs/html/* $(DESTDIR)/usr/share/doc/libroxml/html/
-+ $E [ ! -d docs/man/man3 ] || install -D docs/man/man3/* $(DESTDIR)/usr/share/man/man3/
-+ $E [ ! -d docs/html ] || install -D docs/html/* $(DESTDIR)/usr/share/doc/libroxml/html/
- $E install -m644 libroxml.pc $(DESTDIR)/usr/lib/pkgconfig
- $E cp -d $(TARGET_LN) $(DESTDIR)/usr/lib
-
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index bf067dfd7..88d3e664d 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -2,7 +2,7 @@
# libroxml
#
-LIBROXML_VERSION = 2.0.3
+LIBROXML_VERSION = 2.1.0
LIBROXML_SITE = http://libroxml.googlecode.com/files
LIBROXML_INSTALL_STAGING = YES