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

2012-06-11 Thread Stephen Kitt
The following commit has been merged in the master branch:
commit 1e47b3303414397a353628988fcfac3d2277c792
Merge: 7ef4b77941ad85a2b167b8f39bd26d9ad7c32f60 
f6d25c4fbee8095cbbba0820f6c1a55a2485d08e
Author: Stephen Kitt st...@sk2.org
Date:   Mon Jun 11 17:28:41 2012 +0200

Merge tag 'upstream/3.7.2'

Upstream version 3.7.2

Conflicts:
debian/changelog

diff --combined debian/changelog
index b4ccd08,17544cc..01ca0ed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,236 -1,237 +1,242 @@@
 -stella (3.7.2-1) stable; urgency=high
++stella (3.7.2-1) unstable; urgency=low
+ 
 -  * Version 3.7.2 release
++  * New upstream version.
+ 
 - -- Stephen Anthony steph...@users.sf.net  Sun, 10 Jun 2012 18:38:25 +0200
++ -- Stephen Kitt st...@sk2.org  Mon, 11 Jun 2012 17:28:16 +0200
+ 
 +stella (3.7.1-1) unstable; urgency=low
  
 -stella (3.7.1-1) stable; urgency=high
 +  * New upstream version.
  
 -  * Version 3.7.1 release
 + -- Stephen Kitt st...@sk2.org  Sat, 09 Jun 2012 11:33:23 +0200
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 8 Jun 2012 18:38:25 +0200
 +stella (3.7-1) unstable; urgency=low
  
 +  * 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.
  
 -stella (3.7-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Sat, 02 Jun 2012 07:33:16 +0200
  
 -  * Version 3.7 release
 +stella (3.6.1-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 1 Jun 2012 18:38:25 +0200
 +  * New upstream version.
  
 + -- Stephen Kitt st...@sk2.org  Sat, 31 Mar 2012 10:32:40 +0200
  
 -stella (3.6.1-1) stable; urgency=high
 +stella (3.6-1) unstable; urgency=low
  
 -  * Version 3.6.1 release
 +  * 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 Anthony steph...@users.sf.net  Fri, 30 Mar 2012 18:38:25 +0200
 + -- Stephen Kitt st...@sk2.org  Sat, 17 Mar 2012 23:23:45 +0100
  
 +stella (3.5.5-3) unstable; urgency=low
  
 -stella (3.6-1) stable; urgency=high
 +  * 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.
  
 -  * Version 3.6 release
 + -- Stephen Kitt st...@sk2.org  Tue, 06 Mar 2012 00:08:53 +0100
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 16 Mar 2012 18:38:25 +0200
 +stella (3.5.5-2) unstable; urgency=low
  
 +  * 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.
  
 -stella (3.5.5-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Sun, 19 Feb 2012 00:39:23 +0100
  
 -  * Version 3.5.5 release
 +stella (3.5.5-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Sat, 4 Feb 2012 18:38:25 +0200
 +  * New upstream version.
 +  * Rewrite debian/copyright, using DEP-5 and updating for 2012.
 +  * Update manpage.
  
 + -- Stephen Kitt st...@sk2.org  Sun, 05 Feb 2012 08:09:05 +0100
  
 -stella (3.5-1) stable; urgency=high
 +stella (3.5-1) unstable; urgency=low
  
 -  * Version 3.5 release
 +  * New upstream version.
 +  * Drop all patches, merged upstream.
 +  * Update description and manpage (notably, OpenGL-based TV effects are
 +no longer supported).
  
 - -- Stephen Anthony steph...@users.sf.net  Thu, 29 Dec 2011 18:38:25 +0200
 + -- Stephen Kitt st...@sk2.org  Thu, 29 Dec 2011 23:56:39 +0100
  
 +stella (3.4.1-2) unstable; urgency=low
  
 -stella (3.4.1-1) stable; urgency=high
 +  * 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).
  
 -  * Version 3.4.1 release
 + -- Stephen Kitt st...@sk2.org  Wed, 26 Oct 2011 23:04:32 +0200
  
 - -- Stephen Anthony steph...@users.sf.net  Sat, 11 June 2011 18:38:25 +0200
 +stella (3.4.1-1) unstable; urgency=low
  
 +  * New upstream version.
 +  * Update manpage with new features in 3.4.1.
  
 -stella (3.4-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Wed, 15 Jun 2011 23:48:31 +0200
  
 -  * Version 3.4 release
 +stella (3.4-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Sun, 29 May 2011 18:38:25 +0200
 +  * New upstream version.
 +  * Update package description and 

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

2012-06-11 Thread Stephen Kitt
The following commit has been merged in the master branch:
commit 7ef4b77941ad85a2b167b8f39bd26d9ad7c32f60
Merge: 04465883cf2edf60264f251de4649e7f6f138cee 
2c61453bb18c7f9fc51d7f43a1d8ebdb3b310b7a
Author: Stephen Kitt st...@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 steph...@users.sf.net  Fri, 8 Jun 2012 18:38:25 +0200
++ -- Stephen Kitt st...@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 st...@sk2.org  Sat, 02 Jun 2012 07:33:16 +0200
  
 - -- Stephen Anthony steph...@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 st...@sk2.org  Sat, 31 Mar 2012 10:32:40 +0200
  
 -  * Version 3.6.1 release
 +stella (3.6-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@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 st...@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 steph...@users.sf.net  Fri, 16 Mar 2012 18:38:25 +0200
 + -- Stephen Kitt st...@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 st...@sk2.org  Sun, 19 Feb 2012 00:39:23 +0100
  
 - -- Stephen Anthony steph...@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 st...@sk2.org  Sun, 05 Feb 2012 08:09:05 +0100
  
 -  * Version 3.5 release
 +stella (3.5-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@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 st...@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 steph...@users.sf.net  Sat, 11 June 2011 18:38:25 +0200
 + -- Stephen Kitt st...@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 st...@sk2.org  Wed, 15 Jun 2011 23:48:31 +0200
  
 - -- Stephen Anthony steph...@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 st...@sk2.org  Mon, 30 May 2011 07:02:40 +0200
  
 -  * Version 3.3 release
 +stella (3.3-2) unstable;