|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://git.merproject.org/mer-core/sensorfw.git</param>
<param name="branch">master</param>
- <param name="revision">5dcd6fbb52ac8aa386a6f3babdae9f0b0809fe6e</param>
+ <param name="revision">971ec5bd3021cb95fbec3a9eec53c5a807ce20b7</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-0.10.8.tar.bz2/sensorfw.pro
^
|
| @@ -15,7 +15,7 @@
TEMPLATE = subdirs
CONFIG += ordered
-SUBDIRS = datatypes \
+SUBDIRS = datatypes \
adaptors \
core \
filters \
@@ -29,7 +29,7 @@
equals(QT_MAJOR_VERSION, 4): {
SUBDIRS = datatypes qt-api
}
-
+
contains(CONFIG,configs) {
# !contains(CONFIG,hybris) {
SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
@@ -53,10 +53,10 @@
SENSORCONFIG_SETUP.files = config/sensord-daemon-conf-setup
SENSORCONFIG_SETUP.path = /usr/bin
-
+
INSTALLS += SENSORFWCONFIGFILES SENSORCONFIG_SETUP
}
-
+
contains(CONFIG,hybris) {
SUBDIRS = core/hybris.pro \
@@ -81,11 +81,13 @@
equals(QT_MAJOR_VERSION, 4):{
PKGCONFIGFILES.files = sensord.pc
+ PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord.pc'
QTCONFIGFILES.path = /usr/share/qt4/mkspecs/features
}
equals(QT_MAJOR_VERSION, 5):{
PKGCONFIGFILES.files = sensord-qt5.pc
+ PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord-qt5.pc'
QTCONFIGFILES.path = /usr/share/qt5/mkspecs/features
}
@@ -128,4 +130,3 @@
}
OTHER_FILES += config/*
-
|
