From cf9933e37ca2c0a856ac655132a5322aeadf9104 Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Sat, 18 May 2013 00:34:47 +0200 Subject: [PATCH] Refresh patches gcc-4.7.patch is no longer needed, the missing include has been fixed upstream. assure-quit-keybinding and disable-update-check needed to be rebuilt due to changed source file name but still do the exact same thing. --- debian/changelog | 4 ++++ debian/patches/assure-quit-keybinding | 11 ++++++----- debian/patches/disable-update-check | 10 +++++----- debian/patches/gcc-4.7.patch | 17 ----------------- debian/patches/series | 1 - 5 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 debian/patches/gcc-4.7.patch diff --git a/debian/changelog b/debian/changelog index d209d2d..b2b5b35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ minitube (2.0-1) UNRELEASED; urgency=low * New upstream version * Switch from hardening-wrapper to buildflags.mk + * Refresh patches: + - Drop gcc-4.7.patch, fixed upstream + - Rebuild assure-quit-keybinding + - Rebuild disable-update-check -- Jakob Haufe Fri, 17 May 2013 16:35:41 +0200 diff --git a/debian/patches/assure-quit-keybinding b/debian/patches/assure-quit-keybinding index 907f93e..81fc52e 100644 --- a/debian/patches/assure-quit-keybinding +++ b/debian/patches/assure-quit-keybinding @@ -6,13 +6,14 @@ Author: Jakob Haufe 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() { - +diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp +index bb815c0..5f82732 100644 +--- a/src/mainwindow.cpp ++++ b/src/mainwindow.cpp +@@ -334,6 +334,9 @@ void MainWindow::createActions() { quitAct = new QAction(tr("&Quit"), this); quitAct->setMenuRole(QAction::QuitRole); -- quitAct->setShortcut(QKeySequence(QKeySequence::Quit)); + quitAct->setShortcut(QKeySequence(QKeySequence::Quit)); + quitAct->setShortcuts(QList() + << QKeySequence(QKeySequence::Quit) + << QKeySequence(Qt::CTRL + Qt::Key_Q)); diff --git a/debian/patches/disable-update-check b/debian/patches/disable-update-check index 516a1d8..f828c45 100644 --- a/debian/patches/disable-update-check +++ b/debian/patches/disable-update-check @@ -1,11 +1,11 @@ Description: Disable update check as it's useless for a packaged version Author: Jakob Haufe -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index e5d78d2..581a168 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -130,7 +130,7 @@ MainWindow::MainWindow() : +diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp +index bb815c0..4304fa3 100644 +--- a/src/mainwindow.cpp ++++ b/src/mainwindow.cpp +@@ -146,7 +146,7 @@ MainWindow::MainWindow() : mouseTimer->setSingleShot(true); connect(mouseTimer, SIGNAL(timeout()), SLOT(hideMouse())); diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch deleted file mode 100644 index 95c9259..0000000 --- a/debian/patches/gcc-4.7.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: add missing include to avoid FTBFS with gcc 4.7 -Origin: vendor -Bug-Debian: http://bugs.debian.org/667281 -Forwarded: no -Author: gregor herrmann -Last-Update: 2012-05-09 - ---- a/src/qtsingleapplication/qtlocalpeer.cpp -+++ b/src/qtsingleapplication/qtlocalpeer.cpp -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - - #if defined(Q_OS_WIN) - #include diff --git a/debian/patches/series b/debian/patches/series index 4d6bbb1..23df937 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ disable-update-check proper-tempfiles assure-quit-keybinding -gcc-4.7.patch -- 2.39.5