[mupen64plus-qt] 04/05: Import Debian changes 1.10-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 7ecb93a914c110b4bc5e9c9c870c82e3250d0d83
Merge: bd7651a 646da4f
Author: Markus Koschany <apo at debian.org>
Date:   Sat Oct 21 17:28:34 2017 +0200

    Import Debian changes 1.10-1
    
    mupen64plus-qt (1.10-1) unstable; urgency=low
    
      * Team upload.
      [ Sérgio Benjamim ]
      * Upstream new release.
      * Removed 01_fix_segfault.patch (fixed on upstream).
    
      [ Markus Koschany ]
      * Switch to compat level 10.
      * Declare compliance with Debian Policy 4.1.1.
      * debian/copyright: Use https for Format field.
      * Switch maintainer to Debian Games Team because the Uploader must be a human
        being.

 .travis.yml                                        |    7 +-
 README.md                                          |    6 +-
 VERSION                                            |    2 +-
 build-scripts/platform/linux.sh                    |    4 +-
 build-scripts/platform/osx.sh                      |   18 +-
 build-scripts/platform/windows.sh                  |   10 +-
 debian/changelog                                   |   16 +
 debian/compat                                      |    2 +-
 debian/control                                     |    8 +-
 debian/copyright                                   |    2 +-
 debian/patches/01_fix_segfault.patch               |   22 -
 debian/patches/series                              |    1 -
 debian/rules                                       |    2 +-
 dist/debian/install                                |    2 +-
 dist/redhat/mupen64plus-qt.spec.in                 |    4 +-
 mupen64plus-qt.pro                                 |   60 +-
 resources/locale/mupen64plus-qt_fr.qm              |  Bin 15075 -> 20451 bytes
 resources/locale/mupen64plus-qt_fr.ts              |  690 ++++++++------
 src/common.cpp                                     |   53 +-
 src/common.h                                       |    3 +
 src/{ => dialogs}/aboutdialog.cpp                  |   25 +-
 src/{ => dialogs}/aboutdialog.h                    |    3 +-
 src/{ => dialogs}/configeditor.cpp                 |    5 +-
 src/{ => dialogs}/configeditor.h                   |    0
 src/{ => dialogs}/downloaddialog.cpp               |   10 +-
 src/{ => dialogs}/downloaddialog.h                 |    4 +-
 src/{ => dialogs}/gamesettingsdialog.cpp           |    3 +-
 src/{ => dialogs}/gamesettingsdialog.h             |    0
 src/{ => dialogs}/gamesettingsdialog.ui            |    0
 src/{ => dialogs}/logdialog.cpp                    |    5 +-
 src/{ => dialogs}/logdialog.h                      |    0
 src/{ => dialogs}/settingsdialog.cpp               |  102 +-
 src/{ => dialogs}/settingsdialog.h                 |    4 +-
 src/{ => dialogs}/settingsdialog.ui                |   84 +-
 src/{ => emulation}/emulatorhandler.cpp            |   44 +-
 src/{ => emulation}/emulatorhandler.h              |    0
 src/global.h                                       |   25 +-
 src/main.cpp                                       |    9 +-
 src/mainwindow.cpp                                 | 1001 +++++++-------------
 src/mainwindow.h                                   |   52 +-
 src/{ => roms}/romcollection.cpp                   |  136 ++-
 src/{ => roms}/romcollection.h                     |   12 +-
 .../thegamesdbscraper.cpp}                         |   27 +-
 .../thegamesdbscraper.h}                           |   10 +-
 src/views/gridview.cpp                             |  374 ++++++++
 src/{downloaddialog.h => views/gridview.h}         |   59 +-
 src/views/listview.cpp                             |  329 +++++++
 src/{emulatorhandler.h => views/listview.h}        |   53 +-
 src/views/tableview.cpp                            |  353 +++++++
 src/{emulatorhandler.h => views/tableview.h}       |   51 +-
 src/{ => views/widgets}/clickablewidget.cpp        |   20 +-
 src/{ => views/widgets}/clickablewidget.h          |    3 +
 src/{ => views/widgets}/treewidgetitem.cpp         |    0
 src/{ => views/widgets}/treewidgetitem.h           |    0
 54 files changed, 2411 insertions(+), 1304 deletions(-)

diff --cc debian/changelog
index 5380ce0,0000000..c9ef3e8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,0 +1,44 @@@
++mupen64plus-qt (1.10-1) unstable; urgency=low
++
++  * Team upload.
++  [ Sérgio Benjamim ]
++  * Upstream new release.
++  * Removed 01_fix_segfault.patch (fixed on upstream).
++
++  [ Markus Koschany ]
++  * Switch to compat level 10.
++  * Declare compliance with Debian Policy 4.1.1.
++  * debian/copyright: Use https for Format field.
++  * Switch maintainer to Debian Games Team because the Uploader must be a human
++    being.
++
++ -- Markus Koschany <apo at debian.org>  Sat, 21 Oct 2017 17:28:34 +0200
++
 +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/compat
index ec63514,0000000..f599e28
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 9
++10
diff --cc debian/control
index 2e8123f,0000000..f76b9a3
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>
++Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
++Uploaders: Sérgio Benjamim <sergio_br2 at yahoo.com.br>
 +Section: games
 +Priority: optional
- Build-Depends: debhelper (>= 9),
++Build-Depends: debhelper (>= 10),
 +               libqt5sql5-sqlite,
 +               libquazip5-dev,
 +               qt5-qmake,
 +               qtbase5-dev
- Standards-Version: 3.9.8
++Standards-Version: 4.1.1
 +Vcs-Browser: https://anonscm.debian.org/cgit/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/copyright
index 2d79de4,0000000..8b5a440
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,40 -1,0 +1,40 @@@
- Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: Mupen64Plus-Qt
 +Source: https://github.com/dh4/mupen64plus-qt.git
 +Comment: This package was debianized by
 + Sergio Benjamim (sergio-br2) <sergio_br2 at yahoo.com.br> on Sat, 23 May 2015 00:54:00 -0300
 +
 +
 +Files: *
 +Copyright: 2013-2015 Dan Hasting (aka dh4, Presence)
 +License: BSD-3-clause
 +
 +Files: debian/*
 +Copyright: 2015 Sergio Benjamim (sergio-br2) <sergio_br2 at yahoo.com.br>
 +License: BSD-3-clause
 +
 +License: BSD-3-clause
 + Redistribution and use in source and binary forms, with or without
 + modification, are permitted provided that the following conditions
 + are met:
 + .
 + 1. Redistributions of source code must retain the above copyright
 +    notice, this list of conditions and the following disclaimer.
 + 2. Redistributions in binary form must reproduce the above copyright
 +    notice, this list of conditions and the following disclaimer in the
 +    documentation and/or other materials provided with the distribution.
 + 3. Neither the name of the organization nor the names of its
 +    contributors may be used to endorse or promote products derived from
 +    this software without specific prior written permission.
 + .
 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 + POSSIBILITY OF SUCH DAMAGE.
diff --cc debian/rules
index 8a436dc,0000000..ed8f0a2
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,12 -1,0 +1,12 @@@
 +#!/usr/bin/make -f
 +
 +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 +
 +export QT_SELECT := qt5
 +
 +%:
- 	dh $@ --buildsystem=qmake --parallel
++	dh $@ --buildsystem=qmake
 +
 +override_dh_auto_install:
 +	cp resources/images/mupen64plus.png debian/mupen64plus-qt/usr/share/icons/hicolor/128x128/apps/mupen64plus-qt.png
 +	dh_auto_install

-- 
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