From c120d345e4fcb682fa44991236362dde65471e61 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Sat, 7 Nov 2020 15:33:12 +0100 Subject: [PATCH] Sync the Debian packaging from Debian ... preserving the ability to build on Debian 9 (Stretch). Signed-off-by: Stephen Kitt --- debian/compat | 2 +- debian/control | 42 ++++++--- debian/copyright | 216 ++++++++++++++++++++++++++++++++++++++++++----- debian/dirs | 1 - debian/doc-base | 9 ++ debian/rules | 77 ++++------------- debian/watch | 6 +- 7 files changed, 260 insertions(+), 93 deletions(-) delete mode 100644 debian/dirs create mode 100644 debian/doc-base diff --git a/debian/compat b/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 4d19b476f..9106212fe 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,39 @@ Source: stella -Section: games -Priority: optional Maintainer: Stephen Anthony -Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 5.0.0), libsdl2-dev, libpng-dev +Section: otherosfs +Priority: optional +Build-Depends: debhelper (>= 10~), + libpng-dev, + libsdl2-dev, + zlib1g-dev +Standards-Version: 4.5.0 +Vcs-Browser: https://github.com/stella-emu/stella/ +Vcs-Git: https://github.com/stella-emu/stella.git +Homepage: https://stella-emu.github.io +Rules-Requires-Root: no Package: stella Architecture: any -Depends: ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} +Recommends: joystick (>= 1:1.5.1) +Pre-Depends: ${misc:Pre-Depends} Description: Atari 2600 Emulator for SDL2 - The Atari 2600 Video Computer System (VCS), introduced in 1977, was - the most popular home video game system of the early 1980's. This - emulator will run most Atari ROM images, so that you can play your - favorite old Atari 2600 games on your PC. + Stella is a portable emulator of the old Atari 2600 video-game + console. You can play most Atari 2600 games with it. . - Homepage: https://stella-emu.github.io + Stella's features include: + * emulation of Atari 2600 joysticks, keyboards, paddles and driving + controllers using the host system's input peripherals; + * emulation of trackballs, joysticks, booster grips, driving + controllers and the Amiga Mouse using the host system's mouse; + * support for real Atari 2600 controllers using the Stelladaptor, + 2600-daptor or 2600-daptor II; + * support for real Atari 7800 controllers using the 2600-daptor II; + * support for the speech portion of a real AtariVox device; + * support for Supercharger single-load and multi-load games; + * emulation of CRT TV features, including texturing, colour bleed, + RF noise and phosphor burn-off (requires OpenGL). + . + An extensive debugger is included, with the Distella disassembler. + diff --git a/debian/copyright b/debian/copyright index 129ab1224..9658cf4e9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,29 +1,205 @@ -This package was debianized first by Tom Lear on -Thu, 7 Oct 1999 08:57:16 -0700. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Upstream-Name: stella +Source: https://stella-emu.github.io +Copyright: 1995-2020 Bradford W. Mott, Stephen Anthony and the Stella Team +License: GPL-2+ -It was downloaded from +Files: * +Copyright: 1995-2020 Bradford W. Mott, Stephen Anthony and the Stella + Team +License: GPL-2+ -Copyright Holder(s): Bradford W. Mott and the Stella Team +Files: debian/* +Copyright: 1998-2004 Tom Lear + 2006 Mario Iseli + 2010-2020 Stephen Kitt +License: GPL-2+ -License: +Files: + src/common/Stack.hxx + src/emucore/FrameBuffer.hxx + src/emucore/FSNode.* + src/gui/* +Copyright: 2002-2004 The ScummVM project +License: GPL-2+ - Copyright (C) 1995-2010 Bradford W. Mott - and the Stella Team +Files: src/common/ZipHandler.hxx +Copyright: Aaron Giles +License: BSD-3 + 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 'MAME' 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 AARON GILES ''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 AARON GILES 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. - 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. +Files: src/emucore/MD5.cxx +Copyright: 1991-1992, RSA Data Security, Inc. +License: RSA + License to copy and use this software is granted provided that it is + identified as the "RSA Data Security, Inc. MD5 Message-Digest + Algorithm" in all material mentioning or referencing this software or + this function. + . + License is also granted to make and use derivative works provided + that such works are identified as "derived from the RSA Data + Security, Inc. MD5 Message-Digest Algorithm" in all material + mentioning or referencing the derived work. + . + RSA Data Security, Inc. makes no representations concerning either + the merchantability of this software or the suitability of this + software for any particular purpose. It is provided "as is" without + express or implied warranty of any kind. + . + These notices must be retained in any copies of any part of this + documentation and/or software. - 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. +Files: src/libpng/* +Copyright: 1995-1996 Guy Eric Schalnat, Group 42, Inc. + 1996-1997 Andreas Dilger + 1998-2013 Glenn Randers-Pehrson +License: libpng + 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. + . + There is no warranty against interference with your enjoyment of the + library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is + with the user. - 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 +Files: src/libretro/libretro.h +Copyright: 2010-2017 The RetroArch team +License: MIT + 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 AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Files: src/macos/* +Copyright: 2005-2006 Mark Grebe +License: GPL-2+ +Files: src/tools/convbdf.c +Copyright: 2002 Greg Haerr +License: GPL-2+ + +Files: src/tools/evdev-joystick/* +Copyright: 2016 Stephen Anthony +License: GPL-2 + This package 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 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'. + +Files: src/zlib/* +Copyright: 1995-2012, 2016 Jean-loup Gailly and Mark Adler +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. + +License: GPL-2+ + 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'. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index e77248175..000000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/bin diff --git a/debian/doc-base b/debian/doc-base new file mode 100644 index 000000000..dd94cd309 --- /dev/null +++ b/debian/doc-base @@ -0,0 +1,9 @@ +Document: stella +Title: Stella Manual +Author: The Stella Team +Abstract: Documentation for the Stella Atari 2600 VCS emulator. +Section: Emulators + +Format: HTML +Index: /usr/share/doc/stella/index.html +Files: /usr/share/doc/stella/*.html diff --git a/debian/rules b/debian/rules index 2e9b442c1..8277e8a69 100755 --- a/debian/rules +++ b/debian/rules @@ -4,67 +4,26 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -CFLAGS = -Wall +include /usr/share/dpkg/architecture.mk +DPKG_EXPORT_BUILDTOOLS=1 +-include /usr/share/dpkg/buildtools.mk -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CXXFLAGS += -O0 -else - CXXFLAGS += -O2 -endif +%: + dh $@ --with autotools_dev -config.status: configure - dh_testdir - CXXFLAGS="$(CXXFLAGS)" ./configure --prefix=/usr --enable-release +override_dh_auto_clean: +# Generate the minimal config.mak required for "make distclean" + test -f config.mak || echo "RM_REC := rm -f -r" > config.mak + dh_auto_clean -build: build-stamp +override_dh_auto_configure: + ./configure --prefix=/usr $(if $(filter $(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)),,--host=$(DEB_HOST_GNU_TYPE)) --enable-release -build-stamp: config.status - dh_testdir - $(MAKE) - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - -$(MAKE) distclean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/stella - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs Changes.txt - dh_installdocs - dh_installmenu -# dh_installman $(CURDIR)/debian/stella.6 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_install: + dh_auto_install + # This is also installed as the upstream changelog + rm $(CURDIR)/debian/stella/usr/share/doc/stella/Changes.txt + # This is overridden by the copyright file + rm $(CURDIR)/debian/stella/usr/share/doc/stella/License.txt diff --git a/debian/watch b/debian/watch index 8cdd8c1ec..b507d13a8 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,4 @@ -version=3 -http://sf.net/stella/stella-(.*)-src\.tar\.gz +version=4 +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%stella-$1.tar.gz%" \ + https://github.com/stella-emu/stella/tags \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate