[SCM] deadbeef/master: Remove eng_dsf files (missing license)

[ghedo-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d4c5fb1ed3212cad99836f6762ee247e005dd9b3
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Tue Feb 8 19:49:14 2011 +0100

    Remove eng_dsf files (missing license)

diff --git a/debian/README.source b/debian/README.source
index 7601a3f..67581ad 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1,8 @@
 deadbeef for Debian
 -------------------
 
-The following files have been removed due to not DFSG-compliant license:
+The following files have been removed due to not DFSG-compliant or
+missing license:
 
   plugins/shn/shorten.*
   plugins/shn/vario.c
@@ -9,6 +10,7 @@ The following files have been removed due to not DFSG-compliant license:
   plugins/dumb/dumb-kode54/
   plugins/ao/eng_qsf/z80*
   plugins/ao/eng_ssf/m68k*
+  plugins/ao/eng_dsf/*
 
 
 
diff --git a/debian/copyright b/debian/copyright
index c40e227..6913851 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: DeaDBeeF
-Maintainer: Alexey Yakovenko <waker at users.sourceforge.net>
+Format: http://dep.debian.net/deps/dep5/Name: DeaDBeeF
+Upstream-Name: Deadbeef
+Upstream-Contact: Alexey Yakovenko <waker at users.sourceforge.net>
 Source: http://sf.net/projects/deadbeef
 
 Files: *
@@ -9,7 +9,7 @@ License: GPL-2+
 
 Files: ./deadbeef.h
 Copyright: 2009-2010 Alexey Yakovenko <waker at users.sourceforge.net>
-License: zlib/libpng
+License: ZLIB
 
 Files: ./optmath.h
 Copyright:
@@ -19,7 +19,7 @@ License: GPL-2+
 
 Files: ./md5/*
 Copyright: Copyright: 1999, 2002 Aladdin Enterprises. All rights reserved
-License: zlib/libpng
+License: ZLIB
 
 Files: ./intl/*
 Copyright: 1995-2010 Free Software Foundation, Inc
@@ -37,17 +37,6 @@ Files: ./plugins/adplug/libbinio/*
 Copyright: 1999 - 2004 Simon Peter, <dn.tlp at gmx.net>, et al
 License: LGPL-2.1+
 
-Files: plugins/ao/eng_dsf/arm7*
-Copyright: Radoslaw Balcewicz
-License: None
-
-Files:
-  plugins/ao/eng_dsf/eng_dsf.c
-  plugins/ao/eng_protos.h
-  plugins/ao/corlett.h
-  plugins/ao/mem.h
-Copyright: 2000-2008 Richard F. Bannister
-
 Files:
   plugins/ao/eng_qsf/eng_qsf.c
   plugins/ao/eng_psf/eng_spu.c
@@ -191,7 +180,7 @@ Copyright:
   1999-2002 Dag Lem <resid at nimrod.no>
 License: GPL-2+
 
-Files: plugins/sid/sidplay-libs/builders/resid-builder/include/* 
+Files: plugins/sid/sidplay-libs/builders/resid-builder/include/*
 Copyright: 2001 by Simon White
 License: GPL-2+
 
@@ -326,7 +315,7 @@ License: BSD
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
 
-License: zlib/libpng
+License: ZLIB
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
   arising from the use of this software.
diff --git a/debian/rules b/debian/rules
index efd70c9..3f1ab73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_UPSTREAM_URL = http://sourceforge.net/projects/deadbeef/files
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
-DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./plugins/shn/shorten.* ./plugins/shn/vario.c ./plugins/shn/array.c ./plugins/dumb/dumb-kode54/ ./plugins/ao/eng_qsf/z80* ./plugins/ao/eng_ssf/m68k*
+DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./plugins/shn/shorten.* ./plugins/shn/vario.c ./plugins/shn/array.c ./plugins/dumb/dumb-kode54/ ./plugins/ao/eng_qsf/z80* ./plugins/ao/eng_ssf/m68k* plugins/ao/eng_dsf/*
 
 DEB_CONFIGURE_EXTRA_FLAGS = --disable-ao --disable-dumb --disable-shn
 DEB_DH_MAKESHLIBS_ARGS = --noscripts

-- 
deadbeef packaging