Revert "[sensorfw] Remove obsolete debian packaging"

This reverts commit 2250f12.

Conflicts:
	rpm/sensorfw.spec

debian/README

@@ -0,0 +1,14 @@
+###
+### The Debian Package sensord
+###
+
+This package provides the sensor system daemon. 
+
+# About CompassSensor
+
+The algorithms used with the magnetometer are proprietary, and are not
+included with this build. They can be installed from package
+sensorfw-plugins-compasslogic.
+
+Unless the package is installed, CompassSensor and MagnetometerSensor will
+fail to load.

debian/_aegis

@@ -0,0 +1,6 @@
+<aegis>
+  <request policy="add">
+    <credential name="mce::SensorControl" />
+    <for path="/usr/sbin/sensord" />
+  </request>
+</aegis>

debian/api

@@ -0,0 +1,32 @@
+interface: libsensord
+type: library
+scope: internal
+state: unstable
+libs-pkg: sensord
+dev-pkg: libsensord-dev
+headers:
+ /usr/include/sensord/datatypes/*
+ /usr/include/sensord/*_i.h
+libs:
+ /usr/lib/libsensorclient.so.1.0.0
+ /usr/lib/libsensordatatypes.so.1.0.0
+
+interface: sensordPlugins
+type: library
+scope: internal
+state: unstable
+libs-pkg: sensord
+dev-pkg: libsensord-dev
+headers:
+ /usr/include/sensord/plugin.h
+ /usr/include/sensord/sensormanager.h
+ /usr/include/sensord/deviceadaptor.h
+ /usr/include/sensord/abstractsensor.h
+ /usr/include/sensord/abstractchain.h
+ /usr/include/sensord/filter.h
+ /usr/include/sensord/bin.h
+ /usr/include/sensord/bufferreader.h
+ /usr/include/sensord/filterproperty.h
+libs:
+ /usr/lib/libsensorclient.so.1.0.0
+ /usr/lib/libsensordatatypes.so.1.0.0

debian/compat

@@ -0,0 +1 @@
+5

debian/control

@@ -0,0 +1,57 @@
+Source: sensord
+Section: misc
+Priority: optional
+Maintainer: Antti Virtanen <antti.i.virtanen@nokia.com>
+Uploaders: Timo Rongas <ext-timo.2.rongas@nokia.com>, Pia Niemelä <pia.s.niemela@nokia.com>, Markus Lehtonen <markus.lehtonen@nokia.com>, Semi Malinen <semi.malinen@nokia.com>
+Build-Depends: debhelper (>=5), libqt4-dev (>= 4.5), doxygen, libcontextprovider-dev (>= 0.3), libgconf2-dev, mce-dev (>= 1.10.16), aegis-builder (>= 1.4)
+Standards-Version: 3.7.3
+
+Package: sensord
+Section: misc
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (>=4.5), libgconf2-6, mce (>=1.10.94)
+Description: Sensor framework daemon
+ Provides sensor framework daemon and required libraries
+
+Package: sensord-dbg
+Section: misc
+Priority: extra
+Architecture: any
+Depends: sensord (= ${binary:Version}), ${misc:Depends}
+Description: Sensor framework daemon and libraries debug symbols
+ Debug symbols for sensor framework daemon and libraries.
+
+Package: libsensord-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libqt4-dev (>= 4.5), sensord (= ${binary:Version})
+Description: Sensor framework daemon libraries development headers
+ Development headers for sensor framework daemon and libraries.
+
+Package: libsensord-doc
+Section: doc
+Architecture: all
+Priority: optional
+Description: API documentation for libsensord
+ Doxygen-generated API documentation for sensord.
+
+Package: sensord-tests
+Section: tests
+Architecture: any
+Depends: ci-testing, mcetools, sensord (= ${binary:Version}), sysklogd, python, ${shlibs:Depends}
+XB-Maemo-CI-Packages: sensord
+XB-Maemo-CI-Stage: fast, staging, acceptance, validation
+Description: Unit test cases for sensord
+ Contains unit test cases for CI environment.
+
+Package: sensord-contextfw-tests
+Section: tests
+Architecture: any
+Depends: ci-testing, sensord (= ${binary:Version}), sensord-tests (= ${binary:Version}), contextkit-utils (>> 0.3.6), python-contextkit (>> 0.3.6), ${shlibs:Depends}
+XB-Maemo-CI-Packages: sensord
+XB-Maemo-CI-Stage: fast, staging, acceptance, validation
+Description: Test cases for sensord acting as context provider
+ Contains test cases for CI environment, for ensuring that sensord provides
+ context properties correctly.

debian/copyright

@@ -0,0 +1,18 @@
+Copyright (C) 2009-2011 Nokia Corporation
+
+   This file is part of Sensord.
+
+   Sensord is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License
+   version 2.1 as published by the Free Software Foundation.
+
+   Sensord is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with Sensord.  If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU Lesser
+General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.

debian/libsensord-dev.dirs

@@ -0,0 +1 @@
+/usr/include/sensord

debian/libsensord-dev.install

@@ -0,0 +1,4 @@
+/usr/include/sensord/*.h
+/usr/include/sensord/datatypes/*.h
+/usr/lib/pkgconfig/*.pc
+/usr/share/qt4/mkspecs/features/*.prf

debian/libsensord-doc.install

@@ -0,0 +1 @@
+/usr/share/doc/sensord

debian/rules

@@ -0,0 +1,144 @@
+#!/usr/bin/make -f
+
+# some commonly used local vars
+comma:= ,
+empty:=
+space:= $(empty) $(empty)
+
+
+# project specific
+PROJECT_NAME:= sensorfw
+BUILD_DIR:= builddir
+PACKAGE_NAME:= sensord
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+
+# custom C(XX)FLAGS
+CFLAGS = -Wall -g -Wno-psabi
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    CFLAGS += -O2
+endif
+
+# DEPRECATED: No need for separation anymore
+#### Change binary lib include paths depending on host architecture
+###ADEB_HOST_ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+###ifneq ($(strip $(DEB_HOST_ARCH)),armel)
+###    QMAKECONFIG:="CONFIG+=x86build"
+###endif
+
+#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+#    INSTALL_PROGRAM += -s
+#endif
+
+# Setup to build with contexprovider capabilities
+# Commented out, this comes from common-config these days
+#QMAKECONFIG:= $(QMAKECONFIG) CONFIG+=contextprovider
+
+# check for parallel parameter
+ifneq (,$(findstring parallel=,$(DEB_BUILD_OPTIONS)))
+    # DEB_BUILD_OPTIONS can't seem to make its mind with the list usage...
+    # ...so replace commas with spaces before doing anything else
+    PROPER_DEB_BUILD_OPTIONS := $(strip $(subst $(comma),$(space),$(DEB_BUILD_OPTIONS)))
+    # get the number of jobs
+    MAKE_PARALLEL_PARAMS := -j$(subst parallel=,$(empty),$(filter parallel=%,$(PROPER_DEB_BUILD_OPTIONS)))
+endif
+
+# check for build docs
+export MAKE_DOCS := yes
+ifneq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
+    export MAKE_DOCS = no
+endif
+
+
+builddir:
+	mkdir -p $(BUILD_DIR)
+
+configure: configure-stamp
+configure-stamp: builddir
+	dh_testdir
+
+	# Add here commands to configure the package.
+	cd $(BUILD_DIR) && qmake $(QMAKECONFIG) "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
+	export LD_RUN_PATH=/usr/lib/sensord/
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+	dh_testdir
+
+	# Add here commands to compile the package.
+	cd $(BUILD_DIR) && $(MAKE) $(MAKE_PARALLEL_PARAMS)
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	rm -r -f $(BUILD_DIR)
+	rm -f -r debian/tmp
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	cd $(BUILD_DIR) && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp $(MAKE_PARALLEL_PARAMS) install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+#	dh_installexamples
+	dh_install --sourcedir=debian/tmp
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit --name=sensorsystem -u "start 60 2 3 4 5 . stop 40 0 1 6 ."
+#	dh_installupstart
+#	dh_installcron
+#	dh_installinfo
+#	dh_installman
+	dh_link
+	dh_strip --dbg-package=$(PACKAGE_NAME)-dbg
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_makeshlibs --exclude=/usr/lib/sensord
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+	aegis-deb-add -control debian/sensord/DEBIAN/control .. debian/_aegis=_aegis
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
+
+# End of File
+

debian/sensord-contextfw-tests.install

@@ -0,0 +1,5 @@
+/usr/share/sensord-contextfw-tests/tests.xml
+/usr/share/sensord-contextfw-tests/testorientation.py
+/usr/share/sensord-contextfw-tests/testorientation-manual.sh
+/usr/share/sensord-contextfw-tests/testals.py
+/usr/share/sensord-contextfw-tests/teststationary.py

debian/sensord-dev.dirs

@@ -0,0 +1 @@
+/usr/include/sensord

debian/sensord-dev.install

@@ -0,0 +1 @@
+/usr/include/sensord/*.h

debian/sensord-tests.dirs

@@ -0,0 +1 @@
+/usr/share/sensord-tests

debian/sensord-tests.install

@@ -0,0 +1,10 @@
+/usr/share/sensord-tests/tests.xml
+/usr/share/sensord-tests/*.conf
+/usr/share/sensord-tests/sensord-deadclienttest.py
+/usr/bin/sensor*-test
+/usr/bin/sensord-deadclient
+/usr/bin/sensordummyclient
+/usr/lib/sensord/testing/*
+/usr/bin/sensortestapp
+/usr/bin/datafaker
+/usr/bin/sensordiverter.sh

debian/sensord.dirs

@@ -0,0 +1,2 @@
+/usr/lib/sensord
+

debian/sensord.install

@@ -0,0 +1,10 @@
+#/usr/lib/libfilters.so*
+/usr/lib/libsensorclient.so*
+/usr/lib/libsensordatatypes.so*
+/usr/lib/libsensorfw.so*
+/usr/lib/sensord/*so
+/usr/sbin/sensord
+/usr/share/contextkit/providers/*
+/etc/dbus-1/system.d/*
+/etc/sensorfw/sensor*.conf
+/etc/sensorfw/sensord.conf.d/90-sensord-default.conf

rpm/sensorfw-qt5.spec

@@ -130,8 +130,9 @@ systemctl daemon-reload || :
 %dir %{_sysconfdir}/sensorfw
 %config %{_sysconfdir}/sensorfw/sensord.conf
 %dir %{_sysconfdir}/sensorfw/sensord.conf.d/
-%{_unitdir}/sensord.service
-%{_unitdir}/graphical.target.wants/sensord.service
+#%doc debian/copyright debian/README COPYING
+/%{_lib}/systemd/system/sensord.service
+/%{_lib}/systemd/system/basic.target.wants/sensord.service
 %{_bindir}/sensord-daemon-conf-setup
 
 %files devel