Merge lp:~timo-jyrinki/qtgrilo/fix_lp1287180 into lp:qtgrilo

[Timo Jyrinki]

Prevent 'signals' from GDBus from clashing with Qt's 'signals' (LP: #1287180)

Obviously a hack, and I'm not familiar with qtgrilo.

[lp:~timo-jyrinki/qtgrilo/fix_lp1287180]

13. By Timo Jyrinki on 2014-03-04

Add comments to the ugly hacks.

[Timo Jyrinki (timo-jyrinki)]

Built for armhf + i386 + amd64 against Qt 5.2:
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta2/+sourcepub/3953333/+listing-archive-extra

[Victor Thompson (vthompson)]

A hack is very acceptable in this case--since we'll be moving away from qtgrilo shortly. Thanks Timo!

review: Approve

[lp:~timo-jyrinki/qtgrilo/fix_lp1287180]

14. By Timo Jyrinki on 2014-03-05

Sync debian/ with what is in the archives already.

15. By Timo Jyrinki on 2014-03-05

Add changelog entry for 0.0.20130610-0ubuntu3

[Timo Jyrinki (timo-jyrinki)]

In landing PPA now https://launchpad.net/~ci-train-ppa-service/+archive/landing-006/+packages

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-09 09:21:45 +0000
+++ debian/changelog	2014-03-05 08:20:23 +0000
@@ -1,3 +1,22 @@
+qtgrilo (0.0.20130610-0ubuntu3) trusty; urgency=medium
+
+  * Rebuild against Qt 5.2.1
+  * Prevent 'signals' from GDBus from clashing with Qt's 'signals'
+    (LP: #1287180)
+
+ -- Timo Jyrinki <[e-mail]>  Wed, 05 Mar 2014 10:19:57 +0200
+
+qtgrilo (0.0.20130610-0ubuntu2) saucy; urgency=low
+
+  * New bzr checkout.
+    - Changes recommended from upstream after they included the changes to add
+      genre, cover art, year and track number.
+    - Fix the import path after adding versioning to the installation path and
+      the Debian package.
+    - Add trackNumber property to order tracks.
+
+ -- Victor Thompson <[e-mail]>  Wed, 18 Sep 2013 13:32:54 -0500
+
 qtgrilo (0.0.20130610-0ubuntu1) saucy; urgency=low
 
   * Initial release.

=== modified file 'debian/control'
--- debian/control	2013-11-14 19:44:39 +0000
+++ debian/control	2014-03-05 08:20:23 +0000
@@ -8,7 +8,6 @@
                qt5-default,
                pkg-kde-tools,
                libgrilo-0.2-dev,
-               mediascanner,
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 

=== modified file 'declarative/grilodatasource.h'
--- declarative/grilodatasource.h	2013-08-15 23:52:19 +0000
+++ declarative/grilodatasource.h	2014-03-05 08:20:23 +0000
@@ -24,6 +24,8 @@
 #ifndef GRILO_DATA_SOURCE_H
 #define GRILO_DATA_SOURCE_H
 
+/* Fix FTBFS from clashing 'signals' definition (LP: #1287180) */
+#define __G_DBUS_INTROSPECTION_H__
 #include <QObject>
 #include <grilo.h>
 #include <QVariant>

=== modified file 'declarative/grilomedia.h'
--- declarative/grilomedia.h	2013-09-14 02:09:24 +0000
+++ declarative/grilomedia.h	2014-03-05 08:20:23 +0000
@@ -24,6 +24,8 @@
 #ifndef GRILO_MEDIA_H
 #define GRILO_MEDIA_H
 
+/* Fix FTBFS from clashing 'signals' definition (LP: #1287180) */
+#define __G_DBUS_INTROSPECTION_H__
 #include <QObject>
 #include <grilo.h>
 #include <QUrl>

=== modified file 'declarative/griloplugin.h'
--- declarative/griloplugin.h	2013-08-15 23:52:19 +0000
+++ declarative/griloplugin.h	2014-03-05 08:20:23 +0000
@@ -26,6 +26,8 @@
 #include <QtGlobal>
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+/* Fix FTBFS from clashing 'signals' definition (LP: #1287180) */
+# define __G_DBUS_INTROSPECTION_H__
 # include <QQmlExtensionPlugin>
 # define QDeclarativeExtensionPlugin QQmlExtensionPlugin
 #else

=== modified file 'declarative/griloregistry.h'
--- declarative/griloregistry.h	2013-08-15 23:52:19 +0000
+++ declarative/griloregistry.h	2014-03-05 08:20:23 +0000
@@ -24,6 +24,8 @@
 #ifndef GRILO_REGISTRY_H
 #define GRILO_REGISTRY_H
 
+/* Fix FTBFS from clashing 'signals' definition (LP: #1287180) */
+#define __G_DBUS_INTROSPECTION_H__
 #include <QObject>
 #include <grilo.h>