From 408b14a2ea46525e2443e4105786717cc404e3f9 Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Wed, 13 Apr 2016 20:39:40 +0200 Subject: [PATCH] Upload 2.5.2-1 to unstable --- debian/changelog | 9 +++++++++ debian/control | 6 +++--- debian/patches/assure-quit-keybinding | 23 ----------------------- debian/patches/series | 1 - 4 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 debian/patches/assure-quit-keybinding diff --git a/debian/changelog b/debian/changelog index 5fc7bd8..93c0592 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +minitube (2.5.2-1) unstable; urgency=medium + + * New upstream version + * Drop patch: assure-quit-keybinding, unneeded with Qt5 + * Depend on libqt5sql5-sqlite (Closes: #820620) + * Switch Vcs-* URLs to https + + -- Jakob Haufe Wed, 13 Apr 2016 18:23:32 +0200 + minitube (2.5.1-1) unstable; urgency=medium * New upstream version diff --git a/debian/control b/debian/control index 7515193..96c7e2c 100644 --- a/debian/control +++ b/debian/control @@ -5,12 +5,12 @@ Maintainer: Jakob Haufe Build-Depends: cdbs, debhelper (>= 9), qtbase5-dev, qtchooser, qtscript5-dev, qttools5-dev-tools, libphonon4qt5-dev Standards-Version: 3.9.7 Homepage: http://flavio.tordini.org/minitube -Vcs-Browser: http://git.sur5r.net/?p=minitube;a=summary -Vcs-Git: git://git.sur5r.net/minitube +Vcs-Browser: https://git.sur5r.net/?p=minitube;a=summary +Vcs-Git: https://git.sur5r.net/minitube Package: minitube Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11 +Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, libqt5sql5-sqlite Description: Native YouTube client Minitube is a native YouTube client. With it you can watch YouTube videos in a new way: you type a keyword, Minitube gives you an endless video stream. diff --git a/debian/patches/assure-quit-keybinding b/debian/patches/assure-quit-keybinding deleted file mode 100644 index 13f1f50..0000000 --- a/debian/patches/assure-quit-keybinding +++ /dev/null @@ -1,23 +0,0 @@ -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 -Forwarded: no -Last-Update: 2014-01-25 - -diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp -index 3392ff2..2e97174 100644 ---- a/src/mainwindow.cpp -+++ b/src/mainwindow.cpp -@@ -376,7 +376,9 @@ void MainWindow::createActions() { - - quitAct = new QAction(tr("&Quit"), this); - quitAct->setMenuRole(QAction::QuitRole); -- quitAct->setShortcut(QKeySequence(QKeySequence::Quit)); -+ quitAct->setShortcuts(QList() -+ << QKeySequence(QKeySequence::Quit) -+ << QKeySequence(Qt::CTRL + Qt::Key_Q)); - quitAct->setStatusTip(tr("Bye")); - actions->insert("quit", quitAct); - connect(quitAct, SIGNAL(triggered()), SLOT(quit())); diff --git a/debian/patches/series b/debian/patches/series index 23df937..8e3a117 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ disable-update-check proper-tempfiles -assure-quit-keybinding -- 2.39.2