[arch-commits] Commit in cdemu-daemon/trunk (PKGBUILD system-arch.patch)
Jan Steffens
heftig at archlinux.org
Thu Oct 8 20:26:57 UTC 2015
Date: Thursday, October 8, 2015 @ 22:26:57
Author: heftig
Revision: 143452
Fix DBus service Name capitalization
Modified:
cdemu-daemon/trunk/PKGBUILD
cdemu-daemon/trunk/system-arch.patch
-------------------+
PKGBUILD | 6 ++---
system-arch.patch | 55 +++++++++++++++++++++++++++-------------------------
2 files changed, 32 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-08 20:24:25 UTC (rev 143451)
+++ PKGBUILD 2015-10-08 20:26:57 UTC (rev 143452)
@@ -6,7 +6,7 @@
pkgname=cdemu-daemon
pkgver=3.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="CD/DVD-ROM device emulator daemon"
arch=(i686 x86_64)
url="http://cdemu.sourceforge.net/"
@@ -18,10 +18,10 @@
backup=(etc/conf.d/cdemu-daemon
etc/dbus-1/system.d/cdemu-daemon-dbus.conf)
install=cdemu-daemon.install
-source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
+source=("http://downloads.sourceforge.net/cdemu/$pkgname/$pkgname-$pkgver.tar.bz2"
system-arch.patch)
sha256sums=('8c9a0d292e0fd71538f123f2b795f4490ff455f68b391b97812be369c34a4f06'
- '29507da7367983bdc5f541e9f9252f189412041076842b8d08a5c4dac29f23cd')
+ 'dee634da8b8301893f458647f536b183d1d3898e289d1ac570c189c986828cfe')
prepare() {
mkdir build
Modified: system-arch.patch
===================================================================
--- system-arch.patch 2015-10-08 20:24:25 UTC (rev 143451)
+++ system-arch.patch 2015-10-08 20:26:57 UTC (rev 143452)
@@ -1,8 +1,8 @@
-diff -u -rN cdemu-daemon-2.1.0/CMakeLists.txt cdemu-daemon-2.1.0-arch/CMakeLists.txt
---- cdemu-daemon-2.1.0/CMakeLists.txt 2013-06-07 21:33:53.000000000 +0200
-+++ cdemu-daemon-2.1.0-arch/CMakeLists.txt 2013-06-08 02:20:15.948655947 +0200
-@@ -18,7 +18,7 @@
- include (FileList)
+diff -u -rN cdemu-daemon-3.0.2/CMakeLists.txt cdemu-daemon-3.0.2-arch/CMakeLists.txt
+--- cdemu-daemon-3.0.2/CMakeLists.txt 2014-09-28 21:19:13.000000000 +0200
++++ cdemu-daemon-3.0.2-arch/CMakeLists.txt 2015-10-08 22:23:20.174377466 +0200
+@@ -12,7 +12,7 @@
+ include (GNUInstallDirs)
# Options
-option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" off)
@@ -10,7 +10,7 @@
option (SESSION_BUS_SERVICE "Install CDEmu daemon as D-Bus session bus service" on)
# If install prefix is /usr, override the sysconf dir to be /etc instead of /usr/etc
-@@ -46,6 +46,10 @@
+@@ -40,6 +40,10 @@
${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
)
@@ -20,8 +20,8 @@
+)
# Global definitions
- add_definitions (-std=gnu99) #NOTE: Compilation bugs out on using signals and -std=c99
-@@ -104,6 +108,10 @@
+ add_definitions (-std=c99) # We're compiling using C99
+@@ -112,6 +116,10 @@
DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
)
install (
@@ -32,7 +32,7 @@
FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
)
-@@ -111,5 +119,10 @@
+@@ -119,6 +127,11 @@
FILES system/cdemu-daemon-dbus.conf
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
)
@@ -43,9 +43,10 @@
+ )
endif ()
-diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf
---- cdemu-daemon-2.1.0/system/cdemu-daemon.conf 1970-01-01 01:00:00.000000000 +0100
-+++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf 2013-06-08 02:12:19.032035389 +0200
+ # *** Configuration summary ***
+diff -u -rN cdemu-daemon-3.0.2/system/cdemu-daemon.conf cdemu-daemon-3.0.2-arch/system/cdemu-daemon.conf
+--- cdemu-daemon-3.0.2/system/cdemu-daemon.conf 1970-01-01 01:00:00.000000000 +0100
++++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon.conf 2015-10-08 22:23:20.174377466 +0200
@@ -0,0 +1,8 @@
+# how many optical drives to emulate
+#NUM_DEVICES=1
@@ -55,9 +56,9 @@
+
+# log file
+#LOG_FILE=/var/log/cdemu-daemon.log
-diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf
---- cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf 2013-06-07 21:33:53.000000000 +0200
-+++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf 2013-06-08 02:11:52.922220389 +0200
+diff -u -rN cdemu-daemon-3.0.2/system/cdemu-daemon-dbus.conf cdemu-daemon-3.0.2-arch/system/cdemu-daemon-dbus.conf
+--- cdemu-daemon-3.0.2/system/cdemu-daemon-dbus.conf 2014-09-28 21:19:13.000000000 +0200
++++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon-dbus.conf 2015-10-08 22:23:20.174377466 +0200
@@ -11,8 +11,13 @@
<allow own="net.sf.cdemu.CDEmuDaemon"/>
</policy>
@@ -74,9 +75,9 @@
<allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
</policy>
</busconfig>
-diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.service.in cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in
---- cdemu-daemon-2.1.0/system/cdemu-daemon.service.in 1970-01-01 01:00:00.000000000 +0100
-+++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in 2013-06-08 02:13:08.331686074 +0200
+diff -u -rN cdemu-daemon-3.0.2/system/cdemu-daemon.service.in cdemu-daemon-3.0.2-arch/system/cdemu-daemon.service.in
+--- cdemu-daemon-3.0.2/system/cdemu-daemon.service.in 1970-01-01 01:00:00.000000000 +0100
++++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon.service.in 2015-10-08 22:23:20.224377272 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=CDEmu Daemon
@@ -88,9 +89,9 @@
+
+[Install]
+WantedBy=multi-user.target
-diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh
---- cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh 2013-06-07 21:33:53.000000000 +0200
-+++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh 2013-06-08 02:11:53.152218760 +0200
+diff -u -rN cdemu-daemon-3.0.2/system/cdemu-daemon-system.sh cdemu-daemon-3.0.2-arch/system/cdemu-daemon-system.sh
+--- cdemu-daemon-3.0.2/system/cdemu-daemon-system.sh 2014-09-28 21:19:13.000000000 +0200
++++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon-system.sh 2015-10-08 22:23:20.224377272 +0200
@@ -1,15 +1,15 @@
#!/bin/sh
# Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
@@ -110,11 +111,13 @@
if [ -f ${CONFIG_FILE} ]; then
. ${CONFIG_FILE};
-diff -u -rN cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in
---- cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in 2013-06-07 21:33:53.000000000 +0200
-+++ cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in 2013-06-08 02:14:26.824463231 +0200
-@@ -2,4 +2,4 @@
- Name=net.sf.cdemu.CdemuDaemon
+diff -u -rN cdemu-daemon-3.0.2/system/net.sf.cdemu.CDEmuDaemon.service.in cdemu-daemon-3.0.2-arch/system/net.sf.cdemu.CDEmuDaemon.service.in
+--- cdemu-daemon-3.0.2/system/net.sf.cdemu.CDEmuDaemon.service.in 2014-09-28 21:19:13.000000000 +0200
++++ cdemu-daemon-3.0.2-arch/system/net.sf.cdemu.CDEmuDaemon.service.in 2015-10-08 22:23:50.247594098 +0200
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+-Name=net.sf.cdemu.CdemuDaemon
++Name=net.sf.cdemu.CDEmuDaemon
Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
User=root
-
More information about the arch-commits
mailing list