From e77c7a1c4920099602ba31f6212e75891588a1f3 Mon Sep 17 00:00:00 2001
From: Angelo Naselli <anaselli@linux.it>
Date: Fri, 29 Aug 2014 12:24:29 +0200
Subject: fixed script name manahost (new drakhosts)

---
 extras/desktop/manahost.desktop             |  9 ++++++++
 extras/polkit/org.mageia.hostmanager.policy | 21 -----------------
 extras/polkit/org.mageia.manahost.policy    | 21 +++++++++++++++++
 scripts/hostmanager                         | 36 -----------------------------
 scripts/manahost                            | 36 +++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 57 deletions(-)
 create mode 100644 extras/desktop/manahost.desktop
 delete mode 100644 extras/polkit/org.mageia.hostmanager.policy
 create mode 100644 extras/polkit/org.mageia.manahost.policy
 delete mode 100755 scripts/hostmanager
 create mode 100755 scripts/manahost

diff --git a/extras/desktop/manahost.desktop b/extras/desktop/manahost.desktop
new file mode 100644
index 0000000..1ba6dee
--- /dev/null
+++ b/extras/desktop/manahost.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=manahost
+Comment=AdminPanel host manager
+Exec=pkexec /usr/bin/manahost
+Icon=userdrake
+Type=Application
+StartupNotify=true
+Categories=System;X-MandrivaLinux-CrossDesktop;
+
diff --git a/extras/polkit/org.mageia.hostmanager.policy b/extras/polkit/org.mageia.hostmanager.policy
deleted file mode 100644
index 6e23364..0000000
--- a/extras/polkit/org.mageia.hostmanager.policy
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
-  <vendor>Mageia.Org</vendor>
-  <vendor_url>http://www.mageia.org</vendor_url>
-
-  <action id="org.mageia.hostmanager.pkexec.run">
-    <description>Allow APanel GUI</description>
-    <message>Authentication is required to run the program hostmanager (user=$(user), program=$(program), command_line=$(command_line))</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>auth_admin</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/hostmanager</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-  </action>
-</policyconfig>
diff --git a/extras/polkit/org.mageia.manahost.policy b/extras/polkit/org.mageia.manahost.policy
new file mode 100644
index 0000000..76a8a1c
--- /dev/null
+++ b/extras/polkit/org.mageia.manahost.policy
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>Mageia.Org</vendor>
+  <vendor_url>http://www.mageia.org</vendor_url>
+
+  <action id="org.mageia.manahost.pkexec.run">
+    <description>Allow APanel GUI</description>
+    <message>Authentication is required to run the program manahost (user=$(user), program=$(program), command_line=$(command_line))</message>
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/manahost</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+</policyconfig>
diff --git a/scripts/hostmanager b/scripts/hostmanager
deleted file mode 100755
index 3852b17..0000000
--- a/scripts/hostmanager
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-# Copyright 2013 Matteo Pasotti
-#
-# This file is part of hostmanager thus adminpanel
-#
-# hostmanager is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# hostmanager is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with AdminPanel.  If not, see <http://www.gnu.org/licenses/>.
-use Modern::Perl '2011';
-use autodie;
-use AdminPanel::Module::Hosts;
-
-use yui;
-
-my $wm_icon = "/usr/lib/libDrakX/icons/IC-Dhost-48.png"; 
-my $wm_name = "Manage hosts definitions";
-
-yui::YUI::app()->setApplicationTitle($wm_name);
-yui::YUI::app()->setApplicationIcon($wm_icon);
-
-my $hostMan = AdminPanel::Module::Hosts->new({
-				icon => $wm_icon,
-				name => $wm_name
-			});
-$hostMan->start();
-
-1;
diff --git a/scripts/manahost b/scripts/manahost
new file mode 100755
index 0000000..3852b17
--- /dev/null
+++ b/scripts/manahost
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+# Copyright 2013 Matteo Pasotti
+#
+# This file is part of hostmanager thus adminpanel
+#
+# hostmanager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# hostmanager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with AdminPanel.  If not, see <http://www.gnu.org/licenses/>.
+use Modern::Perl '2011';
+use autodie;
+use AdminPanel::Module::Hosts;
+
+use yui;
+
+my $wm_icon = "/usr/lib/libDrakX/icons/IC-Dhost-48.png"; 
+my $wm_name = "Manage hosts definitions";
+
+yui::YUI::app()->setApplicationTitle($wm_name);
+yui::YUI::app()->setApplicationIcon($wm_icon);
+
+my $hostMan = AdminPanel::Module::Hosts->new({
+				icon => $wm_icon,
+				name => $wm_name
+			});
+$hostMan->start();
+
+1;
-- 
cgit v1.2.1