[stella] 04/06: New upstream version.

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository stella.

commit 290da11f3e917f64f19a08bd213af1a340cc38d8
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Feb 15 16:35:55 2016 +0100

    New upstream version.
---
 debian/changelog                  |  5 +++--
 debian/copyright                  | 21 +++++++++++++++++++++
 debian/patches/spelling-fix.patch |  2 +-
 debian/stella.6                   |  7 ++++++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 009d888..340584b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-stella (4.7-2) UNRELEASED; urgency=medium
+stella (4.7.1-1) UNRELEASED; urgency=medium
 
+  * New upstream version.
   * Make debian/watch more generic.
 
- -- Stephen Kitt <skitt at debian.org>  Mon, 15 Feb 2016 15:44:47 +0100
+ -- Stephen Kitt <skitt at debian.org>  Mon, 15 Feb 2016 16:27:42 +0100
 
 stella (4.7-1) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 3db58ad..2a0be5e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -116,6 +116,27 @@ Files: src/macosx/*
 Copyright: 2005-2006 Mark Grebe
 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 Jean-loup Gailly and Mark Adler
 License: zlib
diff --git a/debian/patches/spelling-fix.patch b/debian/patches/spelling-fix.patch
index ae44314..09bf605 100644
--- a/debian/patches/spelling-fix.patch
+++ b/debian/patches/spelling-fix.patch
@@ -3,7 +3,7 @@ Author: Stephen Kitt <skitt at debian.org>
 
 --- a/src/emucore/Settings.cxx
 +++ b/src/emucore/Settings.cxx
-@@ -524,7 +524,7 @@
+@@ -530,7 +530,7 @@
        << ";  Format MUST be as follows:" << endl
        << ";    command = value" << endl
        << ";" << endl
diff --git a/debian/stella.6 b/debian/stella.6
index 00e2cc5..6f8510e 100644
--- a/debian/stella.6
+++ b/debian/stella.6
@@ -98,7 +98,12 @@ Blargg TV effects scanline interpolation, resulting in
 blending/smoothing of the scanlines.
 .TP
 .BR \-tv.jitter " <" 1 | 0 >
-TV scanline jittering emulation.
+Enable or disable TV jitter/roll effect, when there are too many or
+too few scanlines per frame.
+.TP
+.BR \-tv.jitter_recovery " <" 1 \- 20 >
+When TV jitter/roll effect is enabled, determines how long to delay
+recovery time (recovery spread over multiple frames).
 .TP
 .BR \-tv.contrast " <\fInumber\fP>"
 Blargg TV effects 'contrast' (only available in custom mode, range

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git