diff -Nru acoustid-fingerprinter-0.6/debian/changelog acoustid-fingerprinter-0.6/debian/changelog --- acoustid-fingerprinter-0.6/debian/changelog 2016-04-30 17:16:17.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/changelog 2016-07-16 21:12:45.000000000 +0000 @@ -1,14 +1,20 @@ -acoustid-fingerprinter (0.6-4build2) yakkety; urgency=medium +acoustid-fingerprinter (0.6-5) unstable; urgency=medium - * Rebuild for ffmpeg 3.0. + * Changed maintainer to QA group, as the package was orphaned in bug + #828784. + * Corrected homepage URL. Patch from Matt Kraai. + * Created collab-maint git repo for package, and add d/gbp.conf to + use pristine-tar. + * Dropped Debian menu entry. + * Moved upstream source change from 0.6-4 to new 04-typo-warning.patch. + * Changed build rules from cdbs to dh and debhelper 9. + * Changed Standards-Version from 3.9.5 to 3.9.8. + * Added images/acoustid-fp.icns to debian/source/include-binaries to + handle a file that showed up in the 0.6-4 orig.tar.xz file. + * Added 05-g++-6-char-cast.patch to fix build problem with gcc 6. + (Closes: #811732) - -- Colin Watson Sat, 30 Apr 2016 18:16:17 +0100 - -acoustid-fingerprinter (0.6-4build1) wily; urgency=medium - - * No change rebuild for libtag1v5 - - -- Micah Gersten Sun, 23 Aug 2015 15:39:24 -0500 + -- Petter Reinholdtsen Sat, 16 Jul 2016 23:12:42 +0200 acoustid-fingerprinter (0.6-4) unstable; urgency=low diff -Nru acoustid-fingerprinter-0.6/debian/compat acoustid-fingerprinter-0.6/debian/compat --- acoustid-fingerprinter-0.6/debian/compat 2014-04-11 03:43:00.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/compat 2016-07-16 20:42:47.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru acoustid-fingerprinter-0.6/debian/control acoustid-fingerprinter-0.6/debian/control --- acoustid-fingerprinter-0.6/debian/control 2014-08-27 00:26:07.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/control 2016-07-16 20:44:31.000000000 +0000 @@ -1,10 +1,12 @@ Source: acoustid-fingerprinter Section: sound Priority: optional -Maintainer: Jerome Charaoui -Build-Depends: debhelper (>= 8.0.0), cmake, cdbs, libavformat-dev, libavcodec-dev, libchromaprint-dev, libqt4-dev, libtag1-dev, pkg-config -Standards-Version: 3.9.5 -Homepage: http://wiki.acoustid.org/wiki/Fingerprinter +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 9), cmake, libavformat-dev, libavcodec-dev, libchromaprint-dev, libqt4-dev, libtag1-dev, pkg-config +Standards-Version: 3.9.8 +Homepage: https://acoustid.org/fingerprinter +Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/acoustid-fingerprinter.git/ +Vcs-Git: git://anonscm.debian.org/collab-maint/acoustid-fingerprinter.git Package: acoustid-fingerprinter Architecture: any diff -Nru acoustid-fingerprinter-0.6/debian/gbp.conf acoustid-fingerprinter-0.6/debian/gbp.conf --- acoustid-fingerprinter-0.6/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/gbp.conf 2016-07-16 19:06:07.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff -Nru acoustid-fingerprinter-0.6/debian/menu acoustid-fingerprinter-0.6/debian/menu --- acoustid-fingerprinter-0.6/debian/menu 2014-04-11 03:43:00.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(acoustid-fingerprinter):needs="X11" section="Applications/Sound"\ - title="Acoustid Fingerprinter" command="/usr/bin/acoustid-fingerprinter" diff -Nru acoustid-fingerprinter-0.6/debian/patches/04-typo-warning.patch acoustid-fingerprinter-0.6/debian/patches/04-typo-warning.patch --- acoustid-fingerprinter-0.6/debian/patches/04-typo-warning.patch 1970-01-01 00:00:00.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/patches/04-typo-warning.patch 2016-07-16 20:38:24.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix typo in warning message + Patch found in version 0.6-4. +Author: Petter Reinholdtsen +Origin: debian +Forwarded: no +Reviewed-By: Petter Reinholdtsen +Last-Update: 2016-07-16 + +--- acoustid-fingerprinter-0.6.orig/fingerprinter.cpp ++++ acoustid-fingerprinter-0.6/fingerprinter.cpp +@@ -261,7 +261,7 @@ void Fingerprinter::onRequestFinished(QN + stop = true; + } + else { +- qWarning() << "Submittion failed:" << errorMessage; ++ qWarning() << "Submission failed:" << errorMessage; + } + } + else if (error != QNetworkReply::NoError) { diff -Nru acoustid-fingerprinter-0.6/debian/patches/05-g++-6-char-cast.patch acoustid-fingerprinter-0.6/debian/patches/05-g++-6-char-cast.patch --- acoustid-fingerprinter-0.6/debian/patches/05-g++-6-char-cast.patch 1970-01-01 00:00:00.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/patches/05-g++-6-char-cast.patch 2016-07-16 21:11:08.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Fix build failure on gcc 6 + Array initializers for a char array fail for constants > 128 + on platforms where char is signed. Cast to fix it. +Author: Petter Reinholdtsen +Bug-Debian: https://bugs.debian.org/811732 +Forwarded: no +Reviewed-By: Petter Reinholdtsen +Last-Update: 2016-07-16 + +--- acoustid-fingerprinter-0.6.orig/gzip.cpp ++++ acoustid-fingerprinter-0.6/gzip.cpp +@@ -23,12 +23,12 @@ inline unsigned long calculateCrc32(cons + QByteArray gzipCompress(const QByteArray &data) + { + const char header[10] = { +- 0x1f, 0x8b, // ID1 + ID2 ++ 0x1f, static_cast(0x8b), // ID1 + ID2 + 8, // Compression Method + 0, // Flags + 0, 0, 0, 0, // Modification Time + 2, // Extra Flags +- 255, // Operating System ++ static_cast(255), // Operating System + }; + + QByteArray compressedData = qCompress(data); diff -Nru acoustid-fingerprinter-0.6/debian/patches/series acoustid-fingerprinter-0.6/debian/patches/series --- acoustid-fingerprinter-0.6/debian/patches/series 2014-08-27 00:26:07.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/patches/series 2016-07-16 21:09:00.000000000 +0000 @@ -1,3 +1,5 @@ 01-Fix-build-with-upcoming-Libav-10-release.patch 02-CodecID.patch 03-pkg-config.patch +04-typo-warning.patch +05-g++-6-char-cast.patch diff -Nru acoustid-fingerprinter-0.6/debian/rules acoustid-fingerprinter-0.6/debian/rules --- acoustid-fingerprinter-0.6/debian/rules 2014-04-11 03:43:00.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/rules 2016-07-16 21:09:26.000000000 +0000 @@ -1,7 +1,6 @@ #!/usr/bin/make -f +%: + dh $@ -DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_BUILD_TYPE=Release - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk - +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release diff -Nru acoustid-fingerprinter-0.6/debian/source/include-binaries acoustid-fingerprinter-0.6/debian/source/include-binaries --- acoustid-fingerprinter-0.6/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ acoustid-fingerprinter-0.6/debian/source/include-binaries 2016-07-16 19:38:38.000000000 +0000 @@ -0,0 +1 @@ +images/acoustid-fp.icns diff -Nru acoustid-fingerprinter-0.6/fingerprinter.cpp acoustid-fingerprinter-0.6/fingerprinter.cpp --- acoustid-fingerprinter-0.6/fingerprinter.cpp 2014-02-21 04:23:17.000000000 +0000 +++ acoustid-fingerprinter-0.6/fingerprinter.cpp 2012-09-05 18:43:51.000000000 +0000 @@ -261,7 +261,7 @@ stop = true; } else { - qWarning() << "Submission failed:" << errorMessage; + qWarning() << "Submittion failed:" << errorMessage; } } else if (error != QNetworkReply::NoError) {