[debian-edu-commits] debian-edu/pkg-team/ 05/32: Imported Debian patch 2.6.11-1

Mike Gabriel sunweaver at debian.org
Tue Apr 1 16:51:59 UTC 2014


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit 07c52a60cba939f8ab9e398b74e8b303d7749a3a
Merge: 8906fc8 15d4134
Author: Benoit Mortier <benoit.mortier at opensides.be>
Date:   Fri Aug 13 11:00:29 2010 +0200

    Imported Debian patch 2.6.11-1

 debian/changelog                                   |    9 +
 debian/control                                     |    2 +-
 debian/gosa-plugin-gofax.install                   |    1 +
 debian/gosa-plugin-gofon.install                   |    1 +
 debian/gosa-plugin-ldapmanager.install             |    1 -
 debian/gosa-schema.install                         |    1 -
 debian/patches/03_fix_class_mapping.patch          |    2 +-
 gosa-core/AUTHORS                                  |    3 +
 gosa-core/Changelog                                |   10 +
 gosa-core/contrib/openldap/samba.schema            |  152 --
 gosa-core/debian/changelog                         |   27 +-
 gosa-core/debian/control                           |  537 +++-
 gosa-core/debian/copyright                         |  185 +-
 gosa-core/debian/gosa-desktop.install              |   10 +-
 gosa-core/debian/gosa-desktop.manpages             |    2 +-
 gosa-core/debian/gosa-dev.install                  |    6 +-
 gosa-core/debian/gosa-dev.manpages                 |    8 +-
 gosa-core/debian/gosa-help-de.install              |    2 +-
 gosa-core/debian/gosa-help-en.install              |    2 +-
 gosa-core/debian/gosa-help-es.install              |    2 +-
 gosa-core/debian/gosa-help-fr.install              |    2 +-
 gosa-core/debian/gosa-help-nl.install              |    2 +-
 gosa-core/debian/gosa-plugin-addressbook.dirs      |    1 +
 gosa-core/debian/gosa-plugin-addressbook.install   |    6 +
 gosa-core/debian/gosa-plugin-connectivity.dirs     |    1 +
 gosa-core/debian/gosa-plugin-connectivity.install  |    4 +
 gosa-core/debian/gosa-plugin-dhcp-schema.dirs      |    1 +
 gosa-core/debian/gosa-plugin-dhcp-schema.install   |    1 +
 gosa-core/debian/gosa-plugin-dhcp.dirs             |    1 +
 gosa-core/debian/gosa-plugin-dhcp.install          |    4 +
 gosa-core/debian/gosa-plugin-dns-schema.dirs       |    1 +
 gosa-core/debian/gosa-plugin-dns-schema.install    |    1 +
 gosa-core/debian/gosa-plugin-dns.dirs              |    1 +
 gosa-core/debian/gosa-plugin-dns.install           |    4 +
 gosa-core/debian/gosa-plugin-fai-schema.dirs       |    1 +
 gosa-core/debian/gosa-plugin-fai-schema.install    |    1 +
 gosa-core/debian/gosa-plugin-fai.dirs              |    1 +
 gosa-core/debian/gosa-plugin-fai.install           |    6 +
 gosa-core/debian/gosa-plugin-gofax.dirs            |    1 +
 .../debian}/gosa-plugin-gofax.install              |    1 +
 gosa-core/debian/gosa-plugin-gofon.dirs            |    1 +
 .../debian}/gosa-plugin-gofon.install              |    1 +
 gosa-core/debian/gosa-plugin-goto.dirs             |    1 +
 gosa-core/debian/gosa-plugin-goto.install          |    7 +
 gosa-core/debian/gosa-plugin-kolab-schema.dirs     |    1 +
 gosa-core/debian/gosa-plugin-kolab-schema.install  |    2 +
 gosa-core/debian/gosa-plugin-kolab.dirs            |    1 +
 gosa-core/debian/gosa-plugin-kolab.install         |    5 +
 gosa-core/debian/gosa-plugin-ldapmanager.dirs      |    1 +
 .../debian}/gosa-plugin-ldapmanager.install        |    1 -
 gosa-core/debian/gosa-plugin-log-schema.dirs       |    1 +
 gosa-core/debian/gosa-plugin-log-schema.install    |    1 +
 gosa-core/debian/gosa-plugin-log.dirs              |    1 +
 gosa-core/debian/gosa-plugin-log.install           |    5 +
 gosa-core/debian/gosa-plugin-mail.dirs             |    1 +
 gosa-core/debian/gosa-plugin-mail.install          |    8 +
 gosa-core/debian/gosa-plugin-mit-krb5-schema.dirs  |    1 +
 .../debian/gosa-plugin-mit-krb5-schema.install     |    1 +
 gosa-core/debian/gosa-plugin-mit-krb5.dirs         |    1 +
 gosa-core/debian/gosa-plugin-mit-krb5.install      |    4 +
 gosa-core/debian/gosa-plugin-nagios-schema.dirs    |    1 +
 gosa-core/debian/gosa-plugin-nagios-schema.install |    1 +
 gosa-core/debian/gosa-plugin-nagios.dirs           |    1 +
 gosa-core/debian/gosa-plugin-nagios.install        |    5 +
 gosa-core/debian/gosa-plugin-netatalk.dirs         |    1 +
 gosa-core/debian/gosa-plugin-netatalk.install      |    5 +
 gosa-core/debian/gosa-plugin-opengroupware.dirs    |    1 +
 gosa-core/debian/gosa-plugin-opengroupware.install |    3 +
 .../debian/gosa-plugin-openxchange-schema.dirs     |    1 +
 .../debian/gosa-plugin-openxchange-schema.install  |    1 +
 gosa-core/debian/gosa-plugin-openxchange.dirs      |    1 +
 gosa-core/debian/gosa-plugin-openxchange.install   |    4 +
 gosa-core/debian/gosa-plugin-opsi.dirs             |    1 +
 gosa-core/debian/gosa-plugin-opsi.install          |    4 +
 .../debian/gosa-plugin-opsi.lintian-overrides      |    1 +
 gosa-core/debian/gosa-plugin-phpgw-schema.dirs     |    1 +
 gosa-core/debian/gosa-plugin-phpgw-schema.install  |    1 +
 gosa-core/debian/gosa-plugin-phpgw.dirs            |    1 +
 gosa-core/debian/gosa-plugin-phpgw.install         |    4 +
 .../debian/gosa-plugin-phpscheduleit-schema.dirs   |    1 +
 .../gosa-plugin-phpscheduleit-schema.install       |    1 +
 gosa-core/debian/gosa-plugin-phpscheduleit.dirs    |    1 +
 gosa-core/debian/gosa-plugin-phpscheduleit.install |    4 +
 gosa-core/debian/gosa-plugin-pptp-schema.dirs      |    1 +
 gosa-core/debian/gosa-plugin-pptp-schema.install   |    1 +
 gosa-core/debian/gosa-plugin-pptp.dirs             |    1 +
 gosa-core/debian/gosa-plugin-pptp.install          |    4 +
 gosa-core/debian/gosa-plugin-pureftpd-schema.dirs  |    1 +
 .../debian/gosa-plugin-pureftpd-schema.install     |    1 +
 gosa-core/debian/gosa-plugin-pureftpd.dirs         |    1 +
 gosa-core/debian/gosa-plugin-pureftpd.install      |    4 +
 gosa-core/debian/gosa-plugin-rolemanagement.dirs   |    1 +
 .../debian/gosa-plugin-rolemanagement.install      |    3 +
 gosa-core/debian/gosa-plugin-rsyslog.dirs          |    1 +
 gosa-core/debian/gosa-plugin-rsyslog.install       |    5 +
 gosa-core/debian/gosa-plugin-samba.dirs            |    1 +
 gosa-core/debian/gosa-plugin-samba.install         |    6 +
 gosa-core/debian/gosa-plugin-scalix.dirs           |    1 +
 gosa-core/debian/gosa-plugin-scalix.install        |    5 +
 gosa-core/debian/gosa-plugin-squid.dirs            |    1 +
 gosa-core/debian/gosa-plugin-squid.install         |    4 +
 gosa-core/debian/gosa-plugin-ssh-schema.dirs       |    1 +
 gosa-core/debian/gosa-plugin-ssh-schema.install    |    1 +
 gosa-core/debian/gosa-plugin-ssh.dirs              |    1 +
 gosa-core/debian/gosa-plugin-ssh.install           |    4 +
 gosa-core/debian/gosa-plugin-sudo-schema.dirs      |    1 +
 gosa-core/debian/gosa-plugin-sudo-schema.install   |    1 +
 gosa-core/debian/gosa-plugin-sudo.dirs             |    1 +
 gosa-core/debian/gosa-plugin-sudo.install          |    5 +
 gosa-core/debian/gosa-plugin-systems.dirs          |    1 +
 gosa-core/debian/gosa-plugin-systems.install       |    5 +
 gosa-core/debian/gosa-plugin-uw-imap.dirs          |    1 +
 gosa-core/debian/gosa-plugin-uw-imap.install       |    3 +
 gosa-core/debian/gosa-plugin-webdav.dirs           |    1 +
 gosa-core/debian/gosa-plugin-webdav.install        |    3 +
 gosa-core/debian/gosa-schema.install               |   21 +-
 gosa-core/debian/gosa.docs                         |    8 +-
 gosa-core/debian/gosa.install                      |   28 +-
 gosa-core/debian/gosa.lintian-overrides            |    8 +-
 gosa-core/debian/gosa.manpages                     |    6 +-
 gosa-core/debian/patches/00list                    |    5 -
 .../debian/patches/01_fix_smarty_location.dpatch   |   23 -
 .../debian/patches/01_fix_smarty_location.patch    |   17 +
 .../debian/patches/02_fix_template_location.dpatch |   20 -
 .../debian/patches/02_fix_template_location.patch  |   13 +
 ...s_mapping.dpatch => 03_fix_class_mapping.patch} |   30 +-
 ...ocation.dpatch => 04_fix_locale_location.patch} |   19 +-
 .../patches/04_fix_online_help_location.dpatch     |   31 -
 .../patches/05_fix_online_help_location.patch      |   24 +
 gosa-core/debian/patches/series                    |    5 +
 gosa-core/debian/rules                             |   83 +-
 gosa-core/debian/smarty-acl-render.install         |    4 +-
 gosa-core/debian/source/format                     |    1 +
 gosa-core/html/helpviewer.php                      |    4 +-
 gosa-core/html/index.php                           |   16 +-
 gosa-core/html/logout.php                          |    4 +-
 gosa-core/html/main.php                            |   58 +-
 gosa-core/ihtml/themes/default/framework.tpl       |   73 +-
 gosa-core/include/class_SnapshotHandler.inc        |    7 +-
 gosa-core/include/class_ldap.inc                   |   95 +-
 gosa-core/include/class_ldapMultiplexer.inc        |    2 +-
 gosa-core/include/class_management.inc             |   76 +-
 gosa-core/include/class_plugin.inc                 |  144 +-
 gosa-core/include/class_sortableListing.inc        |  169 +-
 gosa-core/include/functions.inc                    |  259 +-
 .../password-methods/class_password-methods.inc    |   35 +-
 gosa-core/include/smarty/Smarty.class.php          |  545 ++++
 gosa-core/include/smarty/debug.tpl                 |  136 +
 gosa-core/include/smarty/plugins/block.php.php     |   27 +
 gosa-core/include/smarty/plugins/block.t.php       |  126 +
 .../include/smarty/plugins/block.textformat.php    |  103 +
 .../include/smarty/plugins/function.counter.php    |   78 +
 .../include/smarty/plugins/function.cycle.php      |  101 +
 .../include/smarty/plugins/function.fetch.php      |  217 ++
 .../smarty/plugins/function.html_checkboxes.php    |  145 ++
 .../include/smarty/plugins/function.html_image.php |  139 +
 .../smarty/plugins/function.html_options.php       |  122 +
 .../smarty/plugins/function.html_radios.php        |  156 ++
 .../smarty/plugins/function.html_select_date.php   |  333 +++
 .../smarty/plugins/function.html_select_time.php   |  197 ++
 .../include/smarty/plugins/function.html_table.php |  176 ++
 .../include/smarty/plugins/function.mailto.php     |  157 ++
 gosa-core/include/smarty/plugins/function.math.php |   84 +
 .../include/smarty/plugins/function.popup.php      |  118 +
 .../include/smarty/plugins/function.popup_init.php |   41 +
 .../include/smarty/plugins/modifier.capitalize.php |   41 +
 gosa-core/include/smarty/plugins/modifier.cat.php  |   31 +
 .../smarty/plugins/modifier.count_characters.php   |   29 +
 .../smarty/plugins/modifier.count_paragraphs.php   |   26 +
 .../smarty/plugins/modifier.count_sentences.php    |   27 +
 .../smarty/plugins/modifier.count_words.php        |   25 +
 .../smarty/plugins/modifier.date_format.php        |   61 +
 .../smarty/plugins/modifier.debug_print_var.php    |   87 +
 .../include/smarty/plugins/modifier.default.php    |   29 +
 .../include/smarty/plugins/modifier.escape.php     |  111 +
 .../include/smarty/plugins/modifier.indent.php     |   28 +
 .../include/smarty/plugins/modifier.lower.php      |   30 +
 .../include/smarty/plugins/modifier.noprint.php    |   24 +
 .../smarty/plugins/modifier.regex_replace.php      |   48 +
 .../include/smarty/plugins/modifier.replace.php    |   48 +
 .../include/smarty/plugins/modifier.spacify.php    |   27 +
 .../smarty/plugins/modifier.string_format.php      |   27 +
 .../include/smarty/plugins/modifier.strip.php      |   31 +
 .../include/smarty/plugins/modifier.strip_tags.php |   31 +
 .../include/smarty/plugins/modifier.truncate.php   |   64 +
 .../include/smarty/plugins/modifier.upper.php      |   30 +
 .../include/smarty/plugins/modifier.wordwrap.php   |   29 +
 .../smarty/plugins/outputfilter.trimwhitespace.php |   76 +
 .../smarty/plugins/shared.escape_special_chars.php |   31 +
 .../smarty/plugins/shared.make_timestamp.php       |   43 +
 .../plugins/variablefilter.htmlspecialchars.php    |   21 +
 .../smarty_internal_cacheresource_file.php         |  184 ++
 .../sysplugins/smarty_internal_compile_append.php  |   61 +
 .../sysplugins/smarty_internal_compile_assign.php  |   65 +
 .../sysplugins/smarty_internal_compile_block.php   |  108 +
 .../sysplugins/smarty_internal_compile_call.php    |   63 +
 .../sysplugins/smarty_internal_compile_capture.php |   72 +
 .../smarty_internal_compile_config_load.php        |   53 +
 .../sysplugins/smarty_internal_compile_debug.php   |   34 +
 .../sysplugins/smarty_internal_compile_eval.php    |   46 +
 .../sysplugins/smarty_internal_compile_extends.php |   86 +
 .../sysplugins/smarty_internal_compile_for.php     |  133 +
 .../sysplugins/smarty_internal_compile_foreach.php |  192 ++
 .../smarty_internal_compile_function.php           |   99 +
 .../sysplugins/smarty_internal_compile_if.php      |  114 +
 .../sysplugins/smarty_internal_compile_include.php |  145 ++
 .../smarty_internal_compile_include_php.php        |   68 +
 .../sysplugins/smarty_internal_compile_insert.php  |   83 +
 .../sysplugins/smarty_internal_compile_ldelim.php  |   32 +
 .../sysplugins/smarty_internal_compile_nocache.php |   59 +
 ...marty_internal_compile_private_block_plugin.php |   73 +
 ...ty_internal_compile_private_function_plugin.php |   53 +
 .../smarty_internal_compile_private_modifier.php   |   59 +
 ...ernal_compile_private_object_block_function.php |   59 +
 ...ty_internal_compile_private_object_function.php |   54 +
 ...y_internal_compile_private_print_expression.php |   61 +
 ...y_internal_compile_private_registered_block.php |   79 +
 ...nternal_compile_private_registered_function.php |   51 +
 ...y_internal_compile_private_special_variable.php |  100 +
 .../sysplugins/smarty_internal_compile_rdelim.php  |   32 +
 .../sysplugins/smarty_internal_compile_section.php |  170 ++
 .../sysplugins/smarty_internal_compile_while.php   |   66 +
 .../sysplugins/smarty_internal_compilebase.php     |  103 +
 .../smarty/sysplugins/smarty_internal_config.php   |  260 ++
 .../smarty_internal_config_file_compiler.php       |  116 +
 .../sysplugins/smarty_internal_configfilelexer.php |  526 ++++
 .../smarty_internal_configfileparser.php           |  864 +++++++
 .../smarty/sysplugins/smarty_internal_data.php     |  413 +++
 .../smarty/sysplugins/smarty_internal_debug.php    |  129 +
 .../sysplugins/smarty_internal_filter_handler.php  |   64 +
 .../smarty_internal_function_call_handler.php      |   47 +
 .../smarty_internal_resource_extends.php           |  186 ++
 .../sysplugins/smarty_internal_resource_file.php   |  127 +
 .../sysplugins/smarty_internal_resource_php.php    |  127 +
 .../smarty_internal_resource_registered.php        |  137 +
 .../sysplugins/smarty_internal_resource_stream.php |   99 +
 .../sysplugins/smarty_internal_resource_string.php |   90 +
 .../smarty_internal_security_handler.php           |  130 +
 .../smarty_internal_smartytemplatecompiler.php     |   73 +
 .../smarty/sysplugins/smarty_internal_template.php |  810 ++++++
 .../smarty_internal_templatecompilerbase.php       |  404 +++
 .../sysplugins/smarty_internal_templatelexer.php   | 1831 +++++++++++++
 .../sysplugins/smarty_internal_templateparser.php  | 2684 ++++++++++++++++++++
 .../sysplugins/smarty_internal_write_file.php      |   49 +
 .../sysplugins/smarty_method__get_filter_name.php  |   31 +
 .../sysplugins/smarty_method_addpluginsdir.php     |   27 +
 .../sysplugins/smarty_method_clear_all_assign.php  |   29 +
 .../sysplugins/smarty_method_clear_all_cache.php   |   29 +
 .../sysplugins/smarty_method_clear_assign.php      |   37 +
 .../sysplugins/smarty_method_clear_cache.php       |   32 +
 .../smarty_method_clear_compiled_tpl.php           |   65 +
 .../sysplugins/smarty_method_clear_config.php      |   30 +
 .../sysplugins/smarty_method_compile_directory.php |   72 +
 .../smarty_method_disablecachemodifycheck.php      |   23 +
 .../sysplugins/smarty_method_disablecaching.php    |   22 +
 .../smarty_method_disablecompilecheck.php          |   24 +
 .../smarty_method_disableconfigbooleanize.php      |   22 +
 .../smarty_method_disableconfigoverwrite.php       |   21 +
 .../smarty_method_disableconfigreadhidden.php      |   21 +
 .../sysplugins/smarty_method_disabledebugging.php  |   21 +
 .../smarty_method_disabledebuggingurlctrl.php      |   22 +
 .../smarty_method_disabledefaulttimezone.php       |   22 +
 .../smarty_method_disableforcecompile.php          |   22 +
 .../smarty_method_disablevariablefilter.php        |   22 +
 .../smarty_method_enablecachemodifycheck.php       |   22 +
 .../smarty_method_enablecompilecheck.php           |   22 +
 .../smarty_method_enableconfigbooleanize.php       |   22 +
 .../smarty_method_enableconfigoverwrite.php        |   22 +
 .../smarty_method_enableconfigreadhidden.php       |   22 +
 .../sysplugins/smarty_method_enabledebugging.php   |   22 +
 .../smarty_method_enabledebuggingurlctrl.php       |   22 +
 .../smarty_method_enabledefaulttimezone.php        |   22 +
 .../smarty_method_enableforcecompile.php           |   22 +
 .../smarty_method_enablevariablefilter.php         |   22 +
 .../sysplugins/smarty_method_get_config_vars.php   |   36 +
 .../smarty/sysplugins/smarty_method_get_global.php |   37 +
 .../smarty_method_get_registered_object.php        |   34 +
 .../sysplugins/smarty_method_get_template_vars.php |   56 +
 .../sysplugins/smarty_method_getcachedir.php       |   27 +
 .../sysplugins/smarty_method_getcachelifetime.php  |   28 +
 .../sysplugins/smarty_method_getcompiledir.php     |   27 +
 .../sysplugins/smarty_method_getconfigdir.php      |   27 +
 .../sysplugins/smarty_method_getdebugtemplate.php  |   27 +
 .../sysplugins/smarty_method_getpluginsdir.php     |   27 +
 .../sysplugins/smarty_method_gettemplatedir.php    |   27 +
 .../sysplugins/smarty_method_getvariablefilter.php |   23 +
 .../smarty_method_iscachemodifycheck.php           |   21 +
 .../smarty/sysplugins/smarty_method_iscaching.php  |   21 +
 .../sysplugins/smarty_method_iscompilecheck.php    |   21 +
 .../smarty_method_isconfigbooleanize.php           |   21 +
 .../sysplugins/smarty_method_isconfigoverwrite.php |   21 +
 .../smarty_method_isconfigreadhidden.php           |   21 +
 .../sysplugins/smarty_method_isdebugging.php       |   21 +
 .../smarty_method_isdebuggingurlctrl.php           |   21 +
 .../sysplugins/smarty_method_isdefaulttimezone.php |   21 +
 .../sysplugins/smarty_method_isforcecompile.php    |   23 +
 .../sysplugins/smarty_method_load_filter.php       |   35 +
 .../sysplugins/smarty_method_register_block.php    |   36 +
 .../smarty_method_register_compiler_function.php   |   35 +
 .../sysplugins/smarty_method_register_function.php |   33 +
 .../sysplugins/smarty_method_register_modifier.php |   31 +
 .../sysplugins/smarty_method_register_object.php   |   46 +
 .../smarty_method_register_outputfilter.php        |   25 +
 .../smarty_method_register_postfilter.php          |   25 +
 .../smarty_method_register_prefilter.php           |   25 +
 .../sysplugins/smarty_method_register_resource.php |   33 +
 .../smarty_method_register_variablefilter.php      |   25 +
 .../smarty_method_registerdefaultpluginhandler.php |   28 +
 ...marty_method_registerdefaulttemplatehandler.php |   28 +
 .../sysplugins/smarty_method_setconfigdir.php      |   26 +
 .../sysplugins/smarty_method_setdebugtemplate.php  |   28 +
 .../sysplugins/smarty_method_setpluginsdir.php     |   29 +
 .../sysplugins/smarty_method_template_exists.php   |   31 +
 .../smarty/sysplugins/smarty_method_test.php       |   77 +
 .../sysplugins/smarty_method_unregister_block.php  |   29 +
 .../smarty_method_unregister_compiler_function.php |   29 +
 .../smarty_method_unregister_function.php          |   29 +
 .../smarty_method_unregister_modifier.php          |   29 +
 .../sysplugins/smarty_method_unregister_object.php |   28 +
 .../smarty_method_unregister_outputfilter.php      |   28 +
 .../smarty_method_unregister_postfilter.php        |   27 +
 .../smarty_method_unregister_prefilter.php         |   27 +
 .../smarty_method_unregister_resource.php          |   27 +
 .../smarty_method_unregister_variablefilter.php    |   27 +
 .../include/smarty/sysplugins/smarty_security.php  |   88 +
 gosa-core/locale/core/de/LC_MESSAGES/messages.po   | 1824 ++++++-------
 gosa-core/locale/core/es/LC_MESSAGES/messages.po   | 1850 +++++++-------
 gosa-core/locale/core/fr/LC_MESSAGES/messages.po   | 1938 +++++++-------
 gosa-core/locale/core/it/LC_MESSAGES/messages.po   | 1863 +++++++-------
 gosa-core/locale/core/messages.po                  | 1791 ++++++-------
 gosa-core/locale/core/nl/LC_MESSAGES/messages.po   | 1862 +++++++-------
 gosa-core/locale/core/pl/LC_MESSAGES/messages.po   | 1852 +++++++-------
 gosa-core/locale/core/pt/LC_MESSAGES/messages.po   | 1835 ++++++-------
 gosa-core/locale/core/ru/LC_MESSAGES/messages.po   | 1865 +++++++-------
 gosa-core/locale/core/vi/LC_MESSAGES/messages.po   | 1849 +++++++-------
 gosa-core/locale/core/zh/LC_MESSAGES/messages.po   | 1853 +++++++-------
 gosa-core/plugins/admin/acl/acl-filter.tpl         |    2 +-
 .../plugins/admin/departments/class_department.inc |  168 +-
 gosa-core/plugins/admin/departments/dep-filter.tpl |    2 +-
 gosa-core/plugins/admin/groups/class_group.inc     |   45 +-
 gosa-core/plugins/admin/groups/group-filter.tpl    |    2 +-
 gosa-core/plugins/admin/groups/group-list.xml      |    2 +-
 .../groups/singleUserSelect/singleUser-filter.tpl  |    2 +-
 .../userGroupSelect/selectUserGroup-filter.tpl     |    2 +-
 .../admin/groups/userSelect/user-filter.tpl        |    2 +-
 .../ogroups/objectSelect/selectObject-filter.tpl   |    2 +-
 gosa-core/plugins/admin/ogroups/ogroup-filter.tpl  |    2 +-
 .../plugins/admin/users/class_userManagement.inc   |  221 +-
 gosa-core/plugins/admin/users/password.tpl         |  131 +-
 gosa-core/plugins/admin/users/user-filter.tpl      |    2 +-
 gosa-core/plugins/personal/generic/changed.tpl     |   12 +
 gosa-core/plugins/personal/generic/class_user.inc  |   13 +-
 gosa-core/plugins/personal/generic/main.inc        |  180 +-
 gosa-core/plugins/personal/generic/nochange.tpl    |    8 +
 gosa-core/plugins/personal/generic/password.tpl    |  110 +-
 .../plugins/personal/password/class_password.inc   |   82 +-
 gosa-core/plugins/personal/password/nochange.tpl   |    6 -
 gosa-core/plugins/personal/password/password.tpl   |  143 +-
 .../plugins/personal/posix/class_posixAccount.inc  |   23 +-
 .../personal/posix/groupSelect/group-filter.tpl    |    2 +-
 .../personal/posix/trustSelect/trust-filter.tpl    |    2 +-
 gosa-core/redhat/gosa.spec                         |   14 +-
 gosa-core/redhat/{gosa.spec => gosa_fedora.spec}   |  129 +-
 gosa-core/redhat/rpm-make-gosa                     |    9 +-
 gosa-core/setup/class_setupStep_Checks.inc         |   10 +-
 gosa-core/setup/class_setupStep_Feedback.inc       |    4 +-
 gosa-core/setup/setup_feedback.tpl                 |    8 +
 367 files changed, 31396 insertions(+), 11024 deletions(-)

diff --cc debian/changelog
index 57fe79e,0000000..fee0c85
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,76 -1,0 +1,85 @@@
++gosa (2.6.11-1) unstable; urgency=low
++
++  * Samba schema file is incompatible with Samba shipped with lenny
++    (Closes: #582899)
++  * package explicitly depends on preform MPM (Closes: #591043)
++  * default config refers to missing FCGIWrapper (Closes: #591046)
++
++ -- Benoit Mortier <benoit.mortier at opensides.be>  Fri, 13 Aug 2010 11:00:29 +0200
++
 +gosa (2.6.10-2) unstable; urgency=low
 +
 +  * Removed faulty patch due to 3.0 source conversion
 +  * Prevented /usr/share/doc/gosa.conf to be compressed
 +    to make setup configuration file saving work again
 +
 + -- Benoit Mortier <benoit.mortier at opensides.be>  Tue, 27 Jul 2010 18:49:07 +0200
 +
 +gosa (2.6.10-1) unstable; urgency=low
 +
 +  [ Cajus Pollmeier ]
 +  * New upstream release
 +
 +  [ Benoit Mortier ]
 +  * Switch to dpkg-source 3.0 (quilt) format
 +  * gosa fails with: "Fatal error: Call to undefined function
 +    print_array() (Closes: #573220)
 +  * GOSa fails to add IP and MAC addresses to samba created hosts
 +    (Closes: #582896)
 +
 + -- Benoit Mortier <benoit.mortier at opensides.be>  Tue, 20 Jul 2010 12:48:02 +0200
 +
 +gosa (2.6.9-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Mon, 15 Mar 2010 11:28:48 +0100
 +
 +gosa (2.6.8-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Mon, 15 Feb 2010 14:19:14 +0100
 +
 +gosa (2.6.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Wed, 27 Jan 2010 21:53:12 +0100
 +
 +gosa (2.6.6-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Mon, 05 Oct 2009 15:03:41 +0200
 +
 +gosa (2.6.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Wed, 25 Feb 2009 13:36:18 +0100
 +
 +gosa (2.6.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Fri, 06 Feb 2009 11:35:38 +0100
 +
 +gosa (2.6.3-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Thu, 15 Jan 2009 11:43:15 +0100
 +
 +gosa (2.6.2-1) unstable; urgency=low
 +
 +  * New upstream release 
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Fri, 19 Dec 2008 09:51:32 +0100
 +
 +gosa (2.6.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Mon, 07 Apr 2008 11:18:53 +0200
 +
diff --cc debian/control
index d71ad38,0000000..e2465d1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,578 -1,0 +1,578 @@@
 +Source: gosa
 +Section: web
 +Priority: optional
 +Maintainer: GOsa packages maintainers group <gosa-pkg at oss.gonicus.de>
 +Uploaders: Cajus Pollmeier <cajus at debian.org>, Benoit Mortier <benoit.mortier at opensides.be>
 +Build-Depends: debhelper (>= 7.0.50~)
 +Build-Depends-Indep: po-debconf
 +Standards-Version: 3.9.1
 +Homepage: https://oss.gonicus.de/labs/gosa/
 +Vcs-Browser: https://oss.gonicus.de/repositories/gosa/trunk
 +Vcs-Svn: https://oss.gonicus.de/repositories/gosa/trunk
 +DM-Upload-Allowed: yes
 +
 +Package: gosa
 +Architecture: all
- Depends: php5, php5-cli, apache2-mpm-prefork | lighttpd , exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, smarty, php5-recode, smarty-gettext, smarty-acl-render, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi
++Depends: php5, php5-cli, apache2 | lighttpd | httpd , exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, smarty, php5-recode, smarty-gettext, smarty-acl-render, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi
 +Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf
 +Description: Web Based LDAP Administration Program
 + Provided is access to posix, shadow, samba, proxy, fax, pureftp and
 + kerberos accounts. It is able to manage the postfix/cyrus server
 + combination and can write user adapted sieve scripts.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-dev
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, php5-cli, latex2html, lyx
 +Description: GOsa² development utilities
 + This package contains a couple of tools to generate online
 + help, extract localizations and howto's for developing Gosa² plugins.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-desktop
 +Architecture: all
 +Depends: ${misc:Depends}, konqueror | iceweasel | mozilla | firefox, debconf
 +Description: Desktop integration for GOsa²
 + This package includes a Gosa² menu definition for your desktop
 + environment.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa
 + This package includes the basics LDAP schemas needed by GOsa².
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-help-en
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Description: English online help for GOsa
 + This package includes the English online documentation for GOsa²
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-help-de
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Description: German online help for GOsa²
 + This package includes the German online documentation for GOsa²
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-help-fr
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Description: French online help for GOsa²
 + This package includes the French online documentation for GOsa²
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-help-nl
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Description: Dutch online help for GOsa
 + This package includes the Dutch online documentation for GOsa²
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: smarty-acl-render
 +Architecture: all
 +Depends: ${misc:Depends}, smarty
 +Suggests: gosa
 +Description: Provide ACL based rendering for Smarty
 + smarty-acl-render provides acl based rendering support for Smarty,
 + the popular PHP templating engine (http://smarty.php.net/). This
 + module is mainly used by GOsa².
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-addressbook
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: addressbook plugin for GOsa²
 + Simple addressbook plugin for GOsa².
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-connectivity
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: connectivity plugin for GOsa²
 + Connectivity base plugin - base for really small plugins.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-dhcp
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: dhcp plugin for GOsa²
 + DHCP service management plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-dhcp-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² dhcp plugin
 + This package includes the LDAP schema needed by the GOsa²
 + dhcp plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-dns
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: dns plugin for GOsa²
 + DNS service management plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-dns-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² dns plugin
 + This package includes the LDAP schema needed by the GOsa²
 + dns plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-fai
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-goto
 +Breaks: gosa (<<2.6)
 +Description: fai plugin for GOsa²
 + FAI plugin for managing Linux system deployment.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-fai-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² fai plugin
 + This package includes the LDAP schema needed by the GOsa²
 + fai plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-gofax
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: gofax plugin for GOsa²
 + GOfax management with report functionality
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-gofon
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: gofon plugin for GOsa²
 + GOfon management with report functionality
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-goto
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: goto plugin for GOsa²
 + GOto desktop management plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-kolab
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity, gosa-plugin-mail
 +Breaks: gosa (<<2.6)
 +Description: kolab plugin for GOsa²
 + Kolab2 account management plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-kolab-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² kolab plugin
 + This package includes the LDAP schema needed by the GOsa²
 + kolab plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-ldapmanager
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: ldapmanager plugin for GOsa²
 + LDAP import and export management plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-log
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: log plugin for GOsa²
 + Syslog and GOsa² logging management plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-log-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² log plugin
 + This package includes the LDAP schema needed by the GOsa²
 + log plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-mail
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: base mail plugin for GOsa²
 + Mail management base plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-mit-krb5
 +Architecture: all
 +Conflicts: gosa-plugin-heimdal 
 +Breaks: gosa (<<2.6)
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Description: mit-krb5 plugin for GOsa²
 + MIT kerberos management plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-mit-krb5-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² mit-krb5 plugin
 + This package includes the LDAP schema needed by the GOsa²
 + mit-krb5 plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-nagios
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: nagios plugin for GOsa²
 + Nagios account settings management
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-nagios-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² nagios plugin
 + This package includes the LDAP schema needed by the GOsa²
 + nagios plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-netatalk
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: netatalk plugin for GOsa²
 + Netatalk account management plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-opengroupware
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-mail, gosa-plugin-connectivity
 +Breaks: gosa (<<2.6)
 +Description: opengroupware plugin for GOsa²
 + Opengroupware account management plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-openxchange
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-mail, gosa-plugin-connectivity
 +Breaks: gosa (<<2.6)
 +Description: openxchange plugin for GOsa²
 + Open-Xchange account management plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-openxchange-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² openxchange plugin
 + This package includes the LDAP schema needed by the GOsa²
 + openxchange plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-opsi
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-fai, gosa-plugin-goto
 +Breaks: gosa (<<2.6)
 +Description: opsi plugin for GOsa²
 + opsi plugin for managing windows system and software deployment
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-phpgw
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-mail, gosa-plugin-connectivity
 +Breaks: gosa (<<2.6)
 +Description: phpgw plugin for GOsa²
 + PHP Groupware connectivity plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-phpgw-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² phpgw plugin
 + This package includes the LDAP schema needed by the GOsa²
 + phpgw plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-phpscheduleit
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
 +Breaks: gosa (<<2.6)
 +Description: phpscheduleit plugin for GOsa²
 + PHP scheduleit connectivity plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-phpscheduleit-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² phpscheduleit plugin
 + This package includes the LDAP schema needed by the GOsa²
 + phpscheduleit plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-pptp
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
 +Breaks: gosa (<<2.6)
 +Description: pptp plugin for GOsa²
 + PPTP connectivity plugin
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-pptp-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² pptp plugin
 + This package includes the LDAP schema needed by the GOsa²
 + pptp plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-pureftpd
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
 +Breaks: gosa (<<2.6)
 +Description: pureftpd plugin for GOsa²
 + PureFTPD connectivity plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-pureftpd-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² pureftpd plugin
 + This package includes the LDAP schema needed by the GOsa²
 + pureftpd plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-rolemanagement
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: rolemanagement plugin for GOsa²
 + Role Management plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-rsyslog
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.6)
 +Description: rsyslog plugin for GOsa²
 + Syslog and GOsa logging plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-samba
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: samba3 plugin for GOsa²
 + Plugin for Samba 3 management.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-scalix
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: scalix plugin for GOsa²
 + Scalix account management plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-squid
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
 +Breaks: gosa (<<2.6)
 +Description: squid plugin for GOsa²
 + Squid connectivity plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-ssh
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: ssh plugin for GOsa²
 + SSH key management plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-ssh-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² ssh plugin
 + This package includes the LDAP schema needed by the GOsa²
 + ssh plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-sudo
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: sudo plugin for GOsa²
 + Sudo management plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-sudo-schema
 +Architecture: all
 +Depends: ${misc:Depends}
 +Recommends: slapd
 +Description: LDAP schema for GOsa² sudo plugin
 + This package includes the LDAP schema needed by the GOsa
 + sudo plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-systems
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.6)
 +Description: systems plugin for GOsa²
 + Systems management base plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-uw-imap
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-mail
 +Breaks: gosa (<<2.6)
 +Description: uw-imap plugin for GOsa²
 + UW imap mail method.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
 +Package: gosa-plugin-webdav
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-connectivity
 +Breaks: gosa (<<2.6)
 +Description: webdav plugin for GOsa²
 + WebDAV connectivity plugin.
 + .
 + GOsa² is a combination of system-administrator and end-user web
 + interface, designed to handle LDAP based setups.
 +
diff --cc debian/gosa-plugin-gofax.install
index 57c2092,0000000..a3e9ce3
mode 100644,000000..100644
--- a/debian/gosa-plugin-gofax.install
+++ b/debian/gosa-plugin-gofax.install
@@@ -1,6 -1,0 +1,7 @@@
 +gofax/admin			/usr/share/gosa/plugins
++gofax/gofax			/usr/share/gosa/plugins
 +gofax/help/guide.xml		/usr/share/gosa/doc/plugins/gofax
 +gofax/locale			/usr/share/gosa/locale/plugins/gofax
 +gofax/contrib			/usr/share/doc/gosa-plugin-gofax
 +gofax/html/getfax.php		/usr/share/gosa/html/plugins/gofax
 +gofax/html/images		/usr/share/gosa/html/plugins/gofax
diff --cc debian/gosa-plugin-gofon.install
index 0860d04,0000000..4ca6cdf
mode 100644,000000..100644
--- a/debian/gosa-plugin-gofon.install
+++ b/debian/gosa-plugin-gofon.install
@@@ -1,6 -1,0 +1,7 @@@
 +gofon/admin		/usr/share/gosa/plugins
++gofon/gofon		/usr/share/gosa/plugins
 +gofon/help/guide.xml	/usr/share/gosa/doc/plugins/gofon
 +gofon/locale		/usr/share/gosa/locale/plugins/gofon
 +gofon/contrib		/usr/share/doc/gosa-plugin-gofon
 +gofon/html/images	/usr/share/gosa/html/plugins/gofon
 +gofon/etc		/etc/gosa
diff --cc debian/gosa-plugin-ldapmanager.install
index d5a17f2,0000000..2b35637
mode 100644,000000..100644
--- a/debian/gosa-plugin-ldapmanager.install
+++ b/debian/gosa-plugin-ldapmanager.install
@@@ -1,6 -1,0 +1,5 @@@
 +ldapmanager/addons		/usr/share/gosa/plugins
 +ldapmanager/help/guide.xml	/usr/share/gosa/doc/plugins/ldapmanager
 +ldapmanager/locale		/usr/share/gosa/locale/plugins/ldapmanager
- ldapmanager/html/getldif.php	/usr/share/gosa/html/plugins/ldapmanager
 +ldapmanager/html/getxls.php	/usr/share/gosa/html/plugins/ldapmanager
 +ldapmanager/html/images		/usr/share/gosa/html/plugins/ldapmanager
diff --cc debian/gosa-schema.install
index 52b64a2,0000000..3a3867f
mode 100644,000000..100644
--- a/debian/gosa-schema.install
+++ b/debian/gosa-schema.install
@@@ -1,11 -1,0 +1,10 @@@
 +gosa-core/contrib/openldap/gosa-samba3.schema   /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/rfc2307bis.schema    /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/samba3.schema        /etc/ldap/schema/gosa
- gosa-core/contrib/openldap/samba.schema         /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/trust.schema         /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/gofax.schema         /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/goto-mime.schema     /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/gofon.schema         /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/goserver.schema      /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/goto.schema          /etc/ldap/schema/gosa
 +gosa-core/contrib/openldap/gosystem.schema      /etc/ldap/schema/gosa
diff --cc debian/patches/03_fix_class_mapping.patch
index a71629c,0000000..e740606
mode 100644,000000..100644
--- a/debian/patches/03_fix_class_mapping.patch
+++ b/debian/patches/03_fix_class_mapping.patch
@@@ -1,52 -1,0 +1,52 @@@
 +Author: <cajus at debian.org>
 +Description: Fix location of auto-generated class mapping file
 +--- a/include/class_config.inc
 ++++ b/gosa-core/include/class_config.inc
 +@@ -100,12 +100,12 @@
 +         if we have installed or removed plugins. 
 +      */
 +     if(session::global_is_set("class_location.inc:timestamp")){
 +-      $tmp = stat("../include/class_location.inc");
 ++      $tmp = stat("/var/cache/gosa/class.cache");
 +       if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){
 +         session::global_un_set("plist");
 +       }
 +     }
 +-    $tmp = stat("../include/class_location.inc");
 ++    $tmp = stat("/var/cache/gosa/class.cache");
 +     session::global_set("class_location.inc:timestamp",$tmp['mtime']);
 + 
 +     if($this->filename != "" && filemtime($this->filename) != $this->last_modified){
 +--- a/include/functions.inc
 ++++ b/gosa-core/include/functions.inc
 +@@ -73,7 +73,7 @@
-  $svn_revision = '$Revision: 17589 $';
++ $svn_revision = '$Revision: 19051 $';
 + 
 + /* Include required files */
 +-require_once("class_location.inc");
 ++require_once("/var/cache/gosa/class.cache");
 + require_once ("functions_debug.inc");
 + require_once ("accept-to-gettext.inc");
 + 
 +--- a/update-gosa
 ++++ b/gosa-core/update-gosa
 +@@ -21,7 +21,7 @@
 +  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 +  */
 + 
 +-define ("GOSA_HOME", dirname(__FILE__));
 ++define ("GOSA_HOME", "/usr/share/gosa");
 + define ("LOCALE_DIR", GOSA_HOME."/locale");
 + define ("PLUGSTATE_DIR", GOSA_HOME."/state");
 + 
 +@@ -122,8 +122,8 @@
 + function rescan_classes()
 + {
 + 	echo "Updating class cache...\n";
 +-	$class_mapping= get_classes();
 +-	$filename= GOSA_HOME."/include/class_location.inc";
 ++	$class_mapping= get_classes("/usr/share/gosa");
 ++	$filename= "/var/cache/gosa/class.cache";
 + 
 + 	/* Sanity checks */
 + 	if (!file_exists($filename) || is_writable($filename)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git



More information about the debian-edu-commits mailing list