From 5bc5aa05be864add9a2c1304a08e964eedd82c15 Mon Sep 17 00:00:00 2001 From: ruglory Date: Thu, 5 Mar 2009 06:06:05 +0000 Subject: [PATCH] Changes for ubuntu proper build git-svn-id: https://svn.code.sf.net/p/qlscribe/svn/trunk@116 cac9541e-1b8d-4bfa-827e-589bba606050 --- CMakeLists.txt | 1 + debian/changelog | 4 ++-- debian/postinst | 14 ++++++++++++++ debian/prerm | 21 +++++++++++++++++++++ debian/rules | 5 +++-- lscribed/CMakeLists.txt | 2 +- lscribed/service.in | 2 +- 7 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 debian/postinst create mode 100644 debian/prerm diff --git a/CMakeLists.txt b/CMakeLists.txt index fe19591..269ad2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ PROJECT( qlscribe ) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) +SET( FINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Final install path") SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ) SET( QLSCRIBE_DBUS_SERVICE org.lightscribe ) diff --git a/debian/changelog b/debian/changelog index 88cce9d..072b0ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -qlscribe (0.7-0ubuntu1) unstable; urgency=low - +qlscribe (0.8-0ubuntu1) unstable; urgency=low + * Release 0.8 imported * Initial release -- Vyacheslav Kononenko Sun, 15 Feb 2009 21:49:41 -0500 diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..8e40e52 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,14 @@ +#!/bin/sh +set -e + +if [ "$1" = "configure" ] ; then + cp -f /usr/share/qlscribe/lightscribe.conf /etc/dbus-1/system.d/ + cp -f /usr/share/qlscribe/org.lightscribe.Manager.service /usr/share/dbus-1/system-services/ + /etc/init.d/dbus reload +fi + +#DEBHELPER# + +exit 0 + + diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 0000000..3b0fce9 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" -o "$1" = "upgrade" ] ; then + PID=`pidof lscribed` + if [ "X$PID" != "X" ] ; then + kill $PID + fi +fi + +if [ "$1" = "remove" ] ; then + rm -f /etc/dbus-1/system.d/lightscribe.conf + rm -f /usr/share/dbus-1/system-services/org.lightscribe.Manager.service + /etc/init.d/dbus reload +fi + +#DEBHELPER# + +exit 0 + + diff --git a/debian/rules b/debian/rules index 99aa134..2f212ea 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,8 @@ configure-stamp: dh_testdir # Add here commands to configure the package. mkdir -p build - cd build; cmake .. -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/qlscribe/usr + cd build; cmake .. -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/qlscribe/usr \ + -DFINAL_INSTALL_PREFIX=/usr touch configure-stamp @@ -77,7 +78,7 @@ binary-arch: build install # dh_link # dh_strip dh_compress -# dh_fixperms #need suid + dh_fixperms # dh_perl # dh_makeshlibs dh_installdeb diff --git a/lscribed/CMakeLists.txt b/lscribed/CMakeLists.txt index a341dc2..9d76ca1 100644 --- a/lscribed/CMakeLists.txt +++ b/lscribed/CMakeLists.txt @@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) ADD_EXECUTABLE( lscribed ${LSCRIBED_SRCS} ) -TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} ) +TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread ) INSTALL( TARGETS lscribed DESTINATION sbin ) INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe ) diff --git a/lscribed/service.in b/lscribed/service.in index 650b15a..92451d8 100644 --- a/lscribed/service.in +++ b/lscribed/service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=@QLSCRIBE_DBUS_MANAGER_SERVICE@ -Exec=@CMAKE_INSTALL_PREFIX@/sbin/lscribed +Exec=@FINAL_INSTALL_PREFIX@/sbin/lscribed User=root