redigest and add

This commit is contained in:
Mario Fetka
2013-04-16 09:22:54 +02:00
parent ffb8c80b49
commit 614fd627bc
86 changed files with 1511 additions and 580 deletions

View File

@@ -0,0 +1,16 @@
src/mediadevices/ipod/IpodDevice.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mediadevices/ipod/IpodDevice.cpp b/app/client/MediaDevices/IpodDevice_linux.cpp
index 3e40672..f3bad0e 100644
--- a/src/mediadevices/ipod/IpodDevice.cpp
+++ b/app/client/MediaDevices/IpodDevice_linux.cpp
@@ -35,7 +35,7 @@
extern "C"
{
#include <gpod/itdb.h>
- #include <glib/glist.h>
+ #include <glib.h>
}
#define TABLE_NAME "IpodDeviceTracks"

View File

@@ -0,0 +1,44 @@
Index: lastfm-1.5.4.27091+dfsg/definitions.pro.inc
===================================================================
--- lastfm-1.5.4.27091+dfsg.orig/definitions.pro.inc
+++ lastfm-1.5.4.27091+dfsg/definitions.pro.inc
@@ -10,7 +10,7 @@ CONFIG( service ) {
CONFIG += plugin
win32: DESTDIR = $$BIN_DIR
- else: DESTDIR = $$BIN_DIR/services
+ else: DESTDIR = $$BIN_DIR/lastfm_services
TARGET = srv_$$TARGET
}
@@ -19,7 +19,7 @@ CONFIG( extension ) {
CONFIG += plugin
win32: DESTDIR = $$BIN_DIR
- else: DESTDIR = $$BIN_DIR/extensions
+ else: DESTDIR = $$BIN_DIR/lastfm_services/extensions
TARGET = ext_$$TARGET
}
Index: lastfm-1.5.4.27091+dfsg/src/libMoose/MooseCommon.cpp
===================================================================
--- lastfm-1.5.4.27091+dfsg.orig/src/libMoose/MooseCommon.cpp
+++ lastfm-1.5.4.27091+dfsg/src/libMoose/MooseCommon.cpp
@@ -112,7 +112,7 @@ servicePath( QString name )
// Hack to get it working with VS2005
dirPath = qApp->applicationDirPath();
#else
- dirPath = qApp->applicationDirPath() + "/services";
+ dirPath = "/usr/lib/lastfm_services";
#endif
#ifndef QT_NO_DEBUG
@@ -358,7 +358,7 @@ extensionPaths()
// Hack to get it working with VS2005
QString path = qApp->applicationDirPath();
#else
- QString path = qApp->applicationDirPath() + "/extensions";
+ QString path = "/usr/lib/lastfm_services/extensions";
#endif
#ifndef QT_NO_DEBUG