[scummvm] 01/04: Remove convert_utf.* and disable Wintermute

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository scummvm.

commit 6fd197d0b7a502cf77af6a73d9138e0c69474e99
Author: Stephen Kitt <skitt at debian.org>
Date:   Sun Mar 11 20:56:54 2018 +0100

    Remove convert_utf.* and disable Wintermute
---
 debian/changelog |  2 ++
 debian/copyright | 20 +-------------------
 debian/rules     |  3 ++-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adba45a..d954bed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ scummvm (2.0.0+dfsg-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release, merging all patches. Closes: #886317.
   * Use pkg-config to find FreeType 2. Closes: #892447.
+  * Remove convert_utf.* and disable Wintermute, the files are not
+    DFSG-free.
 
  -- Stephen Kitt <skitt at debian.org>  Sat, 10 Mar 2018 20:42:59 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 38071b1..6e69de0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,7 @@ Comment:
  then adopted by David Weinehall <tao at debian.org> the 30th Jan 2006,
  then adopted by the Debian Games Team by Moritz Muehlenhoff <jmm at debian.org>
 Files-Excluded:
+    engines/wintermute/utils/convert_utf.*
     gui/themes/fonts/topaz
     gui/themes/fonts/Arial*
     */*/*/*/*.o*
@@ -214,25 +215,6 @@ Files: engines/sword25/util/lua/*
 Copyright: 1994-2008 Lua.org, PUC-Rio.
 License: Expat
 
-Files: engines/wintermute/utils/convert_utf.*
-Copyright: 2001-2004 Unicode, Inc.
-License: unicode
- This source code is provided as is by Unicode, Inc. No claims are
- made as to fitness for any particular purpose. No warranties of any
- kind are expressed or implied. The recipient agrees to determine
- applicability of information provided. If this file has been
- purchased on magnetic or optical media from Unicode, Inc., the
- sole remedy for any claim will be exchange of defective media
- within 90 days of receipt.
- .
- Limitations on Rights to Redistribute This Code
- .
- Unicode, Inc. hereby grants the right to freely use the information
- supplied in this file in the creation of products supporting the
- Unicode Standard, and to make copies of this file in any form
- for internal or external distribution as long as this notice
- remains attached.
-
 Files: engines/wintermute/utils/crc.*
 Copyright: 2000 Michael Barr
 License: public-domain-crc
diff --git a/debian/rules b/debian/rules
index 4b91a47..bbadd99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,8 @@ override_dh_auto_configure:
             --disable-eventrecorder \
             --enable-release \
             --enable-verbose-build \
-            --prefix=/usr $(OPTARGS)
+            --prefix=/usr $(OPTARGS) \
+	    --disable-engine=wintermute
 
 FPATH=gui/themes/scummmodern
 override_dh_auto_build:

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