2008-10-24 [paul] 3.6.1cvs11

	* tools/kdeservicemenu/install.sh
		fix servicemenu installation directory on kde4

diff --git a/ChangeLog b/ChangeLog
index d92d1df8c053d9b8281c004247cd8b564d67c0ce..b21c62bd4a2308b7b3ad35e217e830f06420f436 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-24 [paul]      3.6.1cvs11
+
+       * tools/kdeservicemenu/install.sh
+               fix servicemenu installation directory on kde4
+

 2008-10-24 [paul]      3.6.1cvs10
 
        * tools/kdeservicemenu/README
 2008-10-24 [paul]      3.6.1cvs10
 
        * tools/kdeservicemenu/README

diff --git a/PATCHSETS b/PATCHSETS
index 7361af20775cf67844f4c16d95ac41cae0a35ebd..5cfeda046b14a568cdd674a52a6079778dfa0bd2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3592,3 +3592,4 @@
 ( cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs8.patchset
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 tools/claws.i18n.status.pl;  ) > 3.6.1cvs9.patchset
 ( cvs diff -u -r 1.2.2.12 -r 1.2.2.13 tools/kdeservicemenu/README;  cvs diff -u -r 1.2.2.6 -r 1.2.2.7 tools/kdeservicemenu/install.sh;  ) > 3.6.1cvs10.patchset
 ( cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs8.patchset
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 tools/claws.i18n.status.pl;  ) > 3.6.1cvs9.patchset
 ( cvs diff -u -r 1.2.2.12 -r 1.2.2.13 tools/kdeservicemenu/README;  cvs diff -u -r 1.2.2.6 -r 1.2.2.7 tools/kdeservicemenu/install.sh;  ) > 3.6.1cvs10.patchset

+( cvs diff -u -r 1.2.2.7 -r 1.2.2.8 tools/kdeservicemenu/install.sh;  ) > 3.6.1cvs11.patchset

diff --git a/configure.ac b/configure.ac
index fa8a48964ed41e677ba9f5b013a8766357f75987..2c7da9afdbc5c2afcb5a58d25a402b9d18025174 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=10
+EXTRA_VERSION=11

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/tools/kdeservicemenu/install.sh b/tools/kdeservicemenu/install.sh
index 8ffe42e6dcc30c336d41fc8654e6dbc190009938..8148902ba87eaad59075c8deefe2cef15fafffee 100644 (file)
--- a/tools/kdeservicemenu/install.sh
+++ b/tools/kdeservicemenu/install.sh
@@ -3,24 +3,30 @@
 PERL_SCRIPT="claws-mail-kdeservicemenu.pl"
 DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.template"
 DESKTOP="claws-mail-attach-files.desktop"
 PERL_SCRIPT="claws-mail-kdeservicemenu.pl"
 DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.template"
 DESKTOP="claws-mail-attach-files.desktop"

-SERVICEMENU_DIR="share/apps/konqueror/servicemenus"

 
 function check_environ {
 echo "Checking for kde4-config..."
 if [ ! -z "$(type 'kde4-config' 2> /dev/null)" ]; then
   echo "Found kde4-config..."
 
 function check_environ {
 echo "Checking for kde4-config..."
 if [ ! -z "$(type 'kde4-config' 2> /dev/null)" ]; then
   echo "Found kde4-config..."

+  SERVICEMENU_DIR="share/kde4/services/ServiceMenus"

   KDECONFIG="kde4-config"
 else
   echo "kde4-config not found..."
   echo "Checking for kde-config..."
   if [ ! -z "$(type 'kde-config' 2> /dev/null)" ]; then
       echo "Found kde-config..."
   KDECONFIG="kde4-config"
 else
   echo "kde4-config not found..."
   echo "Checking for kde-config..."
   if [ ! -z "$(type 'kde-config' 2> /dev/null)" ]; then
       echo "Found kde-config..."

+      SERVICEMENU_DIR="share/apps/konqueror/servicemenus"

       KDECONFIG="kde-config"
   else
     echo "kde-config not found..."
     echo "asking user to find kde4-config or kde-config..."
     KDECONFIG=$(kdialog --title "Locate kde-config or kde4-config" --getopenfilename / )
     test -z $KDECONFIG && exit 1
       KDECONFIG="kde-config"
   else
     echo "kde-config not found..."
     echo "asking user to find kde4-config or kde-config..."
     KDECONFIG=$(kdialog --title "Locate kde-config or kde4-config" --getopenfilename / )
     test -z $KDECONFIG && exit 1

+    if [[ $KDECONFIG == *4-config ]]; then
+      SERVICEMENU_DIR="share/kde4/services/ServiceMenus"
+    else
+      SERVICEMENU_DIR="share/apps/konqueror/servicemenus"
+    fi 

   fi
 fi
 }
   fi
 fi
 }