bump liberation fonts to 2.0

The 2.0 fonts are rebased on the google fonts and are now OFL and have a
shed-load more glyphs in them. But note that current releases does not include
Liberation Sans Narrow font because that couldn't be relicensed to OFL, so we
retain the Narrow version from the old release.

Change-Id: Ibd71055eed804cfe7629fb8d2ea7b9c900ba5710
(cherry picked from commit cb2536da21dcbd63aecdbc5ec45933afeff61772)

Signed-off-by: Michael Meeks <michael.meeks@suse.com>

5 files changed, 87 insertions, 28 deletions

diff --git a/more_fonts/fonts/ttf_liberation/makefile.mk b/more_fonts/fonts/ttf_liberation/makefile.mk
index 3a77bc153ec9..866950845935 100644
--- a/more_fonts/fonts/ttf_liberation/makefile.mk
+++ b/more_fonts/fonts/ttf_liberation/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This file is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
 PRJ=..$/..
 
@@ -35,10 +26,12 @@ TARGET=ttf_liberation
 .INCLUDE :	settings.mk
 
 # --- Files --------------------------------------------------------
-
-TARFILE_NAME=liberation-fonts-ttf-1.07.1
-TARFILE_MD5=0be45d54cc5e1c2e3102e32b8c190346
-TARFILE_ROOTDIR=liberation-fonts-ttf-1.07.1
+# Note: Current release does not include Liberation Sans Narrow font because
+# that couldn't be relicensed to OFL, so we take the Narrow version from
+# the old release
+TARFILE_NAME=liberation-fonts-ttf-2.00.0
+TARFILE_MD5=cfbf1ac6f61bf6cf45342a0cc9381be5
+TARFILE_ROOTDIR=liberation-fonts-ttf-2.00.0
 
 PATCH_FILES=
 
@@ -57,4 +50,3 @@ BUILD_FLAGS=
 .IF "$(WITH_FONTS)"!="NO"
 .INCLUDE : tg_ext.mk
 .ENDIF
-
diff --git a/more_fonts/fonts/ttf_liberation_narrow/makefile.mk b/more_fonts/fonts/ttf_liberation_narrow/makefile.mk
new file mode 100644
index 000000000000..3d8ea731b3e9
--- /dev/null
+++ b/more_fonts/fonts/ttf_liberation_narrow/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=more_fonts
+TARGET=ttf_liberation_narrow
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+# Note: Current release does not include Liberation Sans Narrow font because
+# that couldn't be relicensed to OFL, so we take the Narrow version from
+# the old release
+TARFILE_NAME=liberation-fonts-ttf-1.07.1
+TARFILE_MD5=0be45d54cc5e1c2e3102e32b8c190346
+TARFILE_ROOTDIR=liberation-fonts-ttf-1.07.1
+
+PATCH_FILES=
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(WITH_FONTS)"!="NO"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst
index 94f4ec8b6a1e..86d08616c28c 100644
--- a/more_fonts/prj/build.lst
+++ b/more_fonts/prj/build.lst
@@ -1,6 +1,7 @@
 bs	more_fonts	:	solenv NULL
 bs	more_fonts\fonts\ttf_dejavu		nmake	-	all	deja_fonts NULL
 bs	more_fonts\fonts\ttf_liberation	nmake	-	all	libe_fonts NULL
+bs	more_fonts\fonts\ttf_liberation_narrow	nmake	-	all	libe_fonts_narrow NULL
 bs	more_fonts\fonts\ttf_gentium	nmake	-	all	gent_fonts NULL
 bs	more_fonts\fonts\ttf_linlibertineg	nmake	-	all	linl_fonts NULL
 bs	more_fonts\fonts\ttf_amt	nmake	-	all	amt_fonts NULL
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index f40f7087d86c..9d4a90e4164e 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -3,8 +3,10 @@ mkdir: %COMMON_DEST%\pck
 # TODO: replace explicit versions by wildcard when the build system learns to handle them
 ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\ttf\*.ttf	%COMMON_DEST%\pck\*.ttf
 ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE		%COMMON_DEST%\pck\LICENSE_dejavu
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/Liberation*.ttf	%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/License.txt		%COMMON_DEST%\pck\LICENSE_liberation
+..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/Liberation*Narrow*.ttf	%COMMON_DEST%\pck\*.ttf
+..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/License.txt		%COMMON_DEST%\pck\LICENSE_liberation_narrow
+..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/Liberation*.ttf	%COMMON_DEST%\pck\*.ttf
+..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/License.txt		%COMMON_DEST%\pck\LICENSE_liberation
 ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf		%COMMON_DEST%\pck\*.ttf
 ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt	%COMMON_DEST%\pck\LICENSE_gentium
 ..\%__SRC%\misc\build\LinLibertineG\*.ttf		%COMMON_DEST%\pck\*.ttf
diff --git a/ooo.lst.in b/ooo.lst.in
index 62ee68e12c17..9a8bf7464b4e 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -15,6 +15,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
 0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz
+cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip