[arch-commits] Commit in cdemu-daemon/repos/community-x86_64 (6 files)

2020-01-07 Thread Jan Steffens via arch-commits 
Date: Tuesday, January 7, 2020 @ 20:48:16
  Author: heftig
Revision: 550092

archrelease: copy trunk to community-x86_64

Added:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
(from rev 550091, 
cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
  cdemu-daemon/repos/community-x86_64/PKGBUILD
(from rev 550091, cdemu-daemon/trunk/PKGBUILD)
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install
(from rev 550091, cdemu-daemon/trunk/cdemu-daemon.install)
Deleted:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
  cdemu-daemon/repos/community-x86_64/PKGBUILD
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install

--+
 0001-Patch-system-daemon-for-Arch-friendliness.patch |  306 -
 PKGBUILD |   92 ++---
 cdemu-daemon.install |   72 ++--
 3 files changed, 235 insertions(+), 235 deletions(-)

Deleted: 0001-Patch-system-daemon-for-Arch-friendliness.patch
===
--- 0001-Patch-system-daemon-for-Arch-friendliness.patch2020-01-07 
20:47:30 UTC (rev 550091)
+++ 0001-Patch-system-daemon-for-Arch-friendliness.patch2020-01-07 
20:48:16 UTC (rev 550092)
@@ -1,153 +0,0 @@
-From de8825af23b63b78e6d8262b408f8350581ba58e Mon Sep 17 00:00:00 2001
-Message-Id: 

-From: "Jan Alexander Steffens (heftig)" 
-Date: Mon, 12 Jun 2017 22:22:51 +0200
-Subject: [PATCH] Patch system daemon for Arch-friendliness
-

- cdemu-daemon/CMakeLists.txt | 17 +++--
- cdemu-daemon/system/cdemu-daemon-dbus.conf  |  9 +++--
- cdemu-daemon/system/cdemu-daemon-system.sh  |  6 +++---
- cdemu-daemon/system/cdemu-daemon.conf   |  8 
- cdemu-daemon/system/cdemu-daemon.service.in | 10 ++
- .../system/net.sf.cdemu.CDEmuDaemon.service.in  |  4 ++--
- 6 files changed, 45 insertions(+), 9 deletions(-)
- create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
- create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
-
-diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
-index cf41234a..adfcc3ac 100644
 a/cdemu-daemon/CMakeLists.txt
-+++ b/cdemu-daemon/CMakeLists.txt
-@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
- include (GNUInstallDirs)
- 
- # Options
--option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
off)
-+option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
on)
- 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
-@@ -45,6 +45,10 @@ configure_file (
- ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
- ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- )
-+configure_file (
-+${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in
-+${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+)
- 
- # Global definitions
- add_definitions (-std=c99) # We're compiling using C99
-@@ -122,13 +126,22 @@ if (SYSTEM_BUS_SERVICE)
- PROGRAMS system/cdemu-daemon-system.sh
- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
- )
-+install (
-+FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
-+)
- install (
- FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
- )
- install (
- FILES system/cdemu-daemon-dbus.conf
--DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
-+DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d
-+)
-+install (
-+FILES system/cdemu-daemon.conf
-+RENAME cdemu-daemon
-+DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
- )
- endif ()
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf 
b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-index c450d78c..e86b62cf 100644
 a/cdemu-daemon/system/cdemu-daemon-dbus.conf
-+++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-@@ -11,8 +11,13 @@
- 
- 
- 
--
--
-+
-+
-+
-+
-+
-+
-+
- 
- 
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-system.sh 
b/cdemu-daemon/system/cdemu-daemon-system.sh
-index d9ab60aa..735c2444 100755
 a/cdemu-daemon/system/cdemu-daemon-system.sh
-+++ b/cdemu-daemon/system/cdemu-daemon-system.sh
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemu-daemon
- 
- # Default settings
- NUM_DEVICES=1
-

[arch-commits] Commit in cdemu-daemon/repos/community-x86_64 (6 files)

2019-08-31 Thread Jan Steffens via arch-commits 
Date: Sunday, September 1, 2019 @ 02:29:42
  Author: heftig
Revision: 505772

archrelease: copy trunk to community-x86_64

Added:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
(from rev 505770, 
cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
  cdemu-daemon/repos/community-x86_64/PKGBUILD
(from rev 505770, cdemu-daemon/trunk/PKGBUILD)
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install
(from rev 505770, cdemu-daemon/trunk/cdemu-daemon.install)
Deleted:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
  cdemu-daemon/repos/community-x86_64/PKGBUILD
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install

--+
 0001-Patch-system-daemon-for-Arch-friendliness.patch |  306 -
 PKGBUILD |   92 ++---
 cdemu-daemon.install |   72 ++--
 3 files changed, 235 insertions(+), 235 deletions(-)

Deleted: 0001-Patch-system-daemon-for-Arch-friendliness.patch
===
--- 0001-Patch-system-daemon-for-Arch-friendliness.patch2019-09-01 
02:29:40 UTC (rev 505771)
+++ 0001-Patch-system-daemon-for-Arch-friendliness.patch2019-09-01 
02:29:42 UTC (rev 505772)
@@ -1,153 +0,0 @@
-From de8825af23b63b78e6d8262b408f8350581ba58e Mon Sep 17 00:00:00 2001
-Message-Id: 

-From: "Jan Alexander Steffens (heftig)" 
-Date: Mon, 12 Jun 2017 22:22:51 +0200
-Subject: [PATCH] Patch system daemon for Arch-friendliness
-

- cdemu-daemon/CMakeLists.txt | 17 +++--
- cdemu-daemon/system/cdemu-daemon-dbus.conf  |  9 +++--
- cdemu-daemon/system/cdemu-daemon-system.sh  |  6 +++---
- cdemu-daemon/system/cdemu-daemon.conf   |  8 
- cdemu-daemon/system/cdemu-daemon.service.in | 10 ++
- .../system/net.sf.cdemu.CDEmuDaemon.service.in  |  4 ++--
- 6 files changed, 45 insertions(+), 9 deletions(-)
- create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
- create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
-
-diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
-index cf41234a..adfcc3ac 100644
 a/cdemu-daemon/CMakeLists.txt
-+++ b/cdemu-daemon/CMakeLists.txt
-@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
- include (GNUInstallDirs)
- 
- # Options
--option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
off)
-+option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
on)
- 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
-@@ -45,6 +45,10 @@ configure_file (
- ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
- ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- )
-+configure_file (
-+${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in
-+${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+)
- 
- # Global definitions
- add_definitions (-std=c99) # We're compiling using C99
-@@ -122,13 +126,22 @@ if (SYSTEM_BUS_SERVICE)
- PROGRAMS system/cdemu-daemon-system.sh
- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
- )
-+install (
-+FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
-+)
- install (
- FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
- )
- install (
- FILES system/cdemu-daemon-dbus.conf
--DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
-+DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d
-+)
-+install (
-+FILES system/cdemu-daemon.conf
-+RENAME cdemu-daemon
-+DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
- )
- endif ()
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf 
b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-index c450d78c..e86b62cf 100644
 a/cdemu-daemon/system/cdemu-daemon-dbus.conf
-+++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-@@ -11,8 +11,13 @@
- 
- 
- 
--
--
-+
-+
-+
-+
-+
-+
-+
- 
- 
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-system.sh 
b/cdemu-daemon/system/cdemu-daemon-system.sh
-index d9ab60aa..735c2444 100755
 a/cdemu-daemon/system/cdemu-daemon-system.sh
-+++ b/cdemu-daemon/system/cdemu-daemon-system.sh
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemu-daemon
- 
- # Default settings
- NUM_DEVICES=1
-

[arch-commits] Commit in cdemu-daemon/repos/community-x86_64 (6 files)

2019-03-02 Thread Jan Steffens via arch-commits 
Date: Sunday, March 3, 2019 @ 02:50:52
  Author: heftig
Revision: 437423

archrelease: copy trunk to community-x86_64

Added:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
(from rev 437422, 
cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
  cdemu-daemon/repos/community-x86_64/PKGBUILD
(from rev 437422, cdemu-daemon/trunk/PKGBUILD)
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install
(from rev 437422, cdemu-daemon/trunk/cdemu-daemon.install)
Deleted:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
  cdemu-daemon/repos/community-x86_64/PKGBUILD
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install

--+
 0001-Patch-system-daemon-for-Arch-friendliness.patch |  306 -
 PKGBUILD |   94 ++---
 cdemu-daemon.install |   72 ++--
 3 files changed, 235 insertions(+), 237 deletions(-)

Deleted: 0001-Patch-system-daemon-for-Arch-friendliness.patch
===
--- 0001-Patch-system-daemon-for-Arch-friendliness.patch2019-03-03 
02:50:40 UTC (rev 437422)
+++ 0001-Patch-system-daemon-for-Arch-friendliness.patch2019-03-03 
02:50:52 UTC (rev 437423)
@@ -1,153 +0,0 @@
-From de8825af23b63b78e6d8262b408f8350581ba58e Mon Sep 17 00:00:00 2001
-Message-Id: 

-From: "Jan Alexander Steffens (heftig)" 
-Date: Mon, 12 Jun 2017 22:22:51 +0200
-Subject: [PATCH] Patch system daemon for Arch-friendliness
-

- cdemu-daemon/CMakeLists.txt | 17 +++--
- cdemu-daemon/system/cdemu-daemon-dbus.conf  |  9 +++--
- cdemu-daemon/system/cdemu-daemon-system.sh  |  6 +++---
- cdemu-daemon/system/cdemu-daemon.conf   |  8 
- cdemu-daemon/system/cdemu-daemon.service.in | 10 ++
- .../system/net.sf.cdemu.CDEmuDaemon.service.in  |  4 ++--
- 6 files changed, 45 insertions(+), 9 deletions(-)
- create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
- create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
-
-diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
-index cf41234a..adfcc3ac 100644
 a/cdemu-daemon/CMakeLists.txt
-+++ b/cdemu-daemon/CMakeLists.txt
-@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
- include (GNUInstallDirs)
- 
- # Options
--option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
off)
-+option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
on)
- 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
-@@ -45,6 +45,10 @@ configure_file (
- ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
- ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- )
-+configure_file (
-+${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in
-+${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+)
- 
- # Global definitions
- add_definitions (-std=c99) # We're compiling using C99
-@@ -122,13 +126,22 @@ if (SYSTEM_BUS_SERVICE)
- PROGRAMS system/cdemu-daemon-system.sh
- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
- )
-+install (
-+FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
-+)
- install (
- FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
- )
- install (
- FILES system/cdemu-daemon-dbus.conf
--DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
-+DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d
-+)
-+install (
-+FILES system/cdemu-daemon.conf
-+RENAME cdemu-daemon
-+DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
- )
- endif ()
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf 
b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-index c450d78c..e86b62cf 100644
 a/cdemu-daemon/system/cdemu-daemon-dbus.conf
-+++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-@@ -11,8 +11,13 @@
- 
- 
- 
--
--
-+
-+
-+
-+
-+
-+
-+
- 
- 
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-system.sh 
b/cdemu-daemon/system/cdemu-daemon-system.sh
-index d9ab60aa..735c2444 100755
 a/cdemu-daemon/system/cdemu-daemon-system.sh
-+++ b/cdemu-daemon/system/cdemu-daemon-system.sh
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemu-daemon
- 
- # Default settings
- NUM_DEVICES=1
- AUDIO_DRIVER=null

[arch-commits] Commit in cdemu-daemon/repos/community-x86_64 (6 files)

2019-01-15 Thread Jan Steffens via arch-commits 
Date: Tuesday, January 15, 2019 @ 20:44:51
  Author: heftig
Revision: 423372

archrelease: copy trunk to community-x86_64

Added:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
(from rev 423371, 
cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
  cdemu-daemon/repos/community-x86_64/PKGBUILD
(from rev 423371, cdemu-daemon/trunk/PKGBUILD)
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install
(from rev 423371, cdemu-daemon/trunk/cdemu-daemon.install)
Deleted:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
  cdemu-daemon/repos/community-x86_64/PKGBUILD
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install

--+
 0001-Patch-system-daemon-for-Arch-friendliness.patch |  304 -
 PKGBUILD |   98 ++---
 cdemu-daemon.install |   72 ++--
 3 files changed, 237 insertions(+), 237 deletions(-)

Deleted: 0001-Patch-system-daemon-for-Arch-friendliness.patch
===
--- 0001-Patch-system-daemon-for-Arch-friendliness.patch2019-01-15 
20:44:27 UTC (rev 423371)
+++ 0001-Patch-system-daemon-for-Arch-friendliness.patch2019-01-15 
20:44:51 UTC (rev 423372)
@@ -1,151 +0,0 @@
-From 17d054bc9fb02bbb557f9de68e29e715a17f3ee6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Mon, 12 Jun 2017 22:22:51 +0200
-Subject: [PATCH] Patch system daemon for Arch-friendliness
-

- cdemu-daemon/CMakeLists.txt | 15 ++-
- cdemu-daemon/system/cdemu-daemon-dbus.conf  |  9 +++--
- cdemu-daemon/system/cdemu-daemon-system.sh  |  6 +++---
- cdemu-daemon/system/cdemu-daemon.conf   |  8 
- cdemu-daemon/system/cdemu-daemon.service.in | 10 ++
- cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in |  4 ++--
- 6 files changed, 44 insertions(+), 8 deletions(-)
- create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
- create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
-
-diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
-index 76feb818d09a57af..c6abd56b82484b6f 100644
 a/cdemu-daemon/CMakeLists.txt
-+++ b/cdemu-daemon/CMakeLists.txt
-@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
- include (GNUInstallDirs)
- 
- # Options
--option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
off)
-+option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
on)
- 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
-@@ -45,6 +45,10 @@ configure_file (
- ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
- ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- )
-+configure_file (
-+${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in
-+${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+)
- 
- # Global definitions
- add_definitions (-std=c99) # We're compiling using C99
-@@ -121,13 +125,22 @@ if (SYSTEM_BUS_SERVICE)
- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
- )
- install (
-+FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
-+)
-+install (
- FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
- )
- install (
- FILES system/cdemu-daemon-dbus.conf
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
- )
-+install (
-+FILES system/cdemu-daemon.conf
-+RENAME cdemu-daemon
-+DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
-+)
- endif ()
- 
- # Translations; we use the version provided by our FindIntlTool.cmake
-diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf 
b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-index c450d78cf03bce6a..e86b62cf0437a9fd 100644
 a/cdemu-daemon/system/cdemu-daemon-dbus.conf
-+++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-@@ -11,8 +11,13 @@
- 
- 
- 
--
--
-+
-+
-+
-+
-+
-+
-+
- 
- 
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-system.sh 
b/cdemu-daemon/system/cdemu-daemon-system.sh
-index d9ab60aaff559400..735c24442a82e8bc 100755
 a/cdemu-daemon/system/cdemu-daemon-system.sh
-+++ b/cdemu-daemon/system/cdemu-daemon-system.sh
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemu-daemon
- 
- # Default

[arch-commits] Commit in cdemu-daemon/repos/community-x86_64 (6 files)

2018-07-10 Thread Jan Steffens via arch-commits 
Date: Wednesday, July 11, 2018 @ 00:54:33
  Author: heftig
Revision: 356660

archrelease: copy trunk to community-x86_64

Added:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
(from rev 356659, 
cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
  cdemu-daemon/repos/community-x86_64/PKGBUILD
(from rev 356659, cdemu-daemon/trunk/PKGBUILD)
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install
(from rev 356659, cdemu-daemon/trunk/cdemu-daemon.install)
Deleted:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
  cdemu-daemon/repos/community-x86_64/PKGBUILD
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install

--+
 0001-Patch-system-daemon-for-Arch-friendliness.patch |  302 -
 PKGBUILD |  100 ++---
 cdemu-daemon.install |   72 ++--
 3 files changed, 237 insertions(+), 237 deletions(-)

Deleted: 0001-Patch-system-daemon-for-Arch-friendliness.patch
===
--- 0001-Patch-system-daemon-for-Arch-friendliness.patch2018-07-11 
00:54:01 UTC (rev 356659)
+++ 0001-Patch-system-daemon-for-Arch-friendliness.patch2018-07-11 
00:54:33 UTC (rev 356660)
@@ -1,151 +0,0 @@
-From 17d054bc9fb02bbb557f9de68e29e715a17f3ee6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Mon, 12 Jun 2017 22:22:51 +0200
-Subject: [PATCH] Patch system daemon for Arch-friendliness
-

- cdemu-daemon/CMakeLists.txt | 15 ++-
- cdemu-daemon/system/cdemu-daemon-dbus.conf  |  9 +++--
- cdemu-daemon/system/cdemu-daemon-system.sh  |  6 +++---
- cdemu-daemon/system/cdemu-daemon.conf   |  8 
- cdemu-daemon/system/cdemu-daemon.service.in | 10 ++
- cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in |  4 ++--
- 6 files changed, 44 insertions(+), 8 deletions(-)
- create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
- create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
-
-diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
-index 76feb818d09a57af..c6abd56b82484b6f 100644
 a/cdemu-daemon/CMakeLists.txt
-+++ b/cdemu-daemon/CMakeLists.txt
-@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
- include (GNUInstallDirs)
- 
- # Options
--option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
off)
-+option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
on)
- 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
-@@ -45,6 +45,10 @@ configure_file (
- ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
- ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- )
-+configure_file (
-+${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in
-+${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+)
- 
- # Global definitions
- add_definitions (-std=c99) # We're compiling using C99
-@@ -121,13 +125,22 @@ if (SYSTEM_BUS_SERVICE)
- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
- )
- install (
-+FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
-+)
-+install (
- FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
- )
- install (
- FILES system/cdemu-daemon-dbus.conf
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
- )
-+install (
-+FILES system/cdemu-daemon.conf
-+RENAME cdemu-daemon
-+DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
-+)
- endif ()
- 
- # Translations; we use the version provided by our FindIntlTool.cmake
-diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf 
b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-index c450d78cf03bce6a..e86b62cf0437a9fd 100644
 a/cdemu-daemon/system/cdemu-daemon-dbus.conf
-+++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-@@ -11,8 +11,13 @@
- 
- 
- 
--
--
-+
-+
-+
-+
-+
-+
-+
- 
- 
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-system.sh 
b/cdemu-daemon/system/cdemu-daemon-system.sh
-index d9ab60aaff559400..735c24442a82e8bc 100755
 a/cdemu-daemon/system/cdemu-daemon-system.sh
-+++ b/cdemu-daemon/system/cdemu-daemon-system.sh
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemu-daemon
- 
- # Default

[arch-commits] Commit in cdemu-daemon/repos/community-x86_64 (6 files)

2018-07-10 Thread Jan Steffens via arch-commits 
Date: Wednesday, July 11, 2018 @ 00:52:05
  Author: heftig
Revision: 356658

archrelease: copy trunk to community-x86_64

Added:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
(from rev 356657, 
cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
  cdemu-daemon/repos/community-x86_64/PKGBUILD
(from rev 356657, cdemu-daemon/trunk/PKGBUILD)
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install
(from rev 356657, cdemu-daemon/trunk/cdemu-daemon.install)
Deleted:
  
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
  cdemu-daemon/repos/community-x86_64/PKGBUILD
  cdemu-daemon/repos/community-x86_64/cdemu-daemon.install

--+
 0001-Patch-system-daemon-for-Arch-friendliness.patch |  302 -
 PKGBUILD |  103 ++---
 cdemu-daemon.install |   72 ++--
 3 files changed, 237 insertions(+), 240 deletions(-)

Deleted: 0001-Patch-system-daemon-for-Arch-friendliness.patch
===
--- 0001-Patch-system-daemon-for-Arch-friendliness.patch2018-07-11 
00:51:48 UTC (rev 356657)
+++ 0001-Patch-system-daemon-for-Arch-friendliness.patch2018-07-11 
00:52:05 UTC (rev 356658)
@@ -1,151 +0,0 @@
-From 17d054bc9fb02bbb557f9de68e29e715a17f3ee6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Mon, 12 Jun 2017 22:22:51 +0200
-Subject: [PATCH] Patch system daemon for Arch-friendliness
-

- cdemu-daemon/CMakeLists.txt | 15 ++-
- cdemu-daemon/system/cdemu-daemon-dbus.conf  |  9 +++--
- cdemu-daemon/system/cdemu-daemon-system.sh  |  6 +++---
- cdemu-daemon/system/cdemu-daemon.conf   |  8 
- cdemu-daemon/system/cdemu-daemon.service.in | 10 ++
- cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in |  4 ++--
- 6 files changed, 44 insertions(+), 8 deletions(-)
- create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
- create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
-
-diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
-index 76feb818d09a57af..c6abd56b82484b6f 100644
 a/cdemu-daemon/CMakeLists.txt
-+++ b/cdemu-daemon/CMakeLists.txt
-@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
- include (GNUInstallDirs)
- 
- # Options
--option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
off)
-+option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" 
on)
- 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
-@@ -45,6 +45,10 @@ configure_file (
- ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
- ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- )
-+configure_file (
-+${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in
-+${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+)
- 
- # Global definitions
- add_definitions (-std=c99) # We're compiling using C99
-@@ -121,13 +125,22 @@ if (SYSTEM_BUS_SERVICE)
- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
- )
- install (
-+FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
-+DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
-+)
-+install (
- FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
- DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
- )
- install (
- FILES system/cdemu-daemon-dbus.conf
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
- )
-+install (
-+FILES system/cdemu-daemon.conf
-+RENAME cdemu-daemon
-+DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
-+)
- endif ()
- 
- # Translations; we use the version provided by our FindIntlTool.cmake
-diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf 
b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-index c450d78cf03bce6a..e86b62cf0437a9fd 100644
 a/cdemu-daemon/system/cdemu-daemon-dbus.conf
-+++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
-@@ -11,8 +11,13 @@
- 
- 
- 
--
--
-+
-+
-+
-+
-+
-+
-+
- 
- 
- 
-diff --git a/cdemu-daemon/system/cdemu-daemon-system.sh 
b/cdemu-daemon/system/cdemu-daemon-system.sh
-index d9ab60aaff559400..735c24442a82e8bc 100755
 a/cdemu-daemon/system/cdemu-daemon-system.sh
-+++ b/cdemu-daemon/system/cdemu-daemon-system.sh
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemu-daemon
- 
- # Default