--- minitube-2.2/debian/changelog 2014-09-06 21:19:24.000000000 +0200 +++ minitube-2.4/debian/changelog 2015-08-07 18:39:34.000000000 +0200 @@ -1,3 +1,16 @@ +minitube (2.4-0.1) unstable; urgency=medium + + * Non Maintainer Upload. + * New upstream version (Closes: #783032) + * export QT_SELECT=4 + * Bump Standards-Version to 3.9.6 (no changes required) + * Fix watch file + * Patch refresh + * wrap-and-sort debian directory + * Remove cdbs as b-d + + -- Gianfranco Costamagna Wed, 20 May 2015 20:08:25 +0200 + minitube (2.2-1) unstable; urgency=medium * New upstream version (Closes: #757806) --- minitube-2.2/debian/control 2014-09-06 21:04:22.000000000 +0200 +++ minitube-2.4/debian/control 2015-08-07 18:39:44.000000000 +0200 @@ -2,15 +2,21 @@ Section: video Priority: extra Maintainer: Jakob Haufe -Build-Depends: cdbs, debhelper (>= 9), libqt4-dev (>= 4:4.5), libphonon-dev, dpkg-dev (>= 1.16.1~) -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9), + dpkg-dev (>= 1.16.1~), + libphonon-dev, + libqt4-dev (>= 4:4.5) +Standards-Version: 3.9.6 Homepage: http://flavio.tordini.org/minitube Vcs-Browser: http://git.sur5r.net/?p=minitube;a=summary Vcs-Git: git://git.sur5r.net/minitube Package: minitube Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, phonon-backend-gstreamer | phonon-backend, dbus-x11 +Depends: dbus-x11, + phonon-backend-gstreamer | phonon-backend, + ${misc:Depends}, + ${shlibs:Depends} 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. @@ -19,4 +25,3 @@ . Minitube is not about cloning the original YouTube web interface, it aims to create a new TV-like experience. - --- minitube-2.2/debian/copyright 2014-09-05 23:02:33.000000000 +0200 +++ minitube-2.4/debian/copyright 2015-05-20 20:29:09.000000000 +0200 @@ -35,9 +35,9 @@ Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). Contact: Qt Software Information (qt-info@nokia.com) - + This file is part of the Graphics Dojo project on Qt Labs. - + This file may be used under the terms of the GNU General Public License version 2.0 or 3.0 as published by the Free Software Foundation and appearing in the file LICENSE.GPL included in the packaging of @@ -45,35 +45,35 @@ General Public Licensing requirements will be met: http://www.fsf.org/licensing/licenses/info/GPLv2.html and http://www.gnu.org/copyleft/gpl.html. - + If you are unsure which license is appropriate for your use, please contact the sales department at qt-sales@nokia.com. - + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. src/minisplitter.cpp src/minisplitter.h Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). - + Contact: Qt Software Information (qt-info@nokia.com) - + Commercial Usage - + Licensees holding valid Qt Commercial licenses may use this file in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia. - + GNU Lesser General Public License Usage - + Alternatively, this file may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation and appearing in the file LICENSE.LGPL included in the packaging of this file. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - + If you are unsure which license is appropriate for your use, please contact the sales department at qt-sales@nokia.com. @@ -82,16 +82,16 @@ Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). Contact: Nokia Corporation (qt-info@nokia.com) - + This file is part of the demonstration applications of the Qt Toolkit. - + $QT_BEGIN_LICENSE:LGPL$ Commercial Usage Licensees holding valid Qt Commercial licenses may use this file in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia. - + GNU Lesser General Public License Usage Alternatively, this file may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software @@ -99,12 +99,12 @@ packaging of this file. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - + In addition, as a special exception, Nokia gives you certain additional rights. These rights are described in the Nokia Qt LGPL Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this package. - + GNU General Public License Usage Alternatively, this file may be used under the terms of the GNU General Public License version 3.0 as published by the Free Software @@ -112,7 +112,7 @@ packaging of this file. Please review the following information to ensure the GNU General Public License version 3.0 requirements will be met: http://www.gnu.org/copyleft/gpl.html. - + If you are unsure which license is appropriate for your use, please contact the sales department at http://www.qtsoftware.com/contact. $QT_END_LICENSE$ @@ -197,7 +197,7 @@ If you are unsure which license is appropriate for your use, please contact the sales department at qt-sales@nokia.com. - + ------------------------------------------------------------------------------------------ On Debian systems, the complete text of the GNU General @@ -207,8 +207,5 @@ Copyright (C) 2010 Jakob Haufe -and is licensed under the GPL version 3, +and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. - - - --- minitube-2.2/debian/patches/assure-quit-keybinding 2014-09-05 23:02:33.000000000 +0200 +++ minitube-2.4/debian/patches/assure-quit-keybinding 2015-05-20 20:19:54.000000000 +0200 @@ -10,7 +10,7 @@ index 3392ff2..2e97174 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp -@@ -376,7 +376,9 @@ void MainWindow::createActions() { +@@ -384,7 +384,9 @@ void MainWindow::createActions() { quitAct = new QAction(tr("&Quit"), this); quitAct->setMenuRole(QAction::QuitRole); --- minitube-2.2/debian/patches/disable-update-check 2014-09-05 23:02:33.000000000 +0200 +++ minitube-2.4/debian/patches/disable-update-check 2015-05-20 20:11:53.000000000 +0200 @@ -5,12 +5,12 @@ index 3392ff2..a18e7f0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp -@@ -197,7 +197,7 @@ void MainWindow::lazyInit() { +@@ -207,7 +207,7 @@ void MainWindow::lazyInit() { JsFunctions::instance(); - checkForUpdate(); + //checkForUpdate(); - - ChannelAggregator::instance()->start(); } + + void MainWindow::changeEvent(QEvent* event) { --- minitube-2.2/debian/patches/proper-tempfiles 2014-09-05 23:02:33.000000000 +0200 +++ minitube-2.4/debian/patches/proper-tempfiles 2015-05-20 20:26:57.000000000 +0200 @@ -9,26 +9,29 @@ index 362cbd8..bebcd1f 100644 --- a/src/temporary.cpp +++ b/src/temporary.cpp -@@ -1,7 +1,7 @@ +@@ -20,8 +20,7 @@ $END_LICENSE */ + #include "temporary.h" #include "constants.h" - +- -static QList paths; +static QList tempfiles; - #ifdef Q_WS_X11 + #ifdef Q_OS_LINUX static QString userName; #endif -@@ -10,43 +10,21 @@ Temporary::Temporary() { } +@@ -29,47 +28,22 @@ static QString userName; + Temporary::Temporary() { } QString Temporary::filename() { - +-#if QT_VERSION >= 0x050000 +- static const QString tempDir = QStandardPaths::writableLocation(QStandardPaths::TempLocation); +-#else - static const QString tempDir = QDesktopServices::storageLocation(QDesktopServices::TempLocation); -+ QTemporaryFile *tempfile = new QTemporaryFile(QDir::tempPath() + "/" + Constants::UNIX_NAME + "-XXXXXX"); - +-#endif +- - QString tempFile = tempDir + "/" + Constants::UNIX_NAME + "-" + QString::number(qrand()); -+ tempfiles << tempfile; - --#ifdef Q_WS_X11 +- +-#ifdef Q_OS_LINUX - if (userName.isNull()) { - userName = QString(getenv("USERNAME")); - if (userName.isEmpty()) @@ -37,15 +40,14 @@ - if (!userName.isEmpty()) - tempFile += "-" + userName; -#endif -- + - // tempFile += ".mp4"; -- ++ QTemporaryFile *tempfile = new QTemporaryFile(QDir::tempPath() + "/" + Constants::UNIX_NAME + "-XXXXXX"); + - if (QFile::exists(tempFile) && !QFile::remove(tempFile)) { - qDebug() << "Cannot remove temp file" << tempFile; -+ if (tempfiles.size() > 1) { -+ QTemporaryFile *removedFile = tempfiles.takeFirst(); -+ delete removedFile; - } +- } ++ tempfiles << tempfile; - paths << tempFile; - @@ -54,8 +56,11 @@ - if (QFile::exists(removedFile) && !QFile::remove(removedFile)) { - qDebug() << "Cannot remove temp file" << removedFile; - } -- } -- ++ if (tempfiles.size() > 1) { ++ QTemporaryFile *removedFile = tempfiles.takeFirst(); ++ delete removedFile; + } + - return tempFile; - + tempfile->open(); @@ -75,7 +80,7 @@ index 50b9633..0453572 100644 --- a/src/temporary.h +++ b/src/temporary.h -@@ -3,6 +3,7 @@ +@@ -23,6 +23,7 @@ #include #include --- minitube-2.2/debian/rules 2014-09-05 23:02:33.000000000 +0200 +++ minitube-2.4/debian/rules 2015-05-20 20:21:55.000000000 +0200 @@ -1,10 +1,7 @@ #!/usr/bin/make -f -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_CFLAGS_MAINT_APPEND = -Wall -include /usr/share/dpkg/buildflags.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/qmake.mk +export QT_SELECT=4 +%: + dh $@ -# Add here any variable or target overrides you need. --- minitube-2.2/debian/watch 2014-09-05 23:02:33.000000000 +0200 +++ minitube-2.4/debian/watch 2015-05-20 20:36:26.000000000 +0200 @@ -1,4 +1,4 @@ version=3 -opts=downloadurlmangle=s/source(.*):/archive$1.tar.gz/,filenamemangle=s/^\/minitube\/minitube\/source\/(.*):$/minitube-$1.tar.gz/ http://gitorious.org/minitube/minitube/activities/ /minitube/minitube/source/([0-9])\.([0-9].*): - +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/minitube-$1\.tar\.gz/ \ + https://github.com/flaviotordini/minitube/tags .*/v?(\d\S*)\.tar\.gz