* Debian-Package

  - moved mkntpasswd to /usr/bin
  - fixed changelog

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2227 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/debian/changelog b/debian/changelog
index 3aceb0616064fd1ce4c398a0c85b5c0415766737..9a8f7cc244e60f7a75cbf60ff24191d83596db17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gosa (2.4) unstable; urgency=low
+gosa (2.4-1) unstable; urgency=low
 
   * New upstream release 
 

diff --git a/debian/rules b/debian/rules
index fc474dd54a6212b4c24e4728d444909408650c22..d84f3456a5a95da6cfb6dd060074d260ad14c866 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,11 +56,12 @@ install-stamp:
        -rm -rf debian/gosa/usr/share/gosa/doc
        -rm debian/gosa/usr/share/gosa/bin/gosa
        -mkdir -p debian/gosa/usr/lib/gosa
-       -mv debian/gosa/usr/share/gosa/bin/* debian/gosa/usr/lib/gosa
+       -mv debian/gosa/usr/share/gosa/bin/* debian/gosa/usr/bin
        -rm -rf debian/gosa/usr/share/gosa/bin
        -find debian/gosa -type f -exec chmod -x {} \;
        -chmod +x debian/gosa/usr/lib/gosa/*
        -rm -rf debian/gosa/usr/share/gosa/gen_locale.sh
+       -rm -rf debian/gosa/usr/share/gosa/gen_function_list.php
        -rm -rf debian/gosa/usr/share/gosa/update.sh
        -mkdir -p debian/gosa/usr/share/php/smarty/libs/plugins
        -cp include/smarty/plugins/block.t.php debian/gosa/usr/share/php/smarty/libs/plugins

diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index 20edcb3a3e577c4d74495bb9cb3894c8e5b864bb..749e2cfe52454553856429f038510e7134572ee9 100644 (file)
--- a/include/functions_setup.inc
+++ b/include/functions_setup.inc
@@ -504,8 +504,8 @@ function parse_contrib_conf()
   }
 
   /* Look for samba password generation method */
-  if(file_exists("/usr/lib/gosa/mkntpasswd")){
-    $pwdhash  = "/usr/lib/gosa/mkntpasswd";
+  if(file_exists("/usr/bin/mkntpasswd")){
+    $pwdhash  = "/usr/bin/mkntpasswd";
   } elseif (preg_match("/^Usage: mkntpwd /", shell_exec ("mkntpwd 2>&1"))){
     $pwdhash= "mkntpwd";
   } else {