[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10049-g5574307

[Herman van Rink]

The branch, master has been updated
       via  5574307fd0c196663abdc405af5ddd05b180fb02 (commit)
      from  05cc24c2bea9416d1c08b88c1c21e78f085a5475 (commit)


- Log -----------------------------------------------------------------
commit 5574307fd0c196663abdc405af5ddd05b180fb02
Author: Herman van Rink <rink at initfour.nl>
Date:   Wed Sep 8 10:39:16 2010 +0200

    The tahoma.ttf file which is bundled with pChart 1.27d was replaced due to uncertainty with it's licence.

-----------------------------------------------------------------------

Summary of changes:
 libraries/chart/pChart/fonts/DejaVuSans.ttf        |  Bin 0 -> 683528 bytes
 .../{tcpdf/font => chart/pChart/fonts}/LICENSE     |    5 ++++-
 libraries/chart/pChart/fonts/README                |    6 ++++++
 libraries/chart/pChart/fonts/tahoma.ttf            |  Bin 383804 -> 0 bytes
 4 files changed, 10 insertions(+), 1 deletions(-)
 create mode 100644 libraries/chart/pChart/fonts/DejaVuSans.ttf
 copy libraries/{tcpdf/font => chart/pChart/fonts}/LICENSE (97%)
 create mode 100644 libraries/chart/pChart/fonts/README
 delete mode 100644 libraries/chart/pChart/fonts/tahoma.ttf

diff --git a/libraries/chart/pChart/fonts/DejaVuSans.ttf b/libraries/chart/pChart/fonts/DejaVuSans.ttf
new file mode 100644
index 0000000..a99969e
Binary files /dev/null and b/libraries/chart/pChart/fonts/DejaVuSans.ttf differ
diff --git a/libraries/tcpdf/font/LICENSE b/libraries/chart/pChart/fonts/LICENSE
similarity index 97%
copy from libraries/tcpdf/font/LICENSE
copy to libraries/chart/pChart/fonts/LICENSE
index 7684811..254e2cc 100644
--- a/libraries/tcpdf/font/LICENSE
+++ b/libraries/chart/pChart/fonts/LICENSE
@@ -1,4 +1,5 @@
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below)
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
 
 Bitstream Vera Fonts Copyright
 ------------------------------
@@ -94,3 +95,5 @@ be used in advertising or otherwise to promote the sale, use or other
 dealings in this Font Software without prior written authorization
 from Tavmjong Bah. For further information, contact: tavmjong @ free
 . fr.
+
+$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
diff --git a/libraries/chart/pChart/fonts/README b/libraries/chart/pChart/fonts/README
new file mode 100644
index 0000000..554d017
--- /dev/null
+++ b/libraries/chart/pChart/fonts/README
@@ -0,0 +1,6 @@
+
+The tahoma.ttf file which is bundled with pChart 1.27d was replaced due to uncertainty with it's licence.
+
+As a replacement the DejaVuSans.ttf font file was extracted from the DejaVu fonts 2.32 package available from dejavu-fonts.org
+
+For license information see LICENSE. 
diff --git a/libraries/chart/pChart/fonts/tahoma.ttf b/libraries/chart/pChart/fonts/tahoma.ttf
deleted file mode 100644
index 59b14a2..0000000
Binary files a/libraries/chart/pChart/fonts/tahoma.ttf and /dev/null differ


hooks/post-receive
-- 
phpMyAdmin