Make parallel installable with udisks version 1

This includes renaming a bunch of stuff so we don't conflict. For now
we ignore collisions in man pages. We still have to rename object
paths and interfaces.

Also bump to version 1.90. First stable release will be 2.0.

Another huge user-visible change is that the udisks(1) command has
been renamed to udisksctl(1).

Signed-off-by: David Zeuthen <davidz@redhat.com>

7 files changed, 20 insertions, 46 deletions

diff --git a/data/80-udisks.rules b/data/80-udisks2.rules
index d1351f3..d1351f3 100644
--- a/data/80-udisks.rules
+++ b/data/80-udisks2.rules
diff --git a/data/Makefile.am b/data/Makefile.am
index 9480774..2b34e94 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,37 +2,28 @@
 NULL =
 
 servicedir       = $(datadir)/dbus-1/system-services
-service_in_files = org.freedesktop.UDisks.service.in
+service_in_files = org.freedesktop.UDisks2.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	@sed -e "s|\@privlibdir\@|$(privlibdir)|" $< > $@
 
 dbusconfdir = $(sysconfdir)/dbus-1/system.d
-dbusconf_in_files = org.freedesktop.UDisks.conf.in
+dbusconf_in_files = org.freedesktop.UDisks2.conf.in
 dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
 
 $(dbusconf_DATA): $(dbusconf_in_files) Makefile
 	cp $< $@
 
 udevrulesdir = $(slashlibdir)/udev/rules.d
-udevrules_DATA = 80-udisks.rules
-
-pkgconfigdir = $(datadir)/pkgconfig
-pkgconfig_DATA = udisks.pc
-
-if REMOTE_ACCESS_ENABLED
-avahiservicedir = $(sysconfdir)/avahi/services
-avahiservice_DATA = udisks.service
-endif # REMOTE_ACCESS_ENABLED
+udevrules_DATA = 80-udisks2.rules
 
 EXTRA_DIST = 						\
-	80-udisks.rules					\
+	80-udisks2.rules				\
 	org.freedesktop.UDisks.xml			\
 	$(service_in_files)				\
 	$(dbusconf_in_files)				\
-	udisks.pc.in					\
-	udisks.service					\
+	udisks2.service					\
 	$(NULL)
 
 clean-local :
diff --git a/data/org.freedesktop.UDisks.service.in b/data/org.freedesktop.UDisks.service.in
deleted file mode 100644
index b3606a6..0000000
--- a/data/org.freedesktop.UDisks.service.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.UDisks
-Exec=@libexecdir@/udisks-daemon
-User=root
-
diff --git a/data/org.freedesktop.UDisks.conf.in b/data/org.freedesktop.UDisks2.conf.in
index 21e6d8f..7ff6d29 100644
--- a/data/org.freedesktop.UDisks.conf.in
+++ b/data/org.freedesktop.UDisks2.conf.in
@@ -6,25 +6,25 @@
 <busconfig>
   <!-- Only root can own the service -->
   <policy user="root">
-    <allow own="org.freedesktop.UDisks"/>
+    <allow own="org.freedesktop.UDisks2"/>
   </policy>
 
   <policy context="default">
-    <allow send_destination="org.freedesktop.UDisks"/>
+    <allow send_destination="org.freedesktop.UDisks2"/>
 
-    <allow send_destination="org.freedesktop.UDisks"
+    <allow send_destination="org.freedesktop.UDisks2"
            send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.freedesktop.UDisks"
+    <allow send_destination="org.freedesktop.UDisks2"
            send_interface="org.freedesktop.DBus.Introspectable"/>
-    <allow send_destination="org.freedesktop.UDisks"
+    <allow send_destination="org.freedesktop.UDisks2"
            send_interface="org.freedesktop.UDisks"/>
-    <allow send_destination="org.freedesktop.UDisks"
+    <allow send_destination="org.freedesktop.UDisks2"
            send_interface="org.freedesktop.UDisks.Device"/>
-    <allow send_destination="org.freedesktop.UDisks"
+    <allow send_destination="org.freedesktop.UDisks2"
            send_interface="org.freedesktop.UDisks.Adapter"/>
-    <allow send_destination="org.freedesktop.UDisks"
+    <allow send_destination="org.freedesktop.UDisks2"
            send_interface="org.freedesktop.UDisks.Expander"/>
-    <allow send_destination="org.freedesktop.UDisks"
+    <allow send_destination="org.freedesktop.UDisks2"
            send_interface="org.freedesktop.UDisks.Port"/>
   </policy>
 </busconfig>
diff --git a/data/org.freedesktop.UDisks2.service.in b/data/org.freedesktop.UDisks2.service.in
new file mode 100644
index 0000000..924059a
--- /dev/null
+++ b/data/org.freedesktop.UDisks2.service.in
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.freedesktop.UDisks2
+Exec=@privlibdir@/udisksd
+User=root
+
diff --git a/data/udisks.pc.in b/data/udisks.pc.in
deleted file mode 100644
index 7bdeb10..0000000
--- a/data/udisks.pc.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Name: udisks
-Description: udisks storage daemon
-Version: @VERSION@
diff --git a/data/udisks.service b/data/udisks.service
deleted file mode 100644
index c54c85c..0000000
--- a/data/udisks.service
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-
-<!-- This file is part of udisks -->
-
-<service-group>
-  <name replace-wildcards="yes">%h</name>
-
-  <service>
-    <type>_udisks-ssh._tcp</type>
-    <port>22</port>
-  </service>
-</service-group>