moved to mpan.pl new mageia admin tool launcher panel

6 files changed, 15 insertions, 7 deletions

diff --git a/MANIFEST b/MANIFEST
index 4e40ade8..42b0e10a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -65,7 +65,6 @@ modules/rpmdragora/dragora-urpm-sources.pl
 modules/rpmdragora/rpmdragora
 modules/test.cpp
 README.md
-scripts/apanel.pl
 scripts/manaadduser
 scripts/manaclock
 scripts/manahost
@@ -73,6 +72,7 @@ scripts/manalog
 scripts/manaproxy
 scripts/manaservice
 scripts/manauser
+scripts/mpan.pl
 share/images/Blank16x16.png
 share/images/Check.png
 share/images/Check_16x16.png
diff --git a/Makefile.PL b/Makefile.PL
index f5277154..6030f689 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -48,7 +48,7 @@ WriteMakefile(
         "Modern::Perl"       => 1.03,
         "autodie"            => 2.20,
     },
-    EXE_FILES => [ qw( scripts/apanel.pl
+    EXE_FILES => [ qw( scripts/mpan.pl
                        scripts/manaadduser
                        scripts/manaclock
                        scripts/manahost
diff --git a/extras/desktop/mpan.desktop b/extras/desktop/mpan.desktop
new file mode 100644
index 00000000..8a8f9512
--- /dev/null
+++ b/extras/desktop/mpan.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mageia AdminPanel
+Comment=Administration panel - application launcher
+Exec=pkexec /usr/bin/mpan.pl
+Icon=drakconf
+Type=Application
+StartupNotify=true
+Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/polkit/org.mageia.adminpanel.policy b/extras/polkit/org.mageia.mpan.policy
index 6b8baf9b..5d793cf1 100644
--- a/extras/polkit/org.mageia.adminpanel.policy
+++ b/extras/polkit/org.mageia.mpan.policy
@@ -7,7 +7,7 @@
   <vendor>Mageia.Org</vendor>
   <vendor_url>http://www.mageia.org</vendor_url>
 
-  <action id="org.mageia.adminpanel.pkexec.run">
+  <action id="org.mageia.mpan.pkexec.run">
     <description>Allow APanel GUI</description>
     <message>Authentication is required to run the program apanel (user=$(user), program=$(program), command_line=$(command_line))</message>
     <defaults>
@@ -15,7 +15,7 @@
       <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/apanel.pl</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/mpan.pl</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
   </action>
 </policyconfig>
diff --git a/lib/AdminPanel/Shared/Locales.pm b/lib/AdminPanel/Shared/Locales.pm
index 6eac37cb..4bb14740 100644
--- a/lib/AdminPanel/Shared/Locales.pm
+++ b/lib/AdminPanel/Shared/Locales.pm
@@ -69,7 +69,7 @@ use Text::Iconv;
 =head3 INPUT
 
     hash ref containing 
-        domain_name: gettext domain name (default apanel)
+        domain_name: gettext domain name (default mpan)
         dir_name:    gettext optional catalog directory (default undef)
         codeset:     gettext codeset (default UTF8)
 
@@ -83,7 +83,7 @@ use Text::Iconv;
 
 has 'domain_name' => (
     is      => 'rw',
-    default => 'apanel', 
+    default => 'mpan',
 );
 
 has 'dir_name' => (
diff --git a/scripts/apanel.pl b/scripts/mpan.pl
index 75606e60..6541d45d 100755
--- a/scripts/apanel.pl
+++ b/scripts/mpan.pl
@@ -59,7 +59,7 @@ while (1) {
 
 sub usage {
     print "\n";
-    print "Usage apanel [options...]\n\n";
+    print "Usage mpan.pl [options...]\n\n";
     print "Options:\n";
     print "\t--help | -h        print this help\n";
 ## anaselli: --name now is used only to add a path to /etc (e.g. --name mcc2 means /etc/mcc2)