Merge pull request #118 from dlobo/CRM-12096

fix CRM-12096

distmaker/distmaker.sh

-#!/bin/bash
+#!/bin/bash -v
 set -e
 
 # This is distmaker script for CiviCRM

distmaker/dists/joomla_php5.sh

@@ -97,6 +97,9 @@ cp -r -p civicrm/joomla/admin/helpers/*          com_civicrm/admin/helpers
 cp -r -p civicrm/joomla/admin/plugins/*          com_civicrm/admin/plugins
 cp civicrm/joomla/admin/language/en-GB/*         com_civicrm/admin/language/en-GB
 
+# joomla 3.0 like admin.civicrm.php to be called civicrm.php
+# lets keep both versions there
+cp com_civicrm/admin/admin.civicrm.php com_civicrm/admin/civicrm.php
 
 # copying front end code
 cp civicrm/joomla/site/civicrm.html.php      com_civicrm/site

xml/templates/joomla.tpl

@@ -27,6 +27,7 @@
     <menu task="civicrm/dashboard&amp;reset=1">COM_CIVICRM_MENU</menu>
     <files folder="admin">
       <filename>admin.civicrm.php</filename>
+      <filename>civicrm.php</filename>
       <filename>toolbar.civicrm.php</filename>
       <filename>toolbar.civicrm.html.php</filename>
       <filename>configure.php</filename>