[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.7-1-4-g1e47b33

Stephen Kitt steve at sk2.org
Tue Jun 12 04:41:57 UTC 2012


The following commit has been merged in the master branch:
commit 7ef4b77941ad85a2b167b8f39bd26d9ad7c32f60
Merge: 04465883cf2edf60264f251de4649e7f6f138cee 2c61453bb18c7f9fc51d7f43a1d8ebdb3b310b7a
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Jun 9 11:33:40 2012 +0200

    Merge tag 'upstream/3.7.1'
    
    Upstream version 3.7.1
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 079fe8b,923e52b..b4ccd08
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,230 -1,230 +1,236 @@@
 -stella (3.7.1-1) stable; urgency=high
++stella (3.7.1-1) unstable; urgency=low
+ 
 -  * Version 3.7.1 release
++  * New upstream version.
+ 
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 8 Jun 2012 18:38:25 +0200
++ -- Stephen Kitt <steve at sk2.org>  Sat, 09 Jun 2012 11:33:23 +0200
+ 
 +stella (3.7-1) unstable; urgency=low
  
 -stella (3.7-1) stable; urgency=high
 +  * New upstream version.
 +  * Update description and documentation with new features in 3.7, notably
 +    Blargg TV filters (replacing the filters available in versions 3.4.1
 +    and earlier).
 +  * Switch to debhelper compatibility level 9.
  
 -  * Version 3.7 release
 + -- Stephen Kitt <steve at sk2.org>  Sat, 02 Jun 2012 07:33:16 +0200
  
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 1 Jun 2012 18:38:25 +0200
 +stella (3.6.1-1) unstable; urgency=low
  
 +  * New upstream version.
  
 -stella (3.6.1-1) stable; urgency=high
 + -- Stephen Kitt <steve at sk2.org>  Sat, 31 Mar 2012 10:32:40 +0200
  
 -  * Version 3.6.1 release
 +stella (3.6-1) unstable; urgency=low
  
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 30 Mar 2012 18:38:25 +0200
 +  * New upstream version.
 +  * Update documentation with new features in 3.6, notably CompuMate
 +    emulation and 2600-daptor II support.
 +  * Drop libpng12-dev build-dependency entirely (in favour of
 +    libpng-dev).
  
 + -- Stephen Kitt <steve at sk2.org>  Sat, 17 Mar 2012 23:23:45 +0100
  
 -stella (3.6-1) stable; urgency=high
 +stella (3.5.5-3) unstable; urgency=low
  
 -  * Version 3.6 release
 +  * Allow building with libpng-dev (closes: #662511); stella is known to
 +    build with libpng 1.5 so this shouldn't cause trouble when libpng-
 +    dev switches to 1.5.
 +  * Standards-Version 3.9.3, no change required.
  
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 16 Mar 2012 18:38:25 +0200
 + -- Stephen Kitt <steve at sk2.org>  Tue, 06 Mar 2012 00:08:53 +0100
  
 +stella (3.5.5-2) unstable; urgency=low
  
 -stella (3.5.5-1) stable; urgency=high
 +  * Use maintscript support in dh_installdeb rather than writing out
 +    dpkg-maintscript-helper commands by hand. We now simply Pre-Depend
 +    on a new enough version of dpkg rather than using 'dpkg-maintscript-
 +    helper supports' guards, leading to more predictable behaviour on
 +    upgrades. Thanks to Colin Watson for the patch (closes: #659792).
 +  * Update documentation with last-minute fix from upstream.
  
 -  * Version 3.5.5 release
 + -- Stephen Kitt <steve at sk2.org>  Sun, 19 Feb 2012 00:39:23 +0100
  
 - -- Stephen Anthony <stephena at users.sf.net>  Sat, 4 Feb 2012 18:38:25 +0200
 +stella (3.5.5-1) unstable; urgency=low
  
 +  * New upstream version.
 +  * Rewrite debian/copyright, using DEP-5 and updating for 2012.
 +  * Update manpage.
  
 -stella (3.5-1) stable; urgency=high
 + -- Stephen Kitt <steve at sk2.org>  Sun, 05 Feb 2012 08:09:05 +0100
  
 -  * Version 3.5 release
 +stella (3.5-1) unstable; urgency=low
  
 - -- Stephen Anthony <stephena at users.sf.net>  Thu, 29 Dec 2011 18:38:25 +0200
 +  * New upstream version.
 +  * Drop all patches, merged upstream.
 +  * Update description and manpage (notably, OpenGL-based TV effects are
 +    no longer supported).
  
 + -- Stephen Kitt <steve at sk2.org>  Thu, 29 Dec 2011 23:56:39 +0100
  
 -stella (3.4.1-1) stable; urgency=high
 +stella (3.4.1-2) unstable; urgency=low
  
 -  * Version 3.4.1 release
 +  * Make Stella available in the "Open With Other Applications..." menu
 +    in Gnome (and presumably similar entries in other desktop
 +    environments; LP: #880114).
 +  * Build with gcc 4.6.1 (which identifies itself as gcc 4.6).
  
 - -- Stephen Anthony <stephena at users.sf.net>  Sat, 11 June 2011 18:38:25 +0200
 + -- Stephen Kitt <steve at sk2.org>  Wed, 26 Oct 2011 23:04:32 +0200
  
 +stella (3.4.1-1) unstable; urgency=low
  
 -stella (3.4-1) stable; urgency=high
 +  * New upstream version.
 +  * Update manpage with new features in 3.4.1.
  
 -  * Version 3.4 release
 + -- Stephen Kitt <steve at sk2.org>  Wed, 15 Jun 2011 23:48:31 +0200
  
 - -- Stephen Anthony <stephena at users.sf.net>  Sun, 29 May 2011 18:38:25 +0200
 +stella (3.4-1) unstable; urgency=low
  
 +  * New upstream version.
 +  * Update package description and manpage with new features in 3.4.
 +  * Standards-Version 3.9.2, no change required.
 +  * Drop all patches, merged upstream.
  
 -stella (3.3-1) stable; urgency=high
 + -- Stephen Kitt <steve at sk2.org>  Mon, 30 May 2011 07:02:40 +0200
  
 -  * Version 3.3 release
 +stella (3.3-2) unstable; urgency=low
  
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 12 Nov 2010 18:38:25 +0200
 +  * Upload to unstable.
 +  * Drop explicit quilt usage and dependency since we're using format 3.0
 +    (quilt).
  
 + -- Stephen Kitt <steve at sk2.org>  Thu, 10 Mar 2011 17:38:47 +0100
  
 -stella (3.2.1-1) stable; urgency=high
 +stella (3.3-1) experimental; urgency=low
  
 -  * Version 3.2.1 release
 +  * New upstream version.
  
 - -- Stephen Anthony <stephena at users.sf.net>  Wed, 25 Aug 2010 18:38:25 +0200
 + -- Stephen Kitt <steve at sk2.org>  Mon, 15 Nov 2010 21:59:47 +0100
  
 +stella (3.2.2-1) experimental; urgency=low
  
 -stella (3.2-1) stable; urgency=high
 +  * New upstream version.
 +  * Avoid requiring MAXPATHLEN (to build on hurd).
  
 -  * Version 3.2 release
 + -- Stephen Kitt <steve at sk2.org>  Sat, 06 Nov 2010 09:57:32 +0100
  
 - -- Stephen Anthony <stephena at users.sf.net>  Fri 20 Aug 2010 18:38:25 +0200
 +stella (3.2.1-1) experimental; urgency=low
  
 +  * New upstream version.
 +  * Change debian-menus to scan ~/.stella/roms rather than ~/.stella.
 +  * Avoid having to run configure when cleaning (thanks to Piotr Ożarowski
 +    for suggesting these two changes!).
 +  * Fix debian-menus to start /usr/bin/stella, not /usr/games/stella.
 +  * Remove debian/dirs, it is not needed.
 +  * Support building on kfreebsd and hurd.
 +  * /etc/stella.pro is no longer shipped; remove it if it's still present
 +    (and unchanged), and stop using it in debian-menus.
  
 -stella (3.1.2-1) stable; urgency=high
 + -- Stephen Kitt <steve at sk2.org>  Sat, 04 Sep 2010 23:23:34 +0200
  
 -  * Version 3.1.2 release
 +stella (3.2-1) experimental; urgency=low
  
 - -- Stephen Anthony <stephena at users.sf.net>  Mon, 3 May 2010 18:38:25 +0200
 +  * New upstream version.
 +  * Update libpng dependency.
 +  * Standards-Version 3.9.1, no change required.
 +  * This release isn't intended for squeeze, uploaded to experimental
 +    for now.
  
 + -- Stephen Kitt <steve at sk2.org>  Mon, 23 Aug 2010 08:16:19 +0200
  
 -stella (3.1.1-1) stable; urgency=high
 +stella (3.1.2-1) unstable; urgency=low
  
 -  * Version 3.1.1 release
 +  * New maintainer (closes: #532039).
 +  * New upstream version (closes: #461121):
 +    - includes launcher (closes: #396058).
 +  * Fix the reference to the X Window System in the description (closes:
 +    #411815).
 +  * Move to main, DFSG-free ROMs are available (see README.Debian).
 +  * Enhance the package description.
 +  * Drop the libslang2-dev dependency (closes: #560274).
 +  * Remove the Encoding entry from stella.desktop.
 +  * Avoid ignoring errors when cleaning.
 +  * Add ${misc:Depends} to the package dependencies.
 +  * Provide a doc-base file to install the documentation using doc-base.
 +  * Switch to debhelper 7 with a simplified rules file.
 +  * Use autotools-dev to provide updated configuration files.
 +  * Update to Standards-Version 3.9.0:
 +    - Move to menu section Applications/Emulators.
 +    - Move the homepage declaration.
 +  * Re-write the manpage.
  
 - -- Stephen Anthony <stephena at users.sf.net>  Mon, 26 April 2010 18:38:25 +0200
 + -- Stephen Kitt <steve at sk2.org>  Mon, 12 Jul 2010 23:49:36 +0200
  
 +stella (2.2-1.1) unstable; urgency=low
  
 -stella (3.1-1) stable; urgency=high
 +  * Non-maintainer upload.
 +  * Add missing cstring include in src/emucore/Cart.cxx
 +    to fix FTBFS. (Closes: #477283)
  
 -  * Version 3.1 release
 + -- Kumar Appaiah <akumar at debian.org>  Mon, 05 May 2008 08:29:19 +0530
  
 - -- Stephen Anthony <stephena at users.sf.net>  Thu, 22 April 2010 18:38:25 +0200
 +stella (2.2-1) unstable; urgency=low
  
 +  * New Maintainer (Closes: #361345)
 +  * New upstream release (Closes: #349725)
 +  * Build-Depend now on libslang2-dev (Closes: #325577)
 +  * Complete rebuild of debian/, upgraded to policy-standards
 +    3.6.2 and compat-level 5.
 +  * Removed stellarc since stella only reads ~/.stellarc and even
 +    works without a first config.
 +  * New debian/watch file.
  
 -stella (3.0-1) stable; urgency=high
 + -- Mario Iseli <admin at marioiseli.com>  Sat, 08 Apr 2006 18:38:25 +0200
  
 -  * Version 3.0 release
 +stella (1.4.1-1) unstable; urgency=low
  
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 11 September 2009 18:38:25 +0200
 +  * Added debian-menus script to create menu files based on rom images. 
 +  * New upstream release.
 +  * This Release and 1.2-1.2 NMU (Closes: #174998, #190958, #262493, #263406)
  
 + -- Tom Lear <tom at trap.mtview.ca.us>  Sun, 22 Aug 2004 17:30:41 -0700
  
 -stella (2.8.4-1) stable; urgency=high
 +stella (1.2-1.2) unstable; urgency=high
  
 -  * Version 2.8.4 release
 +  * NMU
 +  * debian/control: Removed Build-Depends: libstdc++5-dev (Closes: #262493)
  
 - -- Stephen Anthony <stephena at users.sf.net>  Thu, 4 July 2009 18:38:25 +0200
 + -- Frank Lichtenheld <djpig at debian.org>  Sat, 21 Aug 2004 17:00:21 +0200
  
 +stella (1.2-1.1) unstable; urgency=low
  
 -stella (2.8.3-1) stable; urgency=low
 +  * Non-maintainer upload
 +  * debian/control: Removed Build-Depends: svgalibg1-dev (Closes: #190958)
  
 -  * Version 2.8.3 release
 + -- Roland Stigge <stigge at antcom.de>  Sun,  7 Sep 2003 14:03:36 +0200
  
 - -- Stephen Anthony <stephena at users.sf.net>  Thu, 25 June 2009 18:38:25 +0200
 +stella (1.2-1) unstable; urgency=low
  
 +  * New upstream release. -- Closes #179753, #180204, #180670
  
 -stella (2.8.2-1) stable; urgency=low
 + -- Tom Lear <tom at trap.mtview.ca.us>  Wed, 12 Feb 2003 12:11:40 -0800
  
 -  * Version 2.8.2 release
 +stella (1.1-2) unstable; urgency=low
  
 - -- Stephen Anthony <stephena at users.sf.net>  Tue, 23 June 2009 18:38:25 +0200
 +  * Fixed dependancy problem
  
 + -- Tom Lear <tom at trap.mtview.ca.us>  Sat,  6 Nov 1999 16:41:05 -0800
  
 -stella (2.8.1-1) stable; urgency=low
 +stella (1.1-1) unstable; urgency=low
  
 -  * Version 2.8.1 release
 +  * New upstream release. -- Closes #29038, #36141
  
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 19 June 2009 18:38:25 +0200
 + -- Tom Lear <tom at trap.mountain-view.ca.us>  Tue,  1 Jun 1999 16:53:48 -0700
  
 +stella (0.7-2) frozen; urgency=low
  
 -stella (2.8-1) stable; urgency=low
 +  * Moved to non-free
  
 -  * Version 2.8 release
 + -- Tom Lear <tom at trap.mountain-view.ca.us>  Wed, 29 Apr 1998 17:11:13 -0700
  
 - -- Stephen Anthony <stephena at users.sf.net>  Mon, 8 June 2009 18:38:25 +0200
 +stella (0.7-1) unstable; urgency=low
  
 +  * Initial Release.
  
 -stella (2.7.7-1) stable; urgency=low
 + -- Tom Lear <lear at debian.org>  Mon, 19 Jan 1998 22:06:49 -0800
  
 -  * Version 2.7.7 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 1 May 2009 18:38:25 +0200
 -
 -
 -stella (2.7.6-1) stable; urgency=low
 -
 -  * Version 2.7.6 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Tue, 14 Apr 2009 18:38:25 +0200
 -
 -
 -stella (2.7.5-1) stable; urgency=low
 -
 -  * Version 2.7.5 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 27 Mar 2009 18:38:25 +0200
 -
 -
 -stella (2.7.3-1) stable; urgency=low
 -
 -  * Version 2.7.3 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Mon, 09 Feb 2009 18:38:25 +0200
 -
 -
 -stella (2.7.2-1) stable; urgency=low
 -
 -  * Version 2.7.2 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Tue, 27 Jan 2009 18:38:25 +0200
 -
 -
 -stella (2.7.1-1) stable; urgency=low
 -
 -  * Version 2.7.1 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Mon, 26 Jan 2009 18:38:25 +0200
 -
 -
 -stella (2.7-1) stable; urgency=low
 -
 -  * Version 2.7 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Sat, 17 Jan 2009 18:38:25 +0200
 -
 -
 -stella (2.6.1-1) stable; urgency=low
 -
 -  * Version 2.6.1 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Thu, 22 May 2008 18:38:25 +0200
 -
 -
 -stella (2.6-1) stable; urgency=low
 -
 -  * Version 2.6 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 16 May 2008 18:38:25 +0200
 -
 -
 -stella (2.5.1-1) stable; urgency=low
 -
 -  * Version 2.5.1 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Wed, 9 Apr 2008 18:38:25 +0200
 -
 -
 -stella (2.5-1) stable; urgency=low
 -
 -  * Version 2.5 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Fri, 28 Mar 2008 18:38:25 +0200
 -
 -
 -stella (2.4.2-1) stable; urgency=low
 -
 -  * Version 2.4.2 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Mon, 17 Sep 2007 18:38:25 +0200
 -
 -
 -stella (2.4.1-1) stable; urgency=low
 -
 -  * Version 2.4.1 release
 -
 - -- Stephen Anthony <stephena at users.sf.net>  Mon, 27 Aug 2007 18:38:25 +0200
  

-- 
Atari 2600 Emulator for SDL & the X Window System



More information about the Pkg-games-commits mailing list