[pgv-svn] r82 - phpgedview/trunk/debian
thijs at alioth.debian.org
thijs at alioth.debian.org
Sun Sep 16 15:06:10 UTC 2007
Author: thijs
Date: 2007-09-16 15:06:09 +0000 (Sun, 16 Sep 2007)
New Revision: 82
Modified:
phpgedview/trunk/debian/changelog
phpgedview/trunk/debian/copyright
phpgedview/trunk/debian/phpgedview.install
phpgedview/trunk/debian/phpgedview.links
phpgedview/trunk/debian/rules
Log:
* New upstream release.
* Non-free font removed by upstream, source no longer repacked.
(Closes: #405255)
Modified: phpgedview/trunk/debian/changelog
===================================================================
--- phpgedview/trunk/debian/changelog 2007-08-09 15:16:05 UTC (rev 81)
+++ phpgedview/trunk/debian/changelog 2007-09-16 15:06:09 UTC (rev 82)
@@ -1,3 +1,11 @@
+phpgedview (4.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Non-free font removed by upstream, source no longer repacked.
+ (Closes: #405255)
+
+ -- Thijs Kinkhorst <thijs at debian.org> Sat, 15 Sep 2007 18:05:12 +0200
+
phpgedview (4.1.dfsg-1) unstable; urgency=low
* New upstream release.
Modified: phpgedview/trunk/debian/copyright
===================================================================
--- phpgedview/trunk/debian/copyright 2007-08-09 15:16:05 UTC (rev 81)
+++ phpgedview/trunk/debian/copyright 2007-09-16 15:06:09 UTC (rev 82)
@@ -4,15 +4,10 @@
It was downloaded from http://phpgedview.sourceforge.net/
-The upstream tarball was repackaged to leave out the Lucida
-Sans Regular font (fonts/Lucida*) which is of dubious licence.
-
Copyright (c) 2002 to 2005 John Finlay and Others
-Includes ufpdf, (c) 2004 Steven Wittens <steven at acko.net>
+Licence:
-Licence for both:
-
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -27,8 +22,13 @@
/usr/share/common-licenses/GPL-2
includes/feedcreator.class.php is copyright Kai Blankenhorn and others,
-and licenced as follows:
+and licenced under the LGPL.
+The files under tcpdf are copyirght Nicola Asuni, and licenced under
+the LGPL.
+
+Text for both:
+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
@@ -119,8 +119,108 @@
Copyright (c), 1999-2001, Matthew Snelham (infinite at users.sf.net)
Licence: GPLv2 or later.
+includes/fonts/*
+
+ Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+ Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below)
+ Bitstream Vera Fonts Copyright
+ ------------------------------
+ Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+ a trademark of Bitstream, Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute the
+ Font Software, including without limitation the rights to use, copy, merge,
+ publish, distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to the
+ following conditions:
+
+ The above copyright and trademark notices and this permission notice shall
+ be included in all copies of one or more of the Font Software typefaces.
+
+ The Font Software may be modified, altered, or added to, and in particular
+ the designs of glyphs or characters in the Fonts may be modified and
+ additional glyphs or characters may be added to the Fonts, only if the fonts
+ are renamed to names not containing either the words "Bitstream" or the word
+ "Vera".
+
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Bitstream
+ Vera" names.
+
+ The Font Software may be sold as part of a larger software package but no
+ copy of one or more of the Font Software typefaces may be sold by itself.
+
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+ FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+ FONT SOFTWARE.
+
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising or
+ otherwise to promote the sale, use or other dealings in this Font Software
+ without prior written authorization from the Gnome Foundation or Bitstream
+ Inc., respectively. For further information, contact: fonts at gnome dot
+ org.
+
+ Arev Fonts Copyright
+ ------------------------------
+
+ Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the fonts accompanying this license ("Fonts") and
+ associated documentation files (the "Font Software"), to reproduce
+ and distribute the modifications to the Bitstream Vera Font Software,
+ including without limitation the rights to use, copy, merge, publish,
+ distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright and trademark notices and this permission notice
+ shall be included in all copies of one or more of the Font Software
+ typefaces.
+
+ The Font Software may be modified, altered, or added to, and in
+ particular the designs of glyphs or characters in the Fonts may be
+ modified and additional glyphs or characters may be added to the
+ Fonts, only if the fonts are renamed to names not containing either
+ the words "Tavmjong Bah" or the word "Arev".
+
+ This License becomes null and void to the extent applicable to Fonts
+ or Font Software that has been modified and is distributed under the
+ "Tavmjong Bah Arev" names.
+
+ The Font Software may be sold as part of a larger software package but
+ no copy of one or more of the Font Software typefaces may be sold by
+ itself.
+
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+ TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.
+
+ Except as contained in this notice, the name of Tavmjong Bah shall not
+ 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.
+
+
+
The referenced licence texts follow.
== PHP license 2.02 ==
Modified: phpgedview/trunk/debian/phpgedview.install
===================================================================
--- phpgedview/trunk/debian/phpgedview.install 2007-08-09 15:16:05 UTC (rev 81)
+++ phpgedview/trunk/debian/phpgedview.install 2007-09-16 15:06:09 UTC (rev 82)
@@ -1,5 +1,4 @@
blocks /usr/share/phpgedview/www
-fonts /usr/share/phpgedview/www
hooks /usr/share/phpgedview/www
images /usr/share/phpgedview/www
languages/*.en.php /usr/share/phpgedview/www/languages
@@ -18,8 +17,8 @@
pgvnuke /usr/share/phpgedview/www
reports /usr/share/phpgedview/www
+tcpdf /usr/share/phpgedview/www
themes/standard /usr/share/phpgedview/www/themes
-ufpdf /usr/share/phpgedview/www
webservice /usr/share/phpgedview/www
*.php /usr/share/phpgedview/www
js /usr/share/phpgedview/www
Modified: phpgedview/trunk/debian/phpgedview.links
===================================================================
--- phpgedview/trunk/debian/phpgedview.links 2007-08-09 15:16:05 UTC (rev 81)
+++ phpgedview/trunk/debian/phpgedview.links 2007-09-16 15:06:09 UTC (rev 82)
@@ -1,5 +1,5 @@
/etc/phpgedview/config.php usr/share/phpgedview/www/config.php
/etc/phpgedview/config_gedcom.php usr/share/phpgedview/www/config_gedcom.php
-/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/phpgedview/www/fonts/LucidaSansRegular.ttf
+/usr/share/fonts/truetype/ttf-dejavu/dejavusans.ttf usr/share/phpgedview/includes/fonts/DejaVuSans.ttf
/usr/share/gallery2 usr/share/phpgedview/www/modules/gallery2
/usr/share/phpsysinfo usr/share/phpgedview/www/modules/phpsysinfo
Modified: phpgedview/trunk/debian/rules
===================================================================
--- phpgedview/trunk/debian/rules 2007-08-09 15:16:05 UTC (rev 81)
+++ phpgedview/trunk/debian/rules 2007-09-16 15:06:09 UTC (rev 82)
@@ -7,7 +7,7 @@
binary-fixup/phpgedview::
# spurious licence
- rm -f debian/phpgedview/usr/share/phpgedview/www/ufpdf/LICENSE.txt \
+ rm -f debian/phpgedview/usr/share/phpgedview/www/tcpdf/LICENSE.TXT \
debian/phpgedview/usr/share/phpgedview/www/js/scriptaculous/MIT-LICENSE \
debian/phpgedview/usr/share/phpgedview/www/modules/punbb/docs/COPYING
# drop PEAR stuff since we use the Debian package
@@ -15,6 +15,9 @@
debian/phpgedview/usr/share/phpgedview/www/SOAP/ \
debian/phpgedview/usr/share/phpgedview/www/DB.php \
debian/phpgedview/usr/share/phpgedview/www/PEAR.php
+ # same for dejavu font
+ rm -rf debian/phpgedview/usr/share/phpgedview/www/includes/fonts/dejavu-ttf-2.15 \
+ debian/phpgedview/usr/share/phpgedview/www/includes/fonts/DejaVuSans.ttf
# prepare writable dir
chown www-data:www-data debian/phpgedview/var/lib/phpgedview
More information about the pkg-phpgedview-commit
mailing list