From b1e3e879a136d9b2f4cfe78d581e19fa5aeec2d6 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 5 Dec 2005 06:22:51 +0000 Subject: [PATCH] * 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 --- debian/changelog | 2 +- debian/rules | 3 ++- include/functions_setup.inc | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3aceb0616..9a8f7cc24 100644 --- 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 fc474dd54..d84f3456a 100755 --- 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 20edcb3a3..749e2cfe5 100644 --- 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 { -- 2.30.2