Tagging the 0.13 release

git-svn-id: https://svn.code.sf.net/p/qlscribe/svn/tags/release-0.13@159 cac9541e-1b8d-4bfa-827e-589bba606050

CMakeLists.txt

@@ -26,10 +26,10 @@ 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 )
-SET( QLSCRIBE_DBUS_MANAGER_SERVICE ${QLSCRIBE_DBUS_SERVICE}.Manager )
+SET( QLSCRIBE_DBUS_MANAGER_SERVICE ${QLSCRIBE_DBUS_SERVICE}.printManager )
 SET( QLSCRIBE_DBUS_DRIVES_SERVICE ${QLSCRIBE_DBUS_SERVICE}.drives )
 SET( QLSCRIBE_DBUS_PATH /org/lightscribe )
-SET( QLSCRIBE_DBUS_MANAGER_PATH ${QLSCRIBE_DBUS_PATH}/Manager ) # path to manager
+SET( QLSCRIBE_DBUS_MANAGER_PATH ${QLSCRIBE_DBUS_PATH}/printManager ) # path to manager
 SET( QLSCRIBE_DBUS_DRIVES_PATH ${QLSCRIBE_DBUS_PATH}/drives )   # base path under which drives located
 
 SUBDIRS( src )

debian/changelog

@@ -1,4 +1,5 @@
-qlscribe (0.12-0ubuntu1) unstable; urgency=low
+qlscribe (0.13-0ubuntu1) unstable; urgency=low
+  * Release 0.13 imported
   * Release 0.12 imported
   * Release 0.11 imported
   * Release 0.10 imported

debian/conffiles

@@ -1 +1 @@
-/usr/share/dbus-1/services/org.lightscribe.Manager.service
+/usr/share/dbus-1/system-services/org.lightscribe.printManager.service

debian/prerm

@@ -2,8 +2,7 @@
 set -e
 
 if [ "$1" = "remove" -o "$1" = "upgrade" ] ; then
-	PID=`pidof lscribed`
-	if [ "X$PID" != "X" ] ; then
+	if PID=`pidof lscribed` ; then
 		kill $PID
 	fi
 fi

debian/rules

@@ -17,7 +17,7 @@ configure-stamp:
 	cd build; cmake .. -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/qlscribe/usr \
                            -DFINAL_INSTALL_PREFIX=/usr \
 			   -DDBUS_SYSTEM_POLICY_DIR=$(CURDIR)/debian/qlscribe/etc/dbus-1/system.d \
-			   -DDBUS_SYSTEM_SERVICE_DIR=$(CURDIR)/debian/qlscribe/usr/share/dbus-1/services
+			   -DDBUS_SYSTEM_SERVICE_DIR=$(CURDIR)/debian/qlscribe/usr/share/dbus-1/system-services
 
 build: build-stamp
 

lscribed/CMakeLists.txt

@@ -22,7 +22,7 @@ FIND_PACKAGE( Dbus32 REQUIRED )
 FIND_PACKAGE( LightScribe REQUIRED )
 
 SET( LSCRIBED_CONF_FILE ${CMAKE_CURRENT_BINARY_DIR}/lightscribe.conf )
-SET( LSCRIBED_SERVICE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${QLSCRIBE_DBUS_SERVICE}.Manager.service )
+SET( LSCRIBED_SERVICE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${QLSCRIBE_DBUS_SERVICE}.printManager.service )
 
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lscribed.h.in ${CMAKE_CURRENT_BINARY_DIR}/lscribed.h @ONLY )
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lightscribe.conf.in ${LSCRIBED_CONF_FILE}  @ONLY )

lscribed/introspecthandler.cpp

@@ -45,7 +45,7 @@ DBusHandlerResult IntrospectHandler::processMessage( const Message &msg )
                           std::string( DBusManagerPath + pathlen, sublen )
                           + "\"/>";
          } else
-            introspect += "<node name=\"Manager\"/><node name=\"drives\"/>";
+            introspect += "<node name=\"printManager\"/><node name=\"drives\"/>";
       }
       introspect += "</node>";
 

lscribed/lightscribe.conf.in

@@ -7,15 +7,12 @@
   <!-- Only root can own the service -->
   <policy user="root">
     <allow own="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
-    <allow send_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
-    <allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
   </policy>
 
   <!-- Allow anyone to invoke methods on the interfaces -->
   <policy context="default">
-    <allow send_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
-    <allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
-    <allow receive_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
+    <allow send_destination="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
+    <allow send_destination="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
   </policy>
 
 </busconfig>

src/mainwindow.cpp

@@ -460,7 +460,7 @@ void MainWindow::onMenuAbout()
    QMessageBox::about( this,
                        tr( "About" ),
                        tr( "<h3>qlscribe - Qt lisghtScribe</h3>"
-                           "<p>release 0.12 $Revision$</p>"
+                           "<p>release 0.13 $Revision$</p>"
                            "<p>visit project at home page "
                            "<a href=\"http://qlscribe.sourceforge.net/\">qlscribe.sourceforge.net</a></p>" ) );
 }