From 389dc1f4acc817a84361056564ffb39ab351274b Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@gentoo.org>
Date: Sun, 26 Jul 2009 22:19:17 +0530
Subject: [PATCH] Fix daemon binary collision with PolicyKit-0.9

polkitd collides, caused due to 002ce3d1364f7db00989d19e49c3a137e6ce6404
---
 data/org.freedesktop.PolicyKit1.service.in |    2 +-
 docs/man/Makefile.am                       |    4 ++--
 docs/man/polkit.xml                        |    2 +-
 docs/man/{polkitd.xml => polkitd-1.xml}    |   20 ++++++++++----------
 docs/polkit/Makefile.am                    |    2 +-
 src/polkitd/Makefile.am                    |    8 ++++----
 6 files changed, 19 insertions(+), 19 deletions(-)
 rename docs/man/{polkitd.xml => polkitd-1.xml} (79%)

diff --git a/data/org.freedesktop.PolicyKit1.service.in b/data/org.freedesktop.PolicyKit1.service.in
index 5a54ca1..09abeed 100644
--- a/data/org.freedesktop.PolicyKit1.service.in
+++ b/data/org.freedesktop.PolicyKit1.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.PolicyKit1
-Exec=@libexecdir@/polkitd
+Exec=@libexecdir@/polkitd-1
 User=root
diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
index 076608b..fe83eb2 100644
--- a/docs/man/Makefile.am
+++ b/docs/man/Makefile.am
@@ -5,7 +5,7 @@ if MAN_PAGES_ENABLED
 
 man_MANS = 				\
 	polkit.8			\
-	polkitd.8			\
+	polkitd-1.8			\
 	pklocalauthority.8		\
 	pkexec.1			\
 	pkcheck.1			\
@@ -19,7 +19,7 @@ endif # MAN_PAGES_ENABLED
 
 EXTRA_DIST = 				\
 	polkit.xml                 	\
-	polkitd.xml			\
+	polkitd-1.xml			\
 	pklocalauthority.xml		\
 	pkexec.xml			\
 	pkcheck.xml			\
diff --git a/docs/man/polkit.xml b/docs/man/polkit.xml
index bcb276b..77de60d 100644
--- a/docs/man/polkit.xml
+++ b/docs/man/polkit.xml
@@ -424,7 +424,7 @@ System Context         |                        |
         <refentrytitle>pklocalauthority</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>
       <citerefentry>
-        <refentrytitle>polkitd</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>polkitd-1</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>
       <citerefentry>
         <refentrytitle>pkaction</refentrytitle><manvolnum>1</manvolnum>
diff --git a/docs/man/polkitd.xml b/docs/man/polkitd-1.xml
similarity index 79%
rename from docs/man/polkitd.xml
rename to docs/man/polkitd-1.xml
index 7e5cc02..45dc755 100644
--- a/docs/man/polkitd.xml
+++ b/docs/man/polkitd-1.xml
@@ -3,33 +3,33 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!ENTITY version SYSTEM "../version.xml">
 ]>
-<refentry id="polkitd.8">
+<refentry id="polkitd-1.8">
   <refentryinfo>
-    <title>polkitd</title>
+    <title>polkitd-1</title>
     <date>May 2009</date>
     <productname>polkit</productname>
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>polkitd</refentrytitle>
+    <refentrytitle>polkitd-1</refentrytitle>
     <manvolnum>8</manvolnum>
     <refmiscinfo class="version"></refmiscinfo>
   </refmeta>
 
   <refnamediv>
-    <refname>polkitd</refname>
+    <refname>polkitd-1</refname>
     <refpurpose>PolicyKit daemon</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>polkitd</command>
+      <command>polkitd-1</command>
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1 id="polkitd-description"><title>DESCRIPTION</title>
+  <refsect1 id="polkitd-1-description"><title>DESCRIPTION</title>
     <para>
-      <command>polkitd</command> provides
+      <command>polkitd-1</command> provides
       the <emphasis>org.freedesktop.PolicyKit1</emphasis> D-Bus
       service on the system message bus. Users or administrators
       should never need to start this daemon as it will be
@@ -39,14 +39,14 @@
     </para>
   </refsect1>
 
-  <refsect1 id="polkitd-author"><title>AUTHOR</title>
+  <refsect1 id="polkitd-1-author"><title>AUTHOR</title>
     <para>
       Written by David Zeuthen <email>davidz@redhat.com</email> with
       a lot of help from many others.
     </para>
   </refsect1>
 
-  <refsect1 id="polkitd-bugs">
+  <refsect1 id="polkitd-1-bugs">
     <title>BUGS</title>
     <para>
       Please send bug reports to either the distribution or the
@@ -56,7 +56,7 @@
     </para>
   </refsect1>
 
-  <refsect1 id="polkitd-see-also">
+  <refsect1 id="polkitd-1-see-also">
     <title>SEE ALSO</title>
     <para>
       <citerefentry>
diff --git a/docs/polkit/Makefile.am b/docs/polkit/Makefile.am
index bf05b92..b9b3ac9 100644
--- a/docs/polkit/Makefile.am
+++ b/docs/polkit/Makefile.am
@@ -60,7 +60,7 @@ content_files =  			    								\
 	../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.Authority.xml			\
 	../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml		\
 	../man/polkit.xml										\
-	../man/polkitd.xml										\
+	../man/polkitd-1.xml										\
 	../man/pklocalauthority.xml									\
 	../man/pkcheck.xml										\
 	../man/pkaction.xml										\
diff --git a/src/polkitd/Makefile.am b/src/polkitd/Makefile.am
index 1234417..c425d68 100644
--- a/src/polkitd/Makefile.am
+++ b/src/polkitd/Makefile.am
@@ -14,19 +14,19 @@ INCLUDES =                                              		\
 	-D_REENTRANT	                                		\
 	$(NULL)
 
-libexec_PROGRAMS = polkitd
+libexec_PROGRAMS = polkitd-1
 
-polkitd_SOURCES = 							\
+polkitd_1_SOURCES = 							\
 	main.c								\
 	$(NULL)
 
-polkitd_CFLAGS = 							\
+polkitd_1_CFLAGS = 							\
 	-DPOLKIT_BACKEND_I_KNOW_API_IS_SUBJECT_TO_CHANGE		\
 	-DG_LOG_DOMAIN=\"polkitd-1\"					\
 	$(GLIB_CFLAGS)							\
 	$(NULL)
 
-polkitd_LDADD = 				        		\
+polkitd_1_LDADD = 				        		\
 	$(DBUS_GLIB_LIBS)						\
 	$(GLIB_LIBS)							\
 	$(top_builddir)/src/polkit/libpolkit-gobject-1.la		\
-- 
1.6.3.3