The following commit has been merged in the master branch:
commit edbea4ab7ab4737b3bf1c4ef52433590b0c7596d
Author: Stephen Kitt <st...@sk2.org>
Date: Wed May 16 22:51:10 2012 +0200
Pull in relevant changes from the experimental package.
- wrap-and-sort debian/control
- add a Built-Using relationship to the package from which MiniLZO is
copied
- build using libvorbisidec-dev rather than the provided tremor source
- switch to DEP-5 format for debian/copyright
- add cheats.txt to the shipped documentation
- build with dh-autoreconf
- use debian/gbp.conf to enforce pristine-tar use
- add README.source describing the source code replacements
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..1aa7ea9
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,17 @@
+mednafen for Debian
+-------------------
+
+The upstream source includes copies of the following packages which
+are available separately in Debian:
+* libmpcdec-dev; the API has changed since the version in Mednafen so
+ the Debian version can't be used directly;
+* libvorbisidec-dev (tremor); this is patched out of Mednafen and the
+ Debian version used instead;
+* liblzo2-dev (minilzo); the source files are copied from the Debian
+ package for the build;
+* libav (jrevdct.cpp); only one function is reproduced, and it doesn't
+ seem useful to modify the build to use libav instead;
+* gettext, as usual for projects using gettext; the build doesn't
+ update it.
+
+ -- Stephen Kitt <st...@sk2.org>, Wed, 16 May 2012 22:49:44 +0200
diff --git a/debian/changelog b/debian/changelog
index 7e55596..da31034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
mednafen (0.8.D.3-4) unstable; urgency=low
* Update debian/watch to track stable releases only.
-
- -- Stephen Kitt <st...@sk2.org> Wed, 16 May 2012 06:43:01 +0200
+ * Pull in relevant changes from the experimental package:
+ - wrap-and-sort debian/control
+ - add a Built-Using relationship to the package from which MiniLZO is
+ copied
+ - build using libvorbisidec-dev rather than the provided tremor source
+ - switch to DEP-5 format for debian/copyright
+ - add cheats.txt to the shipped documentation
+ - build with dh-autoreconf
+ - use debian/gbp.conf to enforce pristine-tar use
+ - add README.source describing the source code replacements
+
+ -- Stephen Kitt <st...@sk2.org> Wed, 16 May 2012 22:50:02 +0200
mednafen (0.8.D.3-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 989b2f3..ca68e14 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,21 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Uploaders: Stephen Kitt <st...@sk2.org>
-Build-Depends: debhelper (>= 9), autotools-dev, x11proto-core-dev,
- libgl1-mesa-dev | libgl-dev, zlib1g-dev | libz-dev, libsdl1.2-dev,
- libsamplerate0-dev, libsdl-net1.2-dev, libcdio-dev,
- libsndfile1-dev | libsndfile-dev,
- libasound2-dev [linux-any],
- libjack-dev
+Build-Depends: autotools-dev,
+ debhelper (>= 9),
+ dh-autoreconf,
+ libasound2-dev [linux-any],
+ libcdio-dev,
+ libgl1-mesa-dev | libgl-dev,
+ libjack-dev,
+ liblzo2-dev,
+ libsamplerate0-dev,
+ libsdl-net1.2-dev,
+ libsdl1.2-dev,
+ libsndfile1-dev | libsndfile-dev,
+ libvorbisidec-dev,
+ x11proto-core-dev,
+ zlib1g-dev | libz-dev
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.3
Homepage: http://mednafen.sourceforge.net
@@ -18,10 +27,11 @@ DM-Upload-Allowed: yes
Package: mednafen
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: nes-emulator
+Built-Using: ${bu:liblzo2}
Description: multi-platform emulator, including NES, GB/A, Lynx, PC Engine
- Mednafen is a command-line driven emulator for many different systems. It
+ Mednafen is a command-line driven emulator for many different systems. It
has full support for OpenGL and SDL graphics, network play, remappable input
configuration, joystick and keyboard support, save states, game rewinding,
GSF playback, and screenshots.
diff --git a/debian/copyright b/debian/copyright
index b92a870..88f1e15 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,216 +1,440 @@
-This package was debianized by Ryan Schultz <schultz.r...@gmail.com> on
-Tue, 22 Nov 2005 22:48:43 -0500.
-
-It was downloaded from http://mednafen.sourceforge.net
-
-It was adopted on Thu, 04 Feb 2010 14:50:12 +0100 by Stephen Kitt
-<st...@sk2.org> on behalf of the Debian games team.
-
-Copyright Holders:
- Mednafen Team <sarenc...@hotmail.com>
- Firebug High-level mapper information.
- Andrea Mazzoleni Scale2x/Scale3x scalers included in Mednafen.
- Bero Original FCE source code.
- Brad Taylor NES sound information.
- Charles MacDonald PC Engine technical information.
- EFX Testing.
- Fredrik Olson NES four-player adapter information.
- Gilles Vollant PKZIP file loading functions.
- goroh Various documents.
- Info-ZIP ZLIB
- Jeremy Chadwick General NES information.
- kevtris Low-level NES information and sound information.
- Ki Various technical information.
- Mark Knibbs Various NES information.
- Marat Fayzullin General NES information.
- Matthew Conte Sound information.
- Maxim Stepin hq2x and hq3x scalers included in Mednafen.
- Mitsutaka YM2413 emulator.
- nori FDS sound information.
- Quietust VRC7 sound translation code by The Quietus
- rahga Famicom four-player adapter information.
- TheRedEye ROM images, testing.
- Xodnizel FCE Ultra.
- Daniel Stenberg, Bjorn Reese Trio.
- Unicode, Inc. ConvertUTF.
- Christophe Devine MD5 Hashing.
- V810 Emulator David Tucker
- Unzipping Code Gilles Vollant
- MiniLZO Markus Franz Xaver Johannes Oberhumer
- Fuse Z80 emulation code Philip Kendall, Witold Filipczyk
- NeoPop Neo Geo Pocket (Color) Code neopop_uk
- FPU Emulation Free Software Foundation, Inc.
- PC-FX MJPEG Decoding Thomas G. Lane, Rich Geldreich
- VRC7 Sound Emulation Mitsutaka Okazaki
- NEC V30MZ Emulator Bryan McPhail
- Cygne Dox
- QuickLZ Lasse Mikkel Reinhold
- dvdisaster Carsten Gnoerlich
-
- Copyright © 2005 Mednafen Team
- Copyright © 2003-2005 Shay Green
- Copyright © 1995-1997, 2000-2004 Ulrich Drepper
- Copyright © 2002-2003 Xodnizel
- Copyright © 1996-2005 Markus Franz Xaver Johannes Oberhumer
- Copyright © 1998 BERO
- Copyright © 2000, 2001, 2002 Fabrice Bellard
- Copyright © 1997-1999 H. Dietz
- Copyright © 2003 CaH4e3
- Copyright © 2002 Jarek Burczynski
- Copyright © 2002-2004 Jim Peters
- Copyright © 1999-2003 Forgotten
- Copyright © 2004 Forgotten and the VBA development team
- Copyright © 2003 Tobias Diedrich
- Copyright © 1998-2005 Gilles Vollant
- Copyright © 1990-2005 Info-ZIP
- Copyright © 2004 Ki
- Copyright © 2001-2004 Andrea Mazzoleni
- Copyright © 2002 Paul Kuliniewicz
- Copyright © 2003 MaxSt
- Copyright © 1996-1997, 2004 K. Wilkins
- Copyright © 1998-2001 Bjorn Reese and Daniel Stenberg
- Copyright © 2005 The Musepack Development Team
- Copyright © 2002 Xiph.org Foundation
- Copyright © 2001 Tetsuya Isaki
- Copyright 2001-2004 Unicode, Inc.
- Copyright © Christophe Devine
- Copyright © 2006 David Tucker
- Copyright © 1996-2005 Markus Franz Xaver Johannes Oberhumer
- Copyright © 1999-2004 Philip Kendall, Witold Filipczyk
- Copyright © 2001-2002 by neopop_uk
- Copyright © 1997, 1998, 1999, 2000, 2002, 2003, 2005, 2006, 2007,
- 2008, 2009 Free Software Foundation, Inc.
- Copyright © 1991-1998, Thomas G. Lane.
- Copyright © 1994-2000 Rich Geldreich
- Copyright © 2001 Mitsutaka Okazaki
- Copyright © 2002 Dox <d...@space.pl>
- Copyright © 2006-2007 Lasse Mikkel Reinhold
- Copyright © 2004-2007 Carsten Gnoerlich
- Copyright © 2006 Phil Karn
-
-License:
-
- This package 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
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in
-`/usr/share/common-licenses/GPL-2'.
-
-Parts of Mednafen are also released under the LGPL:
-
- This package 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
- version 2 of the License, or (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License version 2 can be found in
-`/usr/share/common-licenses/LGPL-2'.
-
-The unzipping code is released under the Info-ZIP license:
-
-This software is provided "as is," without warranty of any kind, express
-or implied. In no event shall Info-ZIP or its contributors be held liable
-for any direct, indirect, incidental, special or consequential damages
-arising out of the use of or inability to use this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
- 1. Redistributions of source code must retain the above copyright notice,
- definition, disclaimer, and this list of conditions.
-
- 2. Redistributions in binary form (compiled executables) must reproduce
- the above copyright notice, definition, disclaimer, and this list of
- conditions in documentation and/or other materials provided with the
- distribution. The sole exception to this condition is redistribution
- of a standard UnZipSFX binary (including SFXWiz) as part of a
- self-extracting archive; that is permitted without inclusion of this
- license, as long as the normal SFX banner has not been removed from
- the binary or disabled.
-
- 3. Altered versions--including, but not limited to, ports to new operating
- systems, existing ports with new graphical interfaces, and dynamic,
- shared, or static library versions--must be plainly marked as such
- and must not be misrepresented as being the original source. Such
- altered versions also must not be misrepresented as being Info-ZIP
- releases--including, but not limited to, labeling of the altered
- versions with the names "Info-ZIP" (or any variation thereof, including,
- but not limited to, different capitalizations), "Pocket UnZip," "WiZ"
- or "MacZip" without the explicit permission of Info-ZIP. Such altered
- versions are further prohibited from misrepresentative use of the
- Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
-
- 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
- "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
- own source and binary releases.
-
-The definitive text of this license is available at:
-ftp://ftp.info-zip.org/pub/infozip/license.html
-
-The Trio library code integrated with Mednafen is released under the MIT
license:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: mednafen
+Source: http://mefnafen.sf.net
+Copyright: 2005-2010 Mednafen Team
+License: GPL-2+
+Files: *
+Copyright: 2005-2010 Mednafen Team
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2005-2008 Ryan Schultz
+ 2010-2012 Stephen Kitt
+License: GPL-2+
+
+Files: include/mpcdec/* src/mpcdec/*
+Comment: libmpcdec <http://www.musepack.net/>
+Copyright: 2005 The Musepack Development Team
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ .
+ * Neither the name of the The Musepack Development Team nor the
+ names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: src/tremor/*
+Comment: Tremor <http://xiph.org/>
+Copyright: 2002 Xiph.org Foundation
+License: BSD-Xiph
+
+Files: include/blip/* src/ngp/T6W28_Apu.cpp src/Stereo_Buffer.cpp
src/compress/blz.c src/sms/Sms_Apu.cpp src/nes/ntsc/* src/Ym2612_Emu.cpp
src/gb/sound/* src/gba/Gba_Apu.* src/gba/Gba_Oscs.* src/Blip_Buffer.cpp
+Comment: Gb_Snd_Emu, Blip_Buffer, Sms_Snd_Emu, nes_ntsc
<http://www.slack.net/~ant/libs/>
+Copyright: 2003-2006 Shay Green
+License: GPL-2+
+
+Files: src/lynx/*
+Comment: Handy <http://homepage.ntlworld.com/dystopia/>
+Copyright: 2004 K. Wilkins
+License: Handy
+ 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.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and must not
+ be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: src/cdrom/cdromif.h src/pce/adpcm.* src/pce/cdrom.cpp src/pce/huc.cpp
+Comment: PC2e
+Copyright: 2004 Ki
+License: GPL-2+
+
+Files: src/drivers/scale*
+Comment: Scale2x <http://scale2x.sf.net/>
+Copyright: 2001-2004 Andrea Mazzoleni
+License: GPL-2+
+
+Files: src/drivers/hq?x.cpp
+Comment: hq2x, hq3x, hq4x <http://www.hiend3d.com/hq2x.html>
+Copyright: 2003 MaxSt <ma...@hiend3d.com>
+License: LGPL-2.1+
+
+Files: src/gb/gb* src/gb/gfx.cpp src/gb/memory.* src/gba/*
+Comment: VisualBoyAdvance <http://vba.sf.net/>
+Copyright: 1999-2003 Forgotten
+ 2004-2006 Forgotten and the VBA development team
+License: GPL-2+
+
+Files: include/trio/* src/trio/*
+Comment: trio <http://daniel.haxx.se/projects/trio/>
+Copyright: 1998-2009 Bjorn Reese and Daniel Stenberg
+License: trio
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
-
+ .
THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
-ConvertUTF:
- * Copyright 2001-2004 Unicode, Inc.
- *
- * Disclaimer
- *
- * 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.
-
-This NEC V30MZ emulator may be used for purposes both commercial and
noncommercial if you give the author, Bryan McPhail, a small credit somewhere.
-
-QuickLZ can be used for free under the GPL-1 or GPL-2 license (where anything
-released into public must be open source) or under a commercial license if such
-has been acquired (see http://www.quicklz.com/order.html). The commercial
-license does not cover derived or ported versions created by third parties
-under GPL.
-
-The Debian packaging is
- Copyright © 2005-2008 Ryan Schultz
- Copyright © 2010 Stephen Kitt
-and is released under the terms of the GNU GPL v2.
+Files: src/string/ConvertUTF.*
+Comment: ConvertUTF
+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: src/md5.cpp
+Comment: MD5 Hashing; the exact license statement is contained in later
+ versions of the code (see <http://www.cr0.net:8040/code/crypto/>)
+Copyright: Christophe Devine
+License: GPL-2+
+
+Files: src/pcfx/v810*
+Comment: V810 Emulator
+Copyright: 2006 David Tucker
+License: GPL-2+
+
+Files: src/compress/ioapi.* src/compress/unzip.*
+Comment: Unzipping Code
+Copyright: 1998-2005 Gilles Vollant
+ 1990-2000 Info-ZIP
+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.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: src/compress/lzo* src/compress/minilzo.*
+Comment: MiniLZO <http://www.oberhumer.com/opensource/lzo/>
+Copyright: 1996-2005 Markus Franz Xaver Johannes Oberhumer
+License: GPL-2+
+
+Files: src/z80-fuse/*
+Comment: Fuse Z80 emulation code <http://fuse-emulator.sourceforge.net/>
+Copyright: 1999-2004 Philip Kendall, Witold Filipczyk
+License: GPL-2+
+
+Files: src/ngp/*
+Comment: NeoPop Neo Geo Pocket (Color) Code <http://neopop.emuxhaven.net/>
+Copyright: 2001-2002 neopop_uk
+License: GPL-2+
+
+Files: src/pcfx/jrevdct.cpp
+Comment: PC-FX MJPEG Decoding
+Copyright: 1991, 1992 Thomas G. Lane
+License: JPEG
+ The authors make NO WARRANTY or representation, either express or implied,
+ with respect to this software, its quality, accuracy, merchantability, or
+ fitness for a particular purpose. This software is provided "AS IS", and you,
+ its user, assume the entire risk as to its quality and accuracy.
+ .
+ This software is copyright (C) 1991, 1992, Thomas G. Lane.
+ All Rights Reserved except as specified below.
+ .
+ Permission is hereby granted to use, copy, modify, and distribute this
+ software (or portions thereof) for any purpose, without fee, subject to these
+ conditions:
+ (1) If any part of the source code for this software is distributed, then this
+ README file must be included, with this copyright and no-warranty notice
+ unaltered; and any additions, deletions, or changes to the original files
+ must be clearly indicated in accompanying documentation.
+ (2) If only executable code is distributed, then the accompanying
+ documentation must state that "this software is based in part on the work of
+ the Independent JPEG Group".
+ (3) Permission for use of this software is granted only if the user accepts
+ full responsibility for any undesirable consequences; the authors accept
+ NO LIABILITY for damages of any kind.
+ .
+ Permission is NOT granted for the use of any IJG author's name or company name
+ in advertising or publicity relating to this software or products derived from
+ it. This software may be referred to only as "the Independent JPEG Group's
+ software".
+ .
+ We specifically permit and encourage the use of this software as the basis of
+ commercial products, provided that all warranty or liability claims are
+ assumed by the product vendor.
+
+Files: src/wswan/start.h src/wswan/v30mz*
+Comment: NEC V30MZ Emulator
+Copyright: Bryan McPhail
+License: McPhail
+ This NEC V30MZ emulator may be used for purposes both commercial and
+ noncommercial if you give the author, Bryan McPhail, a small credit
+ somewhere(such as in the documentation for an executable package).
+
+Files: src/wswan/dis/*
+Comment: NEC V30MZ disassembler (modified BOCHS x86 disassembler)
+Copyright: TODO
+License: LGPL-2+
+
+Files: src/wswan/*
+Comment: Cygne <http://cygne.emuunlim.com/>
+Copyright: 2002 Dox <d...@space.pl>
+License: GPL-2+
+
+Files: src/drivers/joystick.cpp src/drivers/main.h src/drivers/sound.cpp
src/nes/*
+Comment: FCE Ultra <http://fceultra.sourceforge.net/>
+Copyright: 1998 BERO
+ 2002 Xodnizel
+ 2002 Paul Kuliniewicz
+ 2003 CaH4e3
+License: GPL-2+
+
+Files: src/compress/quicklz.*
+Comment: QuickLZ <http://www.quicklz.com/>
+Copyright: 2006-2008 Lasse Mikkel Reinhold
+License: GPL-1 or GPL-2
+ QuickLZ can be used for free under the GPL-1 or GPL-2 license (where anything
+ released into public must be open source) or under a commercial license if
such
+ has been acquired (see http://www.quicklz.com/order.html). The commercial
license
+ does not cover derived or ported versions created by third parties under GPL.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in /usr/share/common-licenses/GPL-2
+
+Files: src/cdrom/CDUtility.cpp src/cdrom/lec.*
+Comment: Q-Subchannel CRC16 Code <http://cdrdao.sourceforge.net/>
+Copyright: 1998-2002 Andreas Mueller <muel...@daneb.ping.de>
+License: GPL-2+
+
+Files: src/sms/*
+Comment: SMS Plus <http://cgfm2.emuviews.com/>
+Copyright: 1998-2004 Charles MacDonald
+License: GPL-2+
+
+Files: src/sms/emu2413.* src/nes/boards/emu2413.*
+Comment: EMU2413
+Copyright: 2004 Mitsutaka Okazaki
+License: EMU2413
+ 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.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not
+ be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: src/cdrom/crc32.cpp src/cdrom/dvdisaster.h src/cdrom/galois*
src/cdrom/l-ec.cpp src/cdrom/recover-raw.cpp
+Comment: dvdisaster
+Copyright: 2004-2007 Carsten Gnoerlich
+License: GPL-2+
+
+Files: src/Ym2612_Emu.cpp
+Comment: YM2612
+Copyright: 2002 Stephane Dallongeville
+ 2004-2006 Shay Green
+License: LGPL-2.1+
+
+Files: intl/* m4/* src/gettext.h
+Comment: GNU gettext
+Copyright: 1984, 1989, 1990, 1995-2007 Free Software Foundation, Inc.
+License: LGPL-2+
+
+Files: aclocal.m4 compile config.* configure depcomp INSTALL ltmain.sh
Makefile.in missing
+Comment: autotools files
+Copyright: 1992-2009 Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: install-sh
+Comment: X11 installation tool
+Copyright: 1994 X Consortium
+License: X
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+
+Files: src/string/world_strtod.c
+Copyright: 1991, 1992, 1997, 1999 Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: src/nes/sound/cputest.*
+Comment: DSP Utils
+Copyright: 2000-2002 Fabrice Bellard
+License: LGPL-2+
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in /usr/share/common-licenses/GPL-2
+
+License: GPL-2+
+ 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
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in /usr/share/common-licenses/GPL-2
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in /usr/share/common-licenses/LGPL-2
+
+License: LGPL-2.1+
+ This program 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
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1
+
+License: BSD-Xiph
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/docs b/debian/docs
index 05c398e..c4fb9b2 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
Documentation/*.html
+Documentation/*.txt
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..7e38616
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/patches/series b/debian/patches/series
index 142fdf6..cf1e6be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+use-system-tremor.patch
hardening-fixes.patch
zlib-1.2.6-fix.patch
diff --git a/debian/patches/use-system-tremor.patch
b/debian/patches/use-system-tremor.patch
new file mode 100644
index 0000000..9e65cda
--- /dev/null
+++ b/debian/patches/use-system-tremor.patch
@@ -0,0 +1,62 @@
+Subject: Use packaged libvorbisidec instead of provided copy
+From: Stephen Kitt <st...@sk2.org>
+
+Use the version of tremor available in libvorbisidec-dev instead of
+the source code provided.
+
+--- mednafen.orig/configure.ac
++++ mednafen/configure.ac
+@@ -77,6 +77,10 @@
+ AC_CHECK_LIB([z], [zlibVersion],[], AC_MSG_ERROR([*** zlib not found!]))
+ LIBS="$LIBS -lz"
+
++dnl Check for libvorbisidec (tremor)
++AC_CHECK_LIB([vorbisidec], [ov_read], [], AC_MSG_ERROR([*** libvorbisidec not
found!]))
++LIBS="$LIBS -lvorbisidec"
++
+ dnl -fno-unit-at-a-time
+
+ OPTIMIZER_FLAGS=""
+@@ -415,4 +419,4 @@
+ CPPFLAGS="$LIBCDIO_CFLAGS $SNDFILE_CFLAGS $CPPFLAGS"
+
+ dnl Output Makefiles
+-AC_OUTPUT([Makefile src/Makefile src/tremor/Makefile src/mpcdec/Makefile
src/trio/Makefile src/gb/Makefile src/gba/Makefile src/lynx/Makefile
src/pce/Makefile src/pcfx/Makefile src/sms/Makefile src/wswan/Makefile
src/nes/Makefile src/ngp/Makefile po/Makefile.in intl/Makefile])
++AC_OUTPUT([Makefile src/Makefile src/mpcdec/Makefile src/trio/Makefile
src/gb/Makefile src/gba/Makefile src/lynx/Makefile src/pce/Makefile
src/pcfx/Makefile src/sms/Makefile src/wswan/Makefile src/nes/Makefile
src/ngp/Makefile po/Makefile.in intl/Makefile])
+--- mednafen.orig/src/Makefile.am
++++ mednafen/src/Makefile.am
+@@ -72,9 +72,9 @@
+ endif
+
+ if NEED_CDEMU
+-SUBDIRS += tremor mpcdec
+-mednafen_LDADD += tremor/libvorbisidec.a
mpcdec/libmpcdec.a
+-mednafen_DEPENDENCIES += tremor/libvorbisidec.a mpcdec/libmpcdec.a
++SUBDIRS += mpcdec
++mednafen_LDADD += mpcdec/libmpcdec.a
++mednafen_DEPENDENCIES += mpcdec/libmpcdec.a
+ include cdrom/Makefile.am.inc
+ endif
+
+--- mednafen.orig/src/cdrom/cdromfile.cpp
++++ mednafen/src/cdrom/cdromfile.cpp
+@@ -22,7 +22,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <cdio/cdio.h>
+-#include "../tremor/ivorbisfile.h"
++#include <tremor/ivorbisfile.h>
+ #include <sndfile.h>
+ #include <string.h>
+ #include <errno.h>
+--- mednafen.orig/src/cdrom/cdromfile.h
++++ mednafen/src/cdrom/cdromfile.h
+@@ -1,7 +1,7 @@
+ #ifndef __MDFN_CDROMFILE_H
+ #define __MDFN_CDROMFILE_H
+
+-#include "../tremor/ivorbisfile.h"
++#include <tremor/ivorbisfile.h>
+ #include <mpcdec/mpcdec.h>
+ #include <sndfile.h>
+ #include <stdio.h>
diff --git a/debian/rules b/debian/rules
index d34186e..ff70095 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,39 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+liblzo2_source := $(shell dpkg-query -W -f='$${Source} (= $${source:Version})'
liblzo2-dev)
+
+
%:
- dh $@
+ dh $@ --with autoreconf
+
+override_dh_auto_build:
+ # Update MiniLZO
+ cp src/compress/lzoconf.h src/compress/lzoconf.h.orig
+ cp src/compress/lzodefs.h src/compress/lzodefs.h.orig
+ cp src/compress/minilzo.c src/compress/minilzo.c.orig
+ cp src/compress/minilzo.h src/compress/minilzo.h.orig
+ cp /usr/share/lzo/minilzo/*.[ch] src/compress
+
+ # Move bundled source code for external packages out of the way
+ mv src/tremor src/tremor.orig
+
+ dh_auto_build
+
+override_dh_auto_clean:
+ # Restore MiniLZO
+ [ ! -f src/compress/lzoconf.h.orig ] || mv src/compress/lzoconf.h.orig
src/compress/lzoconf.h
+ [ ! -f src/compress/lzodefs.h.orig ] || mv src/compress/lzodefs.h.orig
src/compress/lzodefs.h
+ [ ! -f src/compress/minilzo.c.orig ] || mv src/compress/minilzo.c.orig
src/compress/minilzo.c
+ [ ! -f src/compress/minilzo.h.orig ] || mv src/compress/minilzo.h.orig
src/compress/minilzo.h
+
+ # Restore bundled source code
+ [ ! -d src/tremor.orig ] || mv src/tremor.orig src/tremor
+
+ dh_auto_clean
override_dh_auto_configure:
dh_auto_configure -- --bindir=/usr/games
+
+override_dh_gencontrol-arch:
+ dh_gencontrol -a -- '-Vbu:liblzo2=$(liblzo2_source)'
--
multi-platform emulator, including NES, GB/A, Lynx, PC Engine
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
