[ooo-build-commit] .: bin/unpack configure.in

[Tor Lillqvist]

 bin/unpack   |   12 ++++--------
 configure.in |    5 +++--
 2 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 87db259f9ded5e1918bf110491428507552f8793
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 7 13:48:36 2010 +0300

    Update DejaVu version to match that expected by LO makefilery
    
    Also, no need to move the DeejaVu zip anywhere, fetch_tarballs.sh
    downloads it to the TARFILE_LOCATION from which the makefilery in
    more_fonts will grab it.
    
    If using a non-standard DejaVu version, edit the correct
    makefile.mk. No bitstream_vera_fonts folder any more.

diff --git a/bin/unpack b/bin/unpack
index 61cdb61..095948c 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -817,17 +817,13 @@ if test "x$OPENCLIPART_VER" != "x"; then
 fi
 
 if test "x$DEJAVU_FONTS_VER" != "x"; then
-    DEJAVU_FONTSDEST=$OOBUILDDIR/bitstream_vera_fonts/download/
-    echo "Updating DejaVu fonts zip archive to version $DEJAVU_FONTS_VER"
-    $GNUCP -f $SRCDIR/$DEJAVU_FONTS_PACK_NAME.zip $DEJAVU_FONTSDEST || exit 1;
-    echo "done"
     echo "Correcting the package names of DejaVu font packages to $DEJAVU_FONTS_PACK_NAME"
-    sed -e "s|TARFILE_NAME=.*$|TARFILE_NAME=$DEJAVU_FONTS_PACK_NAME|" -e "s|TARFILE_ROOTDIR=.*$|TARFILE_ROOTDIR=$DEJAVU_FONTS_PACK_NAME|" $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk >  $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk.ver
-    mv $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk.ver $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
+    sed -e "s|TARFILE_NAME=.*$|TARFILE_NAME=$DEJAVU_FONTS_PACK_NAME|" -e "s|TARFILE_ROOTDIR=.*$|TARFILE_ROOTDIR=$DEJAVU_FONTS_PACK_NAME|" $OOBUILDDIR/more_fonts/fonts/ttf_dejavu/makefile.mk >  $OOBUILDDIR/more_fonts/fonts/ttf_dejavu/makefile.mk.ver
+    mv $OOBUILDDIR/more_fonts/fonts/ttf_dejavu/makefile.mk.ver $OOBUILDDIR/more_fonts/fonts/ttf_dejavu/makefile.mk
     echo "done"
     echo "Correcting the delivery file of DejaVu Font packages"
-    sed -e "s|dejavu-fonts-ttf-.*|$DEJAVU_FONTS_PACK_NAME|"  $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst > $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst.ver
-    mv $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst.ver $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst
+    sed -e "s|dejavu-fonts-ttf-.*|$DEJAVU_FONTS_PACK_NAME|"  $OOBUILDDIR/more_fonts/prj/d.lst > $OOBUILDDIR/more_fonts/prj/d.lst.ver
+    mv $OOBUILDDIR/more_fonts/prj/d.lst.ver $OOBUILDDIR/more_fonts/prj/d.lst
     echo "done"
 
 fi
diff --git a/configure.in b/configure.in
index 43cf1c7..a68e5bf 100644
--- a/configure.in
+++ b/configure.in
@@ -8,9 +8,10 @@ AC_PREFIX_DEFAULT(/usr)
 # This option has been supported since automake 1.8b
 AM_INIT_AUTOMAKE([1.8b tar-ustar])
 
-# The version of DejaVu fonts from upstream.
+# The version of DejaVu fonts required by
+# clone/libs-extern-sys/more_fonts/fonts/ttf_dejavu/makefile.mk
 DEJAVU_FONTS_UPSTREAM_MAJOR_VER=2
-DEJAVU_FONTS_UPSTREAM_MINOR_VER=30
+DEJAVU_FONTS_UPSTREAM_MINOR_VER=32
 
 OOO_BUILDVERSION=AC_PACKAGE_VERSION
 AC_SUBST(OOO_BUILDVERSION)