From: Jakob Haufe Date: Sun, 13 Mar 2016 21:16:45 +0000 (+0100) Subject: Upload 2.5.1-1 to unstable X-Git-Tag: debian/2.9-1~14 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=023cc3f14f91e7b7d5c9d9de6b8c0181770fa1a8;p=minitube Upload 2.5.1-1 to unstable --- diff --git a/debian/NEWS b/debian/NEWS index 152835c..e936842 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,17 @@ +minitube (2.5.1-1) unstable; urgency=medium + + Starting with 2.4, minitube supports the new YouTube API version 3. + + As this API version is the only one supprted by now, it is necessary to + acquire an API key from Google. + + In order to do so, create a "Browser Key" at + https://console.developers.google.com + + Minitube reads this key from the GOOGLE_API_KEY environment variable. + + -- Jakob Haufe Thu, 07 Jan 2016 23:13:57 +0100 + minitube (1.8-1) unstable; urgency=low Starting with 1.8-1, minitube no longer depends on a particular phonon diff --git a/debian/changelog b/debian/changelog index 53909e9..5fc7bd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +minitube (2.5.1-1) unstable; urgency=medium + + * New upstream version + * Point watchfile to Github as Gitorious is gone + * Update URL in debian/copyright and fix typo + * Refresh patches + * Bump Standards-Version to 3.9.7 (no changes required) + * Remove menu file (See ctte #741573) + + -- Jakob Haufe Sun, 13 Mar 2016 22:16:30 +0100 + minitube (2.2-1) unstable; urgency=medium * New upstream version (Closes: #757806) diff --git a/debian/control b/debian/control index 006561e..7515193 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,15 @@ 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.5 +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 Package: minitube Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, phonon-backend-gstreamer | phonon-backend, dbus-x11 +Depends: ${shlibs:Depends}, ${misc:Depends}, 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. diff --git a/debian/copyright b/debian/copyright index c4d7f43..00e05d5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ This work was packaged for Debian by: Jakob Haufe on Sun, 10 Jan 2010 02:28:52 +0100 -It was downloaded from +It was downloaded from Upstream Author: @@ -27,8 +27,8 @@ License: 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 ------------------------------------------------------------------------------------------- +Files with other copyright statement than: Copyright Flavio Tordnini, License GPL version 3 +------------------------------------------------------------------------------------------- src/flickcharm.cpp src/flickcharm.h diff --git a/debian/menu b/debian/menu deleted file mode 100644 index 5e4a3ce..0000000 --- a/debian/menu +++ /dev/null @@ -1,2 +0,0 @@ -?package(minitube):needs="X11" section="Applications/Video"\ - title="minitube" command="/usr/bin/minitube" diff --git a/debian/patches/disable-update-check b/debian/patches/disable-update-check index dbc66b9..93bd0c5 100644 --- a/debian/patches/disable-update-check +++ b/debian/patches/disable-update-check @@ -2,15 +2,15 @@ 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 3392ff2..a18e7f0 100644 +index 4375716..e0aa901 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp -@@ -197,7 +197,7 @@ void MainWindow::lazyInit() { +@@ -232,7 +232,7 @@ void MainWindow::lazyInit() { - JsFunctions::instance(); + ChannelAggregator::instance()->start(); - checkForUpdate(); + //checkForUpdate(); - ChannelAggregator::instance()->start(); + initialized = true; } diff --git a/debian/patches/proper-tempfiles b/debian/patches/proper-tempfiles index bc4d125..f36b48b 100644 --- a/debian/patches/proper-tempfiles +++ b/debian/patches/proper-tempfiles @@ -6,29 +6,29 @@ Author: Jakob Haufe Bug-Debian: http://bugs.debian.org/644935 diff --git a/src/temporary.cpp b/src/temporary.cpp -index 362cbd8..bebcd1f 100644 +index 913d244..3e5e89f 100644 --- a/src/temporary.cpp +++ b/src/temporary.cpp -@@ -1,7 +1,7 @@ - #include "temporary.h" +@@ -22,51 +22,26 @@ $END_LICENSE */ #include "constants.h" + #include "compatibility/pathsservice.h" -static QList paths; +-#ifdef APP_LINUX +-static QString userName; +-#endif +static QList tempfiles; - #ifdef Q_WS_X11 - static QString userName; - #endif -@@ -10,43 +10,21 @@ Temporary::Temporary() { } - QString Temporary::filename() { + Temporary::Temporary() { } -- static const QString tempDir = QDesktopServices::storageLocation(QDesktopServices::TempLocation); + QString Temporary::filename() { +- static const QString tempDir = Paths::getTempLocation(); + QTemporaryFile *tempfile = new QTemporaryFile(QDir::tempPath() + "/" + Constants::UNIX_NAME + "-XXXXXX"); ++ tempfiles += tempfile; - QString tempFile = tempDir + "/" + Constants::UNIX_NAME + "-" + QString::number(qrand()); -+ tempfiles << tempfile; - --#ifdef Q_WS_X11 +- +-#ifdef APP_LINUX - if (userName.isNull()) { - userName = QString(getenv("USERNAME")); - if (userName.isEmpty()) @@ -42,7 +42,8 @@ index 362cbd8..bebcd1f 100644 - - if (QFile::exists(tempFile) && !QFile::remove(tempFile)) { - qDebug() << "Cannot remove temp file" << tempFile; -+ if (tempfiles.size() > 1) { ++ if (tempfiles.size() > 1) ++ { + QTemporaryFile *removedFile = tempfiles.takeFirst(); + delete removedFile; } @@ -63,7 +64,7 @@ index 362cbd8..bebcd1f 100644 } void Temporary::deleteAll() { -- foreach(QString path, paths) { +- foreach(const QString &path, paths) { - if (QFile::exists(path) && !QFile::remove(path)) { - qDebug() << "Cannot remove temp file" << path; - } @@ -71,11 +72,12 @@ index 362cbd8..bebcd1f 100644 + delete tempfile; } } + diff --git a/src/temporary.h b/src/temporary.h -index 50b9633..0453572 100644 +index de5e24d..b8fbba9 100644 --- a/src/temporary.h +++ b/src/temporary.h -@@ -3,6 +3,7 @@ +@@ -23,6 +23,7 @@ $END_LICENSE */ #include #include diff --git a/debian/rules b/debian/rules index f7e5b70..e5653ed 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall +export QT_SELECT=qt5 include /usr/share/dpkg/buildflags.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/qmake.mk