[SCM] gpac/master: Drop all include files in extra_lib from original tarball

Wed Jul 8 08:05:20 UTC 2015

The following commit has been merged in the master branch:
commit e05b774446089e61ce12d293832310af053fc0d1
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Jul 7 17:57:48 2015 -0700

    Drop all include files in extra_lib from original tarball

diff --git a/debian/copyright b/debian/copyright
index a7e9bb2..ca334c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,11 +15,7 @@ Files-Excluded: applications/hbbtvplayer
  applications/GPAX/
  applications/v4studio/
  build/
- extra_lib/include/ffmpeg_android
- extra_lib/include/libavcodec
- extra_lib/include/libavformat
- extra_lib/include/libavutil
- extra_lib/include/libswscale
+ extra_lib/include/
  modules/xvid_dec/xvid_wce/
  gui/mpegu-core.js
  gui/mpegu-wm.js
@@ -39,66 +35,10 @@ Copyright:
  2001-2002, Thomas Östreich
 License: LGPL-2+
 
-Files: extra_lib/include/wiiuse.h
-Copyright: © 2006-2007, Michael Laforest
-License: GPL-3+
-
 Files: applications/osmo4_wx/menubtn.*
 Copyright: © 2002, John Labenski
 License: wxWidgets
 
-Files: extra_lib/include/a52dec/*
- extra_lib/include/mad/*
- extra_lib/include/xvid/*
- extra_lib/include/faad/*
-Copyright:
- 2000-2002, Michel Lespinasse <walken at zoy.org>
- 1999-2000, Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
- 2000-2004, Underbit Technologies, Inc.
- 2001-2004, Peter Ross <pross at xvid.org>
- 2003-2005, M. Bakker, Nero AG
-License: GPL-2+
-
-Files: extra_lib/include/ffmpeg_android/*
-Copyright: © 2001, Fabrice Bellard
-           © 2001-2006, Michael Niedermayer <michaelni at gmx.at>
-License: LGPL-2.1+
-
-Files: extra_lib/include/freetype/*
-       modules/soft_raster/ftgrays.c
-       src/utils/path2d_stroker.c
-Copyright: © 1996-2001, David Turner
-           © 1996-2001, Robert Wilhelm
-           © 1996-2001, Werner Lemberg
-License: FreeType-License or GPL-2+
-
-Files: extra_lib/include/jpeg/*
-Copyright: © 1991-1998, Thomas G. Lane
-License: JPEG-License
-
-Files: extra_lib/include/js/*
-Copyright: © 1998, Netscape Communications Corporation
-License: MPL-1.1 or GPL-2+ or LGPL-2.1+
-
-Files: extra_lib/include/ogg/*
-       extra_lib/include/theora/*
-       extra_lib/include/vorbis/*
-       include/gpac/internal/ogg.h
-       src/media_tools/gpac_ogg.c
-Copyright: © 1994-2002, Xiph.Org Foundation
-License: BSD-3-clause
-
-Files: extra_lib/include/openjpeg/*
-Copyright: © 2002-2007, Communications and Remote Sensing Laboratory,
-             Universite catholique de Louvain (UCL), Belgium
-           © 2002-2007, Professor Benoit Macq
-           © 2001-2003, David Janssens
-           © 2002-2003, Yannick Verschueren
-           © 2003-2007, Francois-Olivier Devaux and Antonin Descampe
-           © 2005, Herve Drolon, FreeImage Team
-           © 2006-2007, Parvatha Elangovan
-License: BSD-2-clause
-
 Files: modules/widgetman/*
 Copyright: © 2009 Telecom ParisTech
 License: LGPL-2+ or other-nonfree-1
@@ -110,21 +50,6 @@ Copyright:
   2009-2011 Reinhard Tartler <siretart at tauware.de>
 License: LGPL-2+
 
-Files: extra_lib/include/png/*
-Copyright: © 1998-2008 Glenn Randers-Pehrson
-           © 1996, 1997 Andreas Dilger
-           © 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-License: Zlib
-
-Files: extra_lib/include/openssl/*
-Copyright: © 1998-2004, The OpenSSL Project
-           © 1995-1998, Eric A. Young, Tim J. Hudson
-License: OpenSSL-License
-
-Files: extra_lib/include/platinum/*
-Copyright: © 2002-2008, Axiomatic Systems, LLC.
-License: BSD-3-clause-axiomatic
-
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -198,44 +123,7 @@ License: BSD-3-clause-axiomatic
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: Zlib
- For the purposes of this copyright and license, "Contributing Authors"
- is defined as the following set of individuals:
- .
-    Andreas Dilger
-    Dave Martindale
-    Guy Eric Schalnat
-    Paul Schmidt
-    Tim Wegner
- .
- The PNG Reference Library is supplied "AS IS".  The Contributing Authors
- and Group 42, Inc. disclaim all warranties, expressed or implied,
- including, without limitation, the warranties of merchantability and of
- fitness for any purpose.  The Contributing Authors and Group 42, Inc.
- assume no liability for direct, indirect, incidental, special, exemplary,
- or consequential damages, which may result from the use of the PNG
- Reference Library, even if advised of the possibility of such damage.
- .
- Permission is hereby granted to use, copy, modify, and distribute this
- source code, or portions hereof, for any purpose, without fee, subject
- to the following restrictions:
- .
- 1. The origin of this source code must not be misrepresented.
- .
- 2. Altered versions must be plainly marked as such and
-    must not be misrepresented as being the original source.
- .
- 3. This Copyright notice may not be removed or altered from
-    any source or altered source distribution.
- .
- The Contributing Authors and Group 42, Inc. specifically permit, without
- fee, and encourage the use of this source code as a component to
- supporting the PNG file format in commercial products.  If you use this
- source code in a product, acknowledgment is not required but would be
- appreciated.
-
-Files: extra_lib/include/zlib/*
-       src/utils/gzio.cpp
+Files: src/utils/gzio.cpp
        src/utils/zlib_*
        src/utils/zutil.*
 Copyright: © 1995-2005, Jean-loup Gailly
diff --git a/debian/repack.local b/debian/repack.local
index f47f9cd..05ed161 100644
--- a/debian/repack.local
+++ b/debian/repack.local
@@ -14,11 +14,7 @@ rm \
  applications/osmozilla/ \
  applications/GPAX/ \
  applications/v4studio/ \
- extra_lib/include/ffmpeg_android \
- extra_lib/include/libavcodec \
- extra_lib/include/libavformat \
- extra_lib/include/libavutil \
- extra_lib/include/libswscale \
+ extra_lib/include/ \
  modules/xvid_dec/xvid_wce/ \
  gui/mpegu-core.js \
  gui/mpegu-wm.js \

-- 
gpac packaging

