# HG changeset patch
# User Xerxes R?nby <xerxes@zafena.se>
# Date 1243603719 -7200
# Node ID 9a8c3c90bdb29a3d336a1f7f2da94824f99eec7a
# Parent  b65dc786ec658dd35860140e79305ac1a41adccb
2009-05-29  Xerxes R?nby  <xerxes@zafena.se>

        * Makefile.am (CACAO_SRC_ZIP): changed to download the .tar.bz2
        file that matches the CACAO_MD5SUM.
        (stamps/extract-cacao.stamp): explicit unpack .tar.bz2 using tar xjf.

diff -r b65dc786ec65 -r 9a8c3c90bdb2 ChangeLog
--- a/ChangeLog	Fri May 29 10:09:16 2009 +0200
+++ b/ChangeLog	Fri May 29 15:28:39 2009 +0200
@@ -1,3 +1,9 @@
+2009-05-29  Xerxes Rånby  <xerxes@zafena.se>
+
+	* Makefile.am (CACAO_SRC_ZIP): changed to download the .tar.bz2
+	file that matches the CACAO_MD5SUM.
+	(stamps/extract-cacao.stamp): explicit unpack .tar.bz2 using tar xjf.
+
 2009-05-29  Matthias Klose  <doko@ubuntu.com>
 
 	* patches/icedtea-fonts.patch: Update fontconfig for Ubuntu.
diff -r b65dc786ec65 -r 9a8c3c90bdb2 Makefile.am
--- a/Makefile.am	Fri May 29 10:09:16 2009 +0200
+++ b/Makefile.am	Fri May 29 15:28:39 2009 +0200
@@ -1769,7 +1769,7 @@
 if USE_ALT_CACAO_SRC_ZIP
   CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
 else
-  CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
+  CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
 endif
 
 stamps/download.stamp: stamps/hgforest.stamp
@@ -2236,7 +2236,7 @@
 	if ! test -d cacao ; \
 	then \
 	  mkdir cacao ; \
-	  $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \
+	  $(TAR) xjf $(CACAO_SRC_ZIP) -C cacao ; \
 	  dir=$$(basename cacao/cacao-*) ; \
 	  ln -s $$dir cacao/cacao ; \
 	  cd cacao/cacao ; \