Add support for maemo-launcher

diff --git a/Makefile.am b/Makefile.am
index a04337b..50f5063 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,9 +82,11 @@ src/main.c: ${cinaest_VALASOURCES}
 
 cinaest_VALAFLAGS = --disable-dbus-transformation --vapidir ./vapi --pkg config --pkg cinaest \
        --pkg dbus-glib-1 --pkg gconf-2.0 --pkg hildon-1 --pkg libosso --pkg gmodule-2.0
-cinaest_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
+cinaest_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} \
+       ${MAEMO_LAUNCHER_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
        -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
-cinaest_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${GMODULE_LIBS} -lcinaest
+cinaest_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} \
+       ${MAEMO_LAUNCHER_LIBS} ${OSSO_LIBS} ${GMODULE_LIBS} -lcinaest
 
 libcinaest_la_SOURCES = \
        src/genres.c \

diff --git a/configure.ac b/configure.ac
index 460da3f..b4c9c05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,21 @@ PKG_CHECK_MODULES(HILDONMIME, libhildonmime >= 2.1.3)
 AC_SUBST(HILDONMIME_LIBS)
 AC_SUBST(HILDONMIME_CFLAGS)
 
+AC_ARG_ENABLE([maemo-launcher],
+              [AS_HELP_STRING([--enable-maemo-launcher],
+                              [build with maemo-launcher support])],
+                              [case "${enableval}" in
+                               yes) maemo_launcher=true ;;
+                               no)  maemo_launcher=false ;;
+                               *) AC_MSG_ERROR([bad value ${enableval} for --enable-maemo-launcher])
+                               esac], [maemo_launcher=false])
+if test x$maemo_launcher = xtrue
+then
+       PKG_CHECK_MODULES(MAEMO_LAUNCHER, [maemo-launcher-app])
+       AC_SUBST(MAEMO_LAUNCHER_CFLAGS)
+       AC_SUBST(MAEMO_LAUNCHER_LIBS)
+fi
+
 PKG_CHECK_MODULES(OSSO, libosso >= 2.20)
 AC_SUBST(OSSO_LIBS)
 AC_SUBST(OSSO_CFLAGS)

diff --git a/debian/cinaest.launcher b/debian/cinaest.launcher
new file mode 100644 (file)
index 0000000..833443c
--- /dev/null
+++ b/debian/cinaest.launcher
@@ -0,0 +1 @@
+/usr/bin/cinaest

diff --git a/debian/control b/debian/control
index 8696219..9e21f9d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cinaest
 Section: user/multimedia
 Priority: extra
 Maintainer: Philipp Zabel <philipp.zabel@gmail.com>
-Build-Depends: vala (>= 0.7.9), debhelper (>= 4), maemo-optify (>= 0.2), calendar-backend-dev, libcurl4-openssl-dev, libhildon1-dev (>= 2.2.0), libhildonmime-dev (>= 2.1.3), libosso-dev (>= 2.20), osso-af-settings (>= 0.9.2), libdbus-glib-1-dev (>= 0.78), libdbus-1-dev (>= 1.2.14), libsoup2.4-dev (>= 2.24.3), libsqlite3-dev (>= 3.6.14), zlib1g-dev (>= 1.2.3)
+Build-Depends: vala (>= 0.7.9), debhelper (>= 4), maemo-launcher-dev (>= 0.23-1), maemo-optify (>= 0.2), calendar-backend-dev, libcurl4-openssl-dev, libhildon1-dev (>= 2.2.0), libhildonmime-dev (>= 2.1.3), libosso-dev (>= 2.20), osso-af-settings (>= 0.9.2), libdbus-glib-1-dev (>= 0.78), libdbus-1-dev (>= 1.2.14), libsoup2.4-dev (>= 2.24.3), libsqlite3-dev (>= 3.6.14), zlib1g-dev (>= 1.2.3)
 Standards-Version: 4
 XSBC-Bugtracker: https://bugs.maemo.org/enter_bug.cgi?product=Cinaest
 

diff --git a/debian/rules b/debian/rules
index 7b2b472..bc35360 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,12 +22,15 @@ endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
+ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
+       conf_opt := --enable-maemo-launcher
+endif
 
 config.status: configure
        dh_testdir
        # Add here commands to configure the package.
        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-                --prefix=/usr --libexecdir=/usr/libexec
+                --prefix=/usr --libexecdir=/usr/libexec $(conf_opt)
 
 build: build-stamp
 
@@ -75,6 +78,7 @@ binary-arch: install
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol
+       dh_maemolauncher
        dh_md5sums
        maemo-optify
        dh_builddeb