Imported Debian patch 1.7-1

diff --cc debian/changelog
index c1de010e0a813470ff30c584420298aae3b44ed5,0000000000000000000000000000000000000000..20e658239173bf4f8e766cb509d80f0a00557622
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,87 -1,0 +1,94 @@@
-   * Do proper temporary file creation (Closes: #644935).
++minitube (1.7-1) unstable; urgency=low
++
++  * New upstream version (Closes: #658990)
++  * New patch: assure-quit-keybinding
++
++ -- Jakob Haufe <sur5r@sur5r.net>  Wed, 15 Feb 2012 22:06:35 +0100
++
 +minitube (1.6-1) unstable; urgency=low
 +
 +  * New upstream version (Closes: #650622, #647212)
 +  * Recreate debian/patches/disable-update-check
 +  * Recreate debian/patches/proper-tempfiles
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Wed, 07 Dec 2011 02:50:04 +0100
 +
 +minitube (1.5-2) unstable; urgency=low
 +
++  * Do proper temporary file creation (Closes: #644935)
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Wed, 12 Oct 2011 23:06:30 +0200
 +
 +minitube (1.5-1.1) unstable; urgency=low
 +
 +  * Bump Standards-Version to 3.9.2 (no changes required)
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Sun, 14 Aug 2011 09:33:19 +0200
 +
 +minitube (1.5-1) unstable; urgency=low
 +
 +  * New upstream version (Closes: #637410)
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Fri, 12 Aug 2011 18:34:21 +0200
 +
 +minitube (1.4.3-1) unstable; urgency=low
 +
 +  * New upstream version (Closes: #623821)
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Fri, 10 Jun 2011 00:12:04 +0200
 +
 +minitube (1.4.2-1) unstable; urgency=low
 +
 +  * New upstream version 
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Sun, 24 Apr 2011 19:30:24 +0200
 +
 +minitube (1.4.1-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * Disable update check, makes no sense for a packaged version (Closes:
 +    #619941)
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Sun, 03 Apr 2011 20:38:04 +0200
 +
 +minitube (1.3-1) unstable; urgency=low
 +
 +  * New upstream version (Closes: #606670)
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Fri, 17 Dec 2010 00:23:23 +0100
 +
 +minitube (1.2-1) unstable; urgency=low
 +
 +  * New upstream version (Closes: #600070)
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Fri, 15 Oct 2010 01:48:10 +0200
 +
 +minitube (1.1-1) unstable; urgency=low
 +
 +  * New upstream version (Closes: #590320)
 +  * Bump Standards-Version to 3.9.1 (no changes required)
 +  * Add dependencies to dbus-x11 and gstreamer0.10-plugins-good
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Tue, 27 Jul 2010 23:04:09 +0200
 +
 +minitube (1.0-3) unstable; urgency=low
 +
 +  * Mention files with copyright by Nokia in debian/copyright. Thanks to Barry
 +    deFreese for pointing it out.
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Wed, 09 Jun 2010 20:52:44 +0200
 +
 +minitube (1.0-2) unstable; urgency=low
 +
 +  * Make phonon and gstreamer dependencies more strict
 +  * Remove now obsolete README.Debian
 +  * Remove README.source template
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Thu, 06 May 2010 22:58:30 +0200
 +
 +minitube (1.0-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #561012)
 +
 + -- Jakob Haufe <sur5r@sur5r.net>  Tue, 04 May 2010 21:51:02 +0200
 +

diff --cc debian/patches/assure-quit-keybinding
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..907f93e7b12cd54a021e0534dd5bcf733b6299ec
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/assure-quit-keybinding
@@@ -1,0 -1,0 +1,21 @@@
++Description: Make Ctrl+Q work on normal X11 desktops
++ Upstream changed from explicit Ctrl+Q to QkeySequence::Quit, which Qt defines
++ to Ctrl+Q for OSX, KDE and Gnome, but not for other X11 desktops, so
++ explicitely add Ctrl+Q back.
++Author: Jakob Haufe <sur5r@sur5r.net>
++Forwarded: no
++Last-Update: 2012-02-16
++
++--- minitube-1.7.orig/src/MainWindow.cpp
+++++ minitube-1.7/src/MainWindow.cpp
++@@ -281,7 +281,9 @@ void MainWindow::createActions() {
++ 
++     quitAct = new QAction(tr("&Quit"), this);
++     quitAct->setMenuRole(QAction::QuitRole);
++-    quitAct->setShortcut(QKeySequence(QKeySequence::Quit));
+++    quitAct->setShortcuts(QList<QKeySequence>()
+++                          << QKeySequence(QKeySequence::Quit)
+++                          << QKeySequence(Qt::CTRL + Qt::Key_Q));
++     quitAct->setStatusTip(tr("Bye"));
++     actions->insert("quit", quitAct);
++     connect(quitAct, SIGNAL(triggered()), SLOT(quit()));

diff --cc debian/patches/series
index 8e3a1178dfc63dbd9ea6e5dd48e76e78cb14c0f6,0000000000000000000000000000000000000000..23df937c0a557ec98bbabedf2566c16729145655
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +disable-update-check
 +proper-tempfiles
++assure-quit-keybinding