[scorched3d] 02/03: remove fonts-dejavu embedded copy from orig source

[Phil Morrell]

This is an automated email from the git hooks/post-receive script.

emorrp1-guest pushed a commit to branch master
in repository scorched3d.

commit 236b0a96182f5b43a40e5d22b72909a91b4fb299
Author: Phil Morrell <debian at emorrp1.name>
Date:   Sat Mar 5 22:58:03 2016 +0000

    remove fonts-dejavu embedded copy from orig source
---
 debian/copyright          | 49 -----------------------------------------------
 debian/get-orig-source.sh |  1 +
 debian/rules              |  5 -----
 3 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 98b2f28..481e3ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,13 +18,6 @@ Copyright:
  © 2016 Phil Morrell <debian at emorrp1.name>
 License: GPL-2+
 
-Files: data/fonts/dejavu*
-Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. 
- Bitstream Vera is a trademark of Bitstream, Inc.
- DejaVu changes are in public domain.
-License: bitstream-vera
-Comment: license block imported from fonts-dejavu package
-
 Files: data/globalmods/apoc/*
 Copyright: Apocalypse mod team
 License: CC-BY-SA-3
@@ -51,48 +44,6 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General Public License
  can be found in the file `/usr/share/common-licenses/GPL-2'.
 
-License: bitstream-vera
- 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.
-
 License: CC-BY-SA-3
  Creative Commons Attribution-ShareAlike 3.0 License
  .
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index ec79f45..6039506 100755
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -12,4 +12,5 @@ ${UVER}/scorched scorched3d-${UVER}
 tar --exclude=".svn" \
 	--exclude="*.dll" \
 	--exclude="scorched3d-${UVER}/data/avatars" \
+	--exclude="scorched3d-${UVER}/data/fonts/dejavu*" \
 	-cJf scorched3d_${DVER}.orig.tar.xz scorched3d-${UVER}
diff --git a/debian/rules b/debian/rules
index 9d4bff3..481ba17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,11 +41,6 @@ override_dh_builddeb:
 
 override_dh_auto_install:
 	dh_auto_install
-	# Both fonts are in ttf-dejavu-core. Remove them here and create
-	# symlinks later on by debian/scorched3d-data
-	rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusans.ttf
-	rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusmobd.ttf
-	rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusconbd.ttf
 	mkdir -p debian/tmp/usr/share/bug/scorched3d
 	cp debian/presubj debian/tmp/usr/share/bug/scorched3d/
 	mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scorched3d.git