This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository mednaffe.
commit 7b1dce048b2a2f0bc463607d4536dd73d1e62f91 Author: Stephen Kitt <[email protected]> Date: Tue Nov 22 23:23:15 2016 +0100 New upstream release, merging spelling-fixes.patch --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/copyright | 12 ------------ debian/patches/series | 1 - debian/patches/spelling-fixes.patch | 21 --------------------- 5 files changed, 8 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6c237e..e3a12ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mednaffe (0.8.3-1) UNRELEASED; urgency=medium + + * New upstream release, supporting Mednafen 0.9.39.1 and later, merging + spelling-fixes.patch. + + -- Stephen Kitt <[email protected]> Tue, 22 Nov 2016 23:03:00 +0100 + mednaffe (0.8-2) unstable; urgency=medium * Depend on Mednafen... diff --git a/debian/control b/debian/control index 1f43fcc..c484a48 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends}, - mednafen + mednafen (>= 0.9.39.1) Description: front-end for the Mednafen multi-system emulator Mednaffe is a graphical front-end for the Mednafen multi-system emulator. It allows all of Mednafen's options to be configured, and diff --git a/debian/copyright b/debian/copyright index 104ac56..00387f9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -59,18 +59,6 @@ License: GPL-2.0+ 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: share/Makefile -Copyright: 1994-2013 Free Software Foundation, Inc. -License: permissive - This Makefile.in is free software; the Free Software Foundation - gives unlimited permission to copy and/or distribute it, - with or without modifications, as long as this notice is preserved. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY, to the extent permitted by law; without - even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. - Files: debian/* Copyright: 2016 Stephen Kitt License: GPL-3.0+ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 965a000..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -spelling-fixes.patch diff --git a/debian/patches/spelling-fixes.patch b/debian/patches/spelling-fixes.patch deleted file mode 100644 index 3634819..0000000 --- a/debian/patches/spelling-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 59f48f01736805bd664295292f5742eb067435fc -Author: Stephen Kitt <[email protected]> -Date: Sun Jul 31 21:04:30 2016 +0200 - - Grammar fix: "catched" -> "caught" - - Signed-off-by: Stephen Kitt <[email protected]> - -diff --git a/src/command.c b/src/command.c -index ad19bb4..d0f8ba5 100644 ---- a/src/command.c -+++ b/src/command.c -@@ -226,7 +226,7 @@ void child_watch(GPid pid, gint status, guidata *gui) - "keyinputbutton")), TRUE); - - print_log("----\n", EMU, gui); -- print_log("End of execution catched.\n", FE|EMU, gui); -+ print_log("End of execution caught.\n", FE|EMU, gui); - } - - #ifdef G_OS_WIN32 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednaffe.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
