From: Jakob Haufe Date: Mon, 23 Sep 2013 14:00:24 +0000 (+0200) Subject: Merge tag 'upstream/2.1.3' X-Git-Tag: debian/2.1.6-1~6 X-Git-Url: https://git.sur5r.net/?p=minitube;a=commitdiff_plain;h=d1f8234fe0884e05dd95a1c4876ec6e29d7d9f2b;hp=7cdd5bd476021ec84d54c4ec5be02280e1e9e548 Merge tag 'upstream/2.1.3' Upstream version 2.1.3 --- diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..152835c --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,19 @@ +minitube (1.8-1) unstable; urgency=low + + Starting with 1.8-1, minitube no longer depends on a particular phonon + backend, and can thus no longer directly depend on all codec-related + packages. + + Users of the GStreamer backend might want to + + * apt-get install gstreamer0.10-plugins-good gstreamer0.10-x + + and maybe + + * apt-get install gstreamer0.10-ffmpeg gstreamer0.10-plugins-bad + + as well. + + The VLC backend seems to pull in all necessary dependencies by itself. + + -- Jakob Haufe Sun, 23 Sep 2012 16:55:34 +0200 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b6f5a3a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,136 @@ +minitube (2.0-1) unstable; 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 + * Update Standards-Version to 3.9.4 + - Add Vcs-* control fields + - No further changes needed + + -- Jakob Haufe Thu, 23 May 2013 13:54:01 +0200 + +minitube (1.9-1) unstable; urgency=low + + * New upstream version (Closes: #673696) + * Refresh disable-update-check + * Refresh proper-tempfiles + * Use hardening-wrapper + + -- Jakob Haufe Sat, 29 Sep 2012 02:43:53 +0200 + +minitube (1.8-1) unstable; urgency=low + + * Ack NMU (thanks gregoa) + * New upstream version (Closes: #673696) + * Bump Standards-Version to 3.9.3 (no changes required) + * Bump debhelper compat level to 9 + * Switch to xz compression + * No longer directly depend on GStreamer phonon backed + + -- Jakob Haufe Sun, 23 Sep 2012 19:52:04 +0200 + +minitube (1.7-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "ftbfs with GCC-4.7": add patch that adds missing include. + (Closes: #667281) + + -- gregor herrmann Wed, 09 May 2012 16:44:42 +0200 + +minitube (1.7-1) unstable; urgency=low + + * New upstream version (Closes: #658990) + * New patch: assure-quit-keybinding + + -- Jakob Haufe 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 Wed, 07 Dec 2011 02:50:04 +0100 + +minitube (1.5-2) unstable; urgency=low + + * Do proper temporary file creation (Closes: #644935). + + -- Jakob Haufe 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 Sun, 14 Aug 2011 09:33:19 +0200 + +minitube (1.5-1) unstable; urgency=low + + * New upstream version (Closes: #637410) + + -- Jakob Haufe Fri, 12 Aug 2011 18:34:21 +0200 + +minitube (1.4.3-1) unstable; urgency=low + + * New upstream version (Closes: #623821) + + -- Jakob Haufe Fri, 10 Jun 2011 00:12:04 +0200 + +minitube (1.4.2-1) unstable; urgency=low + + * New upstream version + + -- Jakob Haufe 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 Sun, 03 Apr 2011 20:38:04 +0200 + +minitube (1.3-1) unstable; urgency=low + + * New upstream version (Closes: #606670) + + -- Jakob Haufe Fri, 17 Dec 2010 00:23:23 +0100 + +minitube (1.2-1) unstable; urgency=low + + * New upstream version (Closes: #600070) + + -- Jakob Haufe 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 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 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 Thu, 06 May 2010 22:58:30 +0200 + +minitube (1.0-1) unstable; urgency=low + + * Initial release (Closes: #561012) + + -- Jakob Haufe Tue, 04 May 2010 21:51:02 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..042fde2 --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: minitube +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.4 +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 +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. + . + Minitube does not require the Flash Player. + . + Minitube is not about cloning the original YouTube web interface, it aims to + create a new TV-like experience. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..c4d7f43 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,214 @@ +This work was packaged for Debian by: + + Jakob Haufe on Sun, 10 Jan 2010 02:28:52 +0100 + +It was downloaded from + +Upstream Author: + + Flavio Tordini + +Copyright: + + + +License: + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Files with other copyright statement than: Copyright Flavio Tordnini, License GPL verion 3 +------------------------------------------------------------------------------------------ + + +src/flickcharm.cpp src/flickcharm.h + + 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 + this file. Please review the following information to ensure GNU + 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. + + +src/searchlineedit.cpp src/searchlineedit.h src/urllineedit.cpp src/urllineedit.h + + 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 + 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. + + 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 + Foundation and appearing in the file LICENSE.GPL included in the + 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$ + +src/iconloader/qticonloader.cpp src/iconloader/qticonloader.h + + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + Contact: Qt Software Information (qt-info@nokia.com) + + This file is part of the QtGui module of the Qt Toolkit. + + 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. + + 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 + Foundation and appearing in the file LICENSE.GPL included in the + 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 qt-sales@nokia.com. + +src/qtsingleapplication/*.{h,cpp} + + This file is part of a Qt Solutions component. + + 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 Solutions 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. + + 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 + Foundation and appearing in the file LICENSE.GPL included in the + 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. + + Please note Third Party Software included with Qt Solutions may impose + additional restrictions and it is the user's responsibility to ensure + that they have met the licensing requirements of the GPL, LGPL, or Qt + Solutions Commercial license and the relevant license of the Third + Party Software they are using. + + 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 +Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +The Debian packaging is: + + Copyright (C) 2010 Jakob Haufe + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. + + + diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..1333ed7 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +TODO diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..5e4a3ce --- /dev/null +++ b/debian/menu @@ -0,0 +1,2 @@ +?package(minitube):needs="X11" section="Applications/Video"\ + title="minitube" command="/usr/bin/minitube" diff --git a/debian/minitube.1 b/debian/minitube.1 new file mode 100644 index 0000000..d89a513 --- /dev/null +++ b/debian/minitube.1 @@ -0,0 +1,21 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH MINITUBE 1 "January 22, 2010" +.SH NAME +minitube \- Native YouTube client +.SH SYNOPSIS +.B minitube +.SH DESCRIPTION +This manual page documents briefly the +.B minitube +command. +.PP +\fBminitube\fP 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. Minitube does not require the Flash Player. +.SH OPTIONS +Minitube currently does not take any options. +.SH AUTHOR +minitube was written by Flavio Tordini . +.PP +This manual page was written by Jakob Haufe , +for the Debian project (and may be used by others). diff --git a/debian/minitube.manpages b/debian/minitube.manpages new file mode 100644 index 0000000..5e49bb1 --- /dev/null +++ b/debian/minitube.manpages @@ -0,0 +1 @@ +debian/minitube.1 diff --git a/debian/patches/assure-quit-keybinding b/debian/patches/assure-quit-keybinding new file mode 100644 index 0000000..81fc52e --- /dev/null +++ b/debian/patches/assure-quit-keybinding @@ -0,0 +1,22 @@ +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: 2012-02-16 + +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->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/disable-update-check b/debian/patches/disable-update-check new file mode 100644 index 0000000..f828c45 --- /dev/null +++ b/debian/patches/disable-update-check @@ -0,0 +1,16 @@ +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 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())); + +- QTimer::singleShot(0, this, SLOT(checkForUpdate())); ++ //QTimer::singleShot(0, this, SLOT(checkForUpdate())); + + } + diff --git a/debian/patches/proper-tempfiles b/debian/patches/proper-tempfiles new file mode 100644 index 0000000..bc4d125 --- /dev/null +++ b/debian/patches/proper-tempfiles @@ -0,0 +1,85 @@ +Description: Do proper temporary file creation + Upstream is using predictable temporary file names. Fix this in Debian + for now by using QTemporaryFile. This additionally ensures removal of + temporary files upon exit. +Author: Jakob Haufe +Bug-Debian: http://bugs.debian.org/644935 + +diff --git a/src/temporary.cpp b/src/temporary.cpp +index 362cbd8..bebcd1f 100644 +--- a/src/temporary.cpp ++++ b/src/temporary.cpp +@@ -1,7 +1,7 @@ + #include "temporary.h" + #include "constants.h" + +-static QList paths; ++static QList tempfiles; + #ifdef Q_WS_X11 + static QString userName; + #endif +@@ -10,43 +10,21 @@ Temporary::Temporary() { } + + QString Temporary::filename() { + +- static const QString tempDir = QDesktopServices::storageLocation(QDesktopServices::TempLocation); ++ QTemporaryFile *tempfile = new QTemporaryFile(QDir::tempPath() + "/" + Constants::UNIX_NAME + "-XXXXXX"); + +- QString tempFile = tempDir + "/" + Constants::UNIX_NAME + "-" + QString::number(qrand()); ++ tempfiles << tempfile; + +-#ifdef Q_WS_X11 +- if (userName.isNull()) { +- userName = QString(getenv("USERNAME")); +- if (userName.isEmpty()) +- userName = QString(getenv("USER")); +- } +- if (!userName.isEmpty()) +- tempFile += "-" + userName; +-#endif +- +- // tempFile += ".mp4"; +- +- if (QFile::exists(tempFile) && !QFile::remove(tempFile)) { +- qDebug() << "Cannot remove temp file" << tempFile; ++ if (tempfiles.size() > 1) { ++ QTemporaryFile *removedFile = tempfiles.takeFirst(); ++ delete removedFile; + } + +- paths << tempFile; +- +- if (paths.size() > 1) { +- QString removedFile = paths.takeFirst(); +- if (QFile::exists(removedFile) && !QFile::remove(removedFile)) { +- qDebug() << "Cannot remove temp file" << removedFile; +- } +- } +- +- return tempFile; +- ++ tempfile->open(); ++ return tempfile->fileName(); + } + + void Temporary::deleteAll() { +- foreach(QString path, paths) { +- if (QFile::exists(path) && !QFile::remove(path)) { +- qDebug() << "Cannot remove temp file" << path; +- } ++ foreach(QTemporaryFile *tempfile, tempfiles) { ++ delete tempfile; + } + } +diff --git a/src/temporary.h b/src/temporary.h +index 50b9633..0453572 100644 +--- a/src/temporary.h ++++ b/src/temporary.h +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + class Temporary { + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..23df937 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +disable-update-check +proper-tempfiles +assure-quit-keybinding diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..f7e5b70 --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/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 + + +# Add here any variable or target overrides you need. diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..ae3050f --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +compression = xz +compression-level = 7 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..c11ff89 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=downloadurlmangle=s/trees/archive-tarball/,filenamemangle=s/^\/minitube\/minitube\/trees\/(.*)$/minitube-$1.tar.gz/ http://gitorious.org/minitube/minitube/trees/ /minitube/minitube/trees/([0-9])\.([0-9].*) +