[mupen64plus-qt] 02/05: Import Debian changes 1.9-1
Markus Koschany
apo at moszumanska.debian.org
Sat Oct 21 16:15:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository mupen64plus-qt.
commit bd7651a7763315bfae15f96ae318214c15645370
Merge: 7e79c55 41cfcc9
Author: Sérgio Benjamim <sergio_br2 at yahoo.com.br>
Date: Sun May 22 19:20:00 2016 -0300
Import Debian changes 1.9-1
mupen64plus-qt (1.9-1) unstable; urgency=low
* Upstream new release.
* Fixed segfault when opening files via menu bar (Closes: #824154).
- d/p/01_fix_segfault.patch
* Removed libquazip patch (fixed on upstream).
* Bump std-version to 3.9.8
* VCS fields in secure mode.
* Drop 01_fix_man_section.patch, libquazip.patch: upstream
.travis.yml | 40 +
README.md | 229 ++++-
VERSION | 1 +
build-scripts/platform/linux.sh | 33 +
build-scripts/platform/osx.sh | 56 ++
build-scripts/platform/windows.sh | 54 ++
build-scripts/revision.sh | 10 +
build-scripts/travis-ci.sh | 15 +
debian/changelog | 12 +
debian/control | 4 +-
debian/patches/01_fix_man_section.patch | 93 --
debian/patches/01_fix_segfault.patch | 22 +
debian/patches/libquazip.patch | 18 -
debian/patches/series | 3 +-
dist/debian/compat | 1 +
dist/debian/control | 17 +
dist/debian/copyright | 27 +
dist/debian/deb-build.sh | 19 +
dist/debian/docs | 1 +
dist/debian/install | 4 +
dist/debian/rules | 11 +
dist/debian/source/format | 1 +
{macosx => dist/macosx}/mupen64plus.icns | Bin
dist/redhat/mupen64plus-qt.spec.in | 46 +
dist/redhat/rpm-build.sh | 8 +
{windows => dist/windows}/icon.rc | 0
{windows => dist/windows}/mupen64plus.ico | Bin
mupen64plus-qt.pro | 21 +-
resources/README.txt | 12 +
resources/locale/mupen64plus-qt_fr.qm | Bin 0 -> 15075 bytes
resources/locale/mupen64plus-qt_fr.ts | 1049 ++++++++++++++++++++++
resources/{mupen64plus-qt.1 => mupen64plus-qt.6} | 8 +-
resources/mupen64plusqt.qrc | 2 +
resources/other/VERSION | 1 +
src/aboutdialog.cpp | 13 +-
src/aboutdialog.h | 9 +-
src/clickablewidget.cpp | 2 +
src/clickablewidget.h | 3 +-
src/common.cpp | 61 +-
src/common.h | 30 +-
src/configeditor.cpp | 19 +-
src/configeditor.h | 12 +-
src/downloaddialog.cpp | 9 +-
src/downloaddialog.h | 11 +-
src/emulatorhandler.cpp | 44 +-
src/emulatorhandler.h | 8 +-
src/gamesettingsdialog.cpp | 146 +++
src/{aboutdialog.h => gamesettingsdialog.h} | 36 +-
src/gamesettingsdialog.ui | 223 +++++
src/global.h | 4 +-
src/logdialog.cpp | 20 +-
src/logdialog.h | 7 +-
src/main.cpp | 20 +-
src/mainwindow.cpp | 168 +++-
src/mainwindow.h | 36 +-
src/romcollection.cpp | 54 +-
src/romcollection.h | 13 +-
src/settingsdialog.cpp | 248 +++--
src/settingsdialog.h | 9 +-
src/settingsdialog.ui | 73 +-
src/thegamesdbscrapper.cpp | 36 +-
src/thegamesdbscrapper.h | 5 +-
62 files changed, 2682 insertions(+), 455 deletions(-)
diff --cc debian/changelog
index b09dc98,0000000..5380ce0
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,0 +1,28 @@@
++mupen64plus-qt (1.9-1) unstable; urgency=low
++
++ * Upstream new release.
++ * Fixed segfault when opening files via menu bar (Closes: #824154).
++ - d/p/01_fix_segfault.patch
++ * Removed libquazip patch (fixed on upstream).
++ * Bump std-version to 3.9.8
++ * VCS fields in secure mode.
++ * Drop 01_fix_man_section.patch, libquazip.patch: upstream
++
++ -- Sérgio Benjamim <sergio_br2 at yahoo.com.br> Sun, 22 May 2016 19:20:00 -0300
++
+mupen64plus-qt (1.8-2) unstable; urgency=medium
+
+ * Team upload
+ * Maintain package in pkg-games Git
+ * Use the new libquazip5 instead the old libquazip-qt5 (thanks for the
+ patch to Bas Couwenberg <sebastic at xs4all.nl>)
+ Closes: #810610
+ * Restrict architecture to any-i386 any-amd64. Closes: #802910.
+
+ -- Andreas Tille <tille at debian.org> Mon, 11 Jan 2016 22:32:37 +0100
+
+mupen64plus-qt (1.8-1) unstable; urgency=low
+
+ * Initial release (Closes: #787381).
+
+ -- Sérgio Benjamim <sergio_br2 at yahoo.com.br> Fri, 11 Sep 2015 18:29:00 -0300
diff --cc debian/control
index a2018bd,0000000..2e8123f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,23 -1,0 +1,23 @@@
+Source: mupen64plus-qt
+Maintainer: Sérgio Benjamim <sergio_br2 at yahoo.com.br>
+Uploaders: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Section: games
+Priority: optional
+Build-Depends: debhelper (>= 9),
+ libqt5sql5-sqlite,
+ libquazip5-dev,
+ qt5-qmake,
+ qtbase5-dev
- Standards-Version: 3.9.6
++Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/mupen64plus-qt.git
- Vcs-Git: git://anonscm.debian.org/pkg-games/mupen64plus-qt.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-games/mupen64plus-qt.git
+Homepage: https://github.com/dh4/mupen64plus-qt
+
+Package: mupen64plus-qt
+Architecture: any-i386 any-amd64
+Depends: mupen64plus-ui-console,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Basic launcher for Mupen64Plus
+ Mupen64Plus-Qt is a basic launcher for the standard UI frontend of Mupen64Plus.
+ It supports downloading game information and cover images from thegamesdb.net.
diff --cc debian/patches/01_fix_segfault.patch
index 0000000,0000000..56ca54d
new file mode 100644
--- /dev/null
+++ b/debian/patches/01_fix_segfault.patch
@@@ -1,0 -1,0 +1,22 @@@
++Description: Backport upstream fix of bug #824154
++Index: mupen64plus-qt-1.9/src/mainwindow.cpp
++===================================================================
++--- mupen64plus-qt-1.9.orig/src/mainwindow.cpp 2016-04-05 14:24:25.000000000 -0300
+++++ mupen64plus-qt-1.9/src/mainwindow.cpp 2016-05-22 20:39:53.456965642 -0300
++@@ -1025,7 +1025,15 @@
++ foreach (QString type, romCollection->getFileTypes(true)) filter += type + " ";
++ filter += ");;" + tr("All Files") + " (*)";
++
++- openPath = QFileDialog::getOpenFileName(this, tr("Open ROM File"), romCollection->romPaths.at(0), filter);
+++#if QT_VERSION >= 0x050000
+++ QString searchPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first();
+++#else
+++ QString searchPath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
+++#endif
+++ if (romCollection->romPaths.count() > 0)
+++ searchPath = romCollection->romPaths.at(0);
+++
+++ openPath = QFileDialog::getOpenFileName(this, tr("Open ROM File"), searchPath, filter);
++ if (openPath != "") {
++ if (QFileInfo(openPath).suffix() == "zip") {
++ QStringList zippedFiles = getZippedFiles(openPath);
diff --cc debian/patches/series
index 5797519,0000000..1967437
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 01_fix_man_section.patch
- libquazip.patch
++01_fix_segfault.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-qt.git
More information about the Pkg-games-commits
mailing list