From d261c3a03396e6514082ad89e74228c09ecad35a Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 27 May 2008 10:19:46 +0000 Subject: [PATCH] Moved dak git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11021 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/dh-make-gosa | 14 ++++- gosa-core/include/class_socketClient.inc | 2 +- .../plugins/addons/dak/class_dak_keyring.inc | 37 ------------- .../plugins/addons/dak/class_dak_queue.inc | 37 ------------- .../addons/dak/class_dak_repository.inc | 52 ------------------- gosa-core/plugins/addons/dak/main.inc | 37 ------------- gosa-core/plugins/addons/dak/tabs_dak.inc | 11 ---- .../plugins/personal/generic/class_user.inc | 2 +- 8 files changed, 15 insertions(+), 177 deletions(-) delete mode 100644 gosa-core/plugins/addons/dak/class_dak_keyring.inc delete mode 100644 gosa-core/plugins/addons/dak/class_dak_queue.inc delete mode 100644 gosa-core/plugins/addons/dak/class_dak_repository.inc delete mode 100644 gosa-core/plugins/addons/dak/main.inc delete mode 100644 gosa-core/plugins/addons/dak/tabs_dak.inc diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa index cd04c55d9..daca24400 100755 --- a/gosa-core/dh-make-gosa +++ b/gosa-core/dh-make-gosa @@ -14,6 +14,10 @@ load_dsc() { for dep in $TDEPENDS; do PL_DEPENDS="gosa-plugin-$dep, $PL_DEPENDS" done + TCONFLICTS=$(sed -n 's/"//g;s/^conflicts\s*=\s*\(.*\)$/\1/p' "$1") + for dep in $TCONFLICTS; do + PL_CONFLICTS="gosa-plugin-$dep, $PL_CONFLICTS" + done PL_DESCRIPTION=$(sed -n 's/"//g;s/^description\s*=\s*\(.*\)$/\1/p' "$1") PL_AUTHOR=$(sed -n 's/"//g;s/^author\s*=\s*\([^<]*\).*$/\1/p' "$1") PL_MAIL=$(sed -n 's/"//g;s/^author\s*=[^<].*<\([^>]*\).*$/\1/p' "$1") @@ -124,6 +128,7 @@ echo "Plugin: $PL_NAME" echo "Version: $PL_VERSION" echo "Description: $PL_DESCRIPTION" echo "Depends: $PL_DEPENDS" +echo "Conflicts: $PL_CONFLICTS" echo "Author name: $PL_AUTHOR" echo "Author email: $PL_MAIL" echo @@ -180,7 +185,14 @@ sed -i '/^Upstream/,/^$/d' debian/copyright # Adapt control sed -i 's/^Section: unknown/Section: web/g' debian/control sed -i 's/^Architecture: any/Architecture: all/g' debian/control -sed -i 's/^Depends: .*$/Depends: gosa/g' debian/control +if [ "$PL_DEPENDS" ]; then + sed -i 's/^Depends: .*$/Depends: gosa, $PL_DEPENDS/g' debian/control +else + sed -i 's/^Depends: .*$/Depends: gosa/g' debian/control +fi +if [ "$PL_CONFLICTS" ]; then + sed "11Conflicts: $PL_CONFLICTS" debian/control +fi sed -i 's/^\(Build-Depends: .*\)$/\1, dpatch/g' debian/control sed -i "s/^Description: .*$/Description: $PL_NAME plugin for GOsa/g" debian/control sed -i "s/^ <.*$/ %DESCRIPTION%/g" debian/control diff --git a/gosa-core/include/class_socketClient.inc b/gosa-core/include/class_socketClient.inc index dda0f6ec2..4442e1c50 100644 --- a/gosa-core/include/class_socketClient.inc +++ b/gosa-core/include/class_socketClient.inc @@ -105,7 +105,7 @@ class Socket_Client $this->handle = @fsockopen($this->host, $this->port, $this->errno, $this->errstr, $this->timeout); if(!$this->handle){ $this->handle = NULL; - $this->set_error(sprintf(_("Socket connection to host '%s:%s' failed with error: %s."),$this->host,$this->port,$this->errstr)); + $this->set_error(sprintf(_("Socket connection to host '%s:%s' failed: %s"),$this->host,$this->port,$this->errstr)); }else{ $this->b_data_send = TRUE; diff --git a/gosa-core/plugins/addons/dak/class_dak_keyring.inc b/gosa-core/plugins/addons/dak/class_dak_keyring.inc deleted file mode 100644 index b867d2f1d..000000000 --- a/gosa-core/plugins/addons/dak/class_dak_keyring.inc +++ /dev/null @@ -1,37 +0,0 @@ -fetch (get_template_path('dak_queue.tpl', TRUE, dirname(__FILE__)))); - } -} -// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -?> diff --git a/gosa-core/plugins/addons/dak/class_dak_queue.inc b/gosa-core/plugins/addons/dak/class_dak_queue.inc deleted file mode 100644 index 8e7f377d5..000000000 --- a/gosa-core/plugins/addons/dak/class_dak_queue.inc +++ /dev/null @@ -1,37 +0,0 @@ -fetch (get_template_path('dak_queue.tpl', TRUE, dirname(__FILE__)))); - } -} -// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -?> diff --git a/gosa-core/plugins/addons/dak/class_dak_repository.inc b/gosa-core/plugins/addons/dak/class_dak_repository.inc deleted file mode 100644 index 614fff3c6..000000000 --- a/gosa-core/plugins/addons/dak/class_dak_repository.inc +++ /dev/null @@ -1,52 +0,0 @@ -fetch (get_template_path('dak_queue.tpl', TRUE, dirname(__FILE__)))); - } - - - static function plInfo() - { - return (array( - "plShortName" => _("Repository"), - "plDescription" => _("DAK repository"), - "plSelfModify" => FALSE, - "plDepends" => array(), - "plPriority" => 0, - "plSection" => array("addon"), - "plCategory" => array("dak" => array("objectClass" => "none", "description" => _("DAK"))), - "plProvidedAcls" => array("Comment" => _("Description")) - )); - } -} -// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -?> diff --git a/gosa-core/plugins/addons/dak/main.inc b/gosa-core/plugins/addons/dak/main.inc deleted file mode 100644 index 287cd0961..000000000 --- a/gosa-core/plugins/addons/dak/main.inc +++ /dev/null @@ -1,37 +0,0 @@ -data['TABS']['DAK_TABS'],"")); - } - $dak_tabs = session::get('dak_tabs'); - - /* Execute formular */ -# $display= $dak_tabs->save_object(); - $display= $dak_tabs->execute (); - $display.= "\n"; - - /* Page header*/ - $display= print_header(get_template_path('images/dak.png'), _("DAK")).$display; - - /* Store changes in session */ - session::set('dak_tabs',$dak_tabs); -} -?> diff --git a/gosa-core/plugins/addons/dak/tabs_dak.inc b/gosa-core/plugins/addons/dak/tabs_dak.inc deleted file mode 100644 index b64676db9..000000000 --- a/gosa-core/plugins/addons/dak/tabs_dak.inc +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index ffef24b70..b26e61fdc 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -1146,7 +1146,7 @@ class user extends plugin foreach($temp['name'] as $id => $name){ if($name == $this->pw_storage){ if($temp['is_configurable'][$id] && !$this->pwObject instanceof $temp[$name] ){ - $message[] = _("The selected password method a requires initial configuration."); + $message[] = _("The selected password method requires initial configuration!"); } break; } -- 2.30.2