[mupen64plus-ui-python] 01/01: Import package from https://launchpad.net/~random-stuff/

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Wed Dec 16 14:39:50 UTC 2015 

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-ui-python.

commit 7f4cb9b7d387e2cfcac6b2f1dfe0c823b8b38891
Author: Sérgio Benjamim <sergio_br2 at yahoo.com.br>
Date:   Tue May 5 16:52:00 2015 -0300

    Import package from https://launchpad.net/~random-stuff/
---
 debian/changelog                                   |  2 +-
 debian/control                                     | 43 +++++++++++++---------
 debian/copyright                                   |  5 ++-
 .../patches/Disable-the-SDL2-detection-hack.patch  |  2 +
 debian/patches/UnicodeDecodeError-corrected.patch  | 24 ++++++++++++
 ...-PySDL2-bindings-from-package-python-sdl2.patch |  4 +-
 .../Use-XDG-icons-from-user-theme-theme.patch      |  2 +
 debian/patches/fix-QKeySequence-crash.patch        | 30 +++++++++++++++
 debian/patches/series                              |  2 +
 debian/rules                                       |  4 +-
 10 files changed, 94 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74caf19..60dfede 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ mupen64plus-ui-python (0.2.3-0r0) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #678947)
 
- -- Sven Eckelmann <sven at narfation.org>  Sun, 29 Sep 2013 08:24:23 +0200
+ -- Sérgio Benjamim <sergio_br2 at yahoo.com.br>  Tue, 05 May 2015 16:52:00 -0300
diff --git a/debian/control b/debian/control
index 012a4b0..b68224c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,25 +3,24 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders:
- Sven Eckelmann <sven at narfation.org>,
- Tobias Loose <TobiasLoose at gmx.de>,
+ Sérgio Benjamim <sergio_br2 at yahoo.com.br>,
 Standards-Version: 3.9.6
 Homepage: http://m64py.sourceforge.net/
-Vcs-Git: git://anonscm.debian.org/pkg-games/m64py.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/m64py.git
+Vcs-Git: git://anonscm.debian.org/pkg-games/mupen64plus-ui-python.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/mupen64plus-ui-python.git
 Build-Depends:
  debhelper (>= 9),
  dh-python,
- python | python-all | python-dev | python-all-dev,
- python-qt4,
- pyqt4-dev-tools,
-X-Python-Version: >= 2.5
+ python3,
+ python3-pyqt5,
+ pyqt5-dev-tools,
+X-Python3-Version: >= 3.4
 
 Package: m64py
 Architecture: all
 Depends:
  ${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
  mupen64plus-audio-all | mupen64plus-audio,
  mupen64plus-config-abi-2.2,
  mupen64plus-data,
@@ -29,20 +28,28 @@ Depends:
  mupen64plus-input-all | mupen64plus-input,
  mupen64plus-rsp-all | mupen64plus-rsp,
  mupen64plus-video-all | mupen64plus-video,
- python-lzma,
- python-opengl,
- python-qt4,
- python-qt4-gl,
- python-sdl2,
+ python3-opengl,
+ python3-pyqt5,
+ python3-pyqt5.qtopengl,
+ python3-pyqt5.qtsvg,
+ python3-sdl2,
 Provides:
  mupen64plus-ui,
 Recommends:
- python-dbus,
+ python3-dbus,
+ p7zip,
  unrar,
 Description: Python based graphical frontend for mupen64plus
- Graphical user interface for mupen64plus. Features provided:
+ M64Py is a Qt5 front-end (GUI) for Mupen64Plus 2.0, a cross-platform
+ plugin-based Nintendo 64 emulator. M64Py is written in Python and it
+ provides a user-friendly interface over Mupen64Plus shared library.
+ .
+ Features:
   * Changeable emulation plugins for audio, core, input, rsp, video
   * Selection of emulation core
   * Configuration dialogs for core, plugin and input settings
-  * Cheat database support
-  * Loading of compressed and uncompressed roms
+  * ROMs list
+  * Input bindings configuration
+  * Cheats support
+  * Support gzip, bzip2, zip, rar and 7z archives
+  * Video extension (embedded OpenGL window)
diff --git a/debian/copyright b/debian/copyright
index b71b219..edad72a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -69,7 +69,6 @@ License: LGPL-2.1+
  file.
 
 Files: src/m64p/SDL2/*
-Files: *
 Copyright: 2012-2014, Marcus von Appen <marcus at sysfault.org>
            2012-2014, Steven Johnson
            2012-2014, Marcel Rodrigues
@@ -157,8 +156,10 @@ License: public-domain
  [0] http://creativecommons.org/licenses/publicdomain/
 
 Files: debian/*
-Copyright: 2013-2015, Sven Eckelmann <sven at narfation.org>
+Copyright: 2012, Milan Nikolic <gen2brain at gmail.com>
+           2013-2015, Sven Eckelmann <sven at narfation.org>
            2013-2015, Tobias Loose <TobiasLoose at gmx.de>
+           2015, Sérgio Benjamim <sergio_br2 at yahoo.com.br>
 License: GPL-3+
 
 Files: src/m64py/ui/images/controller.svg
diff --git a/debian/patches/Disable-the-SDL2-detection-hack.patch b/debian/patches/Disable-the-SDL2-detection-hack.patch
index 7bafddf..d3db65a 100644
--- a/debian/patches/Disable-the-SDL2-detection-hack.patch
+++ b/debian/patches/Disable-the-SDL2-detection-hack.patch
@@ -4,6 +4,8 @@ Subject: Disable the SDL2 detection hack
 
 The version of mupen64plus-core in Debian is compiled against SDL2
 it is unnecessary to use this binutils hack to guess the SDL version.
+
+Forwarded: not-needed
 ---
  src/m64py/core/core.py | 8 +-------
  src/m64py/opts.py      | 4 ++--
diff --git a/debian/patches/UnicodeDecodeError-corrected.patch b/debian/patches/UnicodeDecodeError-corrected.patch
new file mode 100644
index 0000000..86147be
--- /dev/null
+++ b/debian/patches/UnicodeDecodeError-corrected.patch
@@ -0,0 +1,24 @@
+From: milseg <mltnczr at gmail.com>
+Date: Thu, 14 May 2015 23:27:05 -0300
+Subject: UnicodeDecodeError corrected
+
+I've got an UnicodeDecode error for the ascii codec while logging a message while running m64py on Ubuntu versions 14.04+. Adding two lines corrected the problem
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-ui-python/commit/837ab480eb8249f7f7ccfd3db877991d027678a6
+---
+ src/m64py/core/core.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/m64py/core/core.py b/src/m64py/core/core.py
+index 8039e7a..5db9bf5 100644
+--- a/src/m64py/core/core.py
++++ b/src/m64py/core/core.py
+@@ -224,6 +224,8 @@ class Core:
+                     plugin_handle, plugin_path, PLUGIN_NAME[plugin_type], plugin_desc, plugin_version)
+         except OSError as e:
+             log.debug("plugin_load_try()")
++            plugin_path = plugin_path.decode('ascii', 'ignore')
++            plugin_path = plugin_path.encode('ascii')
+             log.error("failed to load plugin %s: %s" % (plugin_path, e))
+ 
+     def plugin_startup(self, handle, name, desc):
diff --git a/debian/patches/Use-PySDL2-bindings-from-package-python-sdl2.patch b/debian/patches/Use-PySDL2-bindings-from-package-python-sdl2.patch
index e000622..640d34f 100644
--- a/debian/patches/Use-PySDL2-bindings-from-package-python-sdl2.patch
+++ b/debian/patches/Use-PySDL2-bindings-from-package-python-sdl2.patch
@@ -1,10 +1,12 @@
 From: Sven Eckelmann <sven at narfation.org>
 Date: Sat, 21 Dec 2013 19:57:19 +0100
-Subject: Use PySDL2 bindings from package python-sdl2
+Subject: Use PySDL2 bindings from package python3-sdl2
 
 The ctypes wrapper for SDL2 is packaged under debian as python-sdl2. m64py
 should therefore use this package to avoid duplicate source inside debian
 packages.
+
+Forwarded: no
 ---
  setup.py                       |  2 +-
  src/m64py/core/vidext.py       |  4 ++--
diff --git a/debian/patches/Use-XDG-icons-from-user-theme-theme.patch b/debian/patches/Use-XDG-icons-from-user-theme-theme.patch
index 9334152..07d34e7 100644
--- a/debian/patches/Use-XDG-icons-from-user-theme-theme.patch
+++ b/debian/patches/Use-XDG-icons-from-user-theme-theme.patch
@@ -4,6 +4,8 @@ Subject: Use XDG icons from user theme theme
 
 The look of the main menu should not be defined by the application and instead
 use the icon theme of the user.
+
+Forwarded: no
 ---
  src/m64py/frontend/recentfiles.py |  5 ++-
  src/m64py/ui/icons.qrc            | 22 ------------
diff --git a/debian/patches/fix-QKeySequence-crash.patch b/debian/patches/fix-QKeySequence-crash.patch
new file mode 100644
index 0000000..1daa556
--- /dev/null
+++ b/debian/patches/fix-QKeySequence-crash.patch
@@ -0,0 +1,30 @@
+From: Alex Henrie <alexhenrie24 at gmail.com>
+Date: Thu, 22 Oct 2015 20:00:15 -0600
+Subject: fix QKeySequence crash
+
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-ui-python/commit/6179216d898b7858b8c1a589ffebd50c504406d9
+---
+ src/m64py/frontend/input.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/m64py/frontend/input.py b/src/m64py/frontend/input.py
+index 71a8575..b01d05d 100644
+--- a/src/m64py/frontend/input.py
++++ b/src/m64py/frontend/input.py
+@@ -17,6 +17,7 @@
+ import re
+ 
+ from PyQt5.QtWidgets import QDialog
++from PyQt5.QtGui import QKeySequence
+ 
+ from m64py.opts import SDL2
+ from m64py.core.defs import *
+@@ -417,7 +418,7 @@ class Input(QDialog, Ui_InputDialog):
+             return SCANCODE2KEYCODE[SDL_GetScancodeFromName(text)]
+         else:
+             try:
+-                key = QKeySequence(text).__int__()
++                key = QKeySequence(text)[0]
+                 return QT2SDL[key]
+             except KeyError:
+                 return None
diff --git a/debian/patches/series b/debian/patches/series
index 00a54d8..53c8622 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 Disable-the-SDL2-detection-hack.patch
 Use-PySDL2-bindings-from-package-python-sdl2.patch
 Use-XDG-icons-from-user-theme-theme.patch
+UnicodeDecodeError-corrected.patch
+fix-QKeySequence-crash.patch
diff --git a/debian/rules b/debian/rules
index f15db28..4e0c846 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 
 export PYBUILD_DESTDIR=debian/m64py
 export PYBUILD_CONFIGURE_ARGS=config
-export PYBUILD_BUILD_ARGS_python2=build_ext
+export PYBUILD_BUILD_ARGS_python3=build_ext
 export PYBUILD_INSTALL_ARGS=--install-layout=deb \
 	--install-scripts=/usr/share/m64py \
 	--install-lib=/usr/share/m64py
@@ -11,7 +11,7 @@ export PYBUILD_INSTALL_ARGS=--install-layout=deb \
 DESTDIR = $(CURDIR)/debian/m64py
 
 binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
-	dh $@ --with=python2 --parallel --list-missing --buildsystem=pybuild
+	dh $@ --with=python3 --parallel --list-missing --buildsystem=pybuild
 
 get-orig-source:
 	uscan --verbose --force-download

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

More information about the Pkg-games-commits mailing list