[debian-edu-commits] debian-edu/pkg-team/ 09/32: Imported Debian patch 2.7.2-1

Mike Gabriel sunweaver at debian.org
Tue Apr 1 16:52:04 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 2cbdcab2624b7febc3e35240876bc7ed952d8798
Merge: c1f28b4 0a1a16b
Author: Cajus Pollmeier <cajus at debian.org>
Date:   Tue Oct 25 13:48:03 2011 +0200

    Imported Debian patch 2.7.2-1

 debian/changelog                                   |  16 +
 debian/control                                     |  29 +-
 debian/control.in                                  |  29 +-
 debian/patches/01_fix_smarty_location.patch        |   4 +-
 debian/patches/02_fix_template_location.patch      |   4 +-
 debian/patches/03_fix_class_mapping.patch          |  22 +-
 debian/patches/04_fix_locale_location.patch        |   6 +-
 debian/po/cs.po                                    |   2 +-
 debian/po/cz.po                                    |  39 -
 debian/po/da.po                                    |  38 +
 debian/smarty3-gettext.dirs                        |   1 -
 debian/smarty3-gettext.install                     |   1 -
 debian/smarty3-gosa.dirs                           |   1 -
 debian/smarty3-gosa.install                        |   4 -
 gosa-core/COPYING                                  |  10 +-
 gosa-core/Changelog                                |  12 +
 gosa-core/contrib/gosa.conf.5                      |   8 +
 gosa-core/html/include/gosa.js                     |   2 +-
 gosa-core/html/index.php                           |  10 +-
 gosa-core/html/main.php                            |   4 +-
 gosa-core/ihtml/themes/default/acl.tpl             |  62 +-
 gosa-core/include/class_CopyPasteHandler.inc       |   4 +-
 gosa-core/include/class_ItemSelector.inc           |   2 +-
 gosa-core/include/class_acl.inc                    | 148 +++-
 gosa-core/include/class_config.inc                 |   6 +-
 gosa-core/include/class_configRegistry.inc         |  19 +-
 gosa-core/include/class_core.inc                   |  22 +-
 gosa-core/include/class_filterNOACL.inc            |  16 +
 gosa-core/include/class_gosaSupportDaemon.inc      |   6 +-
 gosa-core/include/class_jsonRPC.inc                |  25 +-
 gosa-core/include/class_ldap.inc                   |  35 +-
 gosa-core/include/class_listing.inc                |  44 +-
 gosa-core/include/class_log.inc                    |   4 +-
 gosa-core/include/class_management.inc             |   4 +-
 gosa-core/include/class_msg_dialog.inc             |   4 +-
 gosa-core/include/class_multi_plug.inc             |   6 +-
 gosa-core/include/class_plugin.inc                 |  14 +-
 gosa-core/include/class_releaseSelector.inc        |   2 +-
 gosa-core/include/class_remoteObject.inc           |  36 +-
 gosa-core/include/class_sortableListing.inc        |  69 +-
 gosa-core/include/class_tabs.inc                   |   4 +-
 gosa-core/include/class_userFilter.inc             |   4 +-
 gosa-core/include/class_userFilterEditor.inc       |   4 +-
 gosa-core/include/class_userinfo.inc               |   4 +-
 gosa-core/include/exporter/class_pdfExporter.inc   |   4 +-
 gosa-core/include/functions.inc                    |  38 +-
 gosa-core/include/php_setup.inc                    |  29 +-
 gosa-core/include/smartyAddons/block.render.php    | 126 +++
 gosa-core/include/smartyAddons/block.t.php         | 126 +++
 gosa-core/include/smartyAddons/block.tr.php        |  25 +
 .../include/smartyAddons/function.factory.php      |  37 +
 gosa-core/include/smartyAddons/function.image.php  |  25 +
 .../include/smartyAddons/function.msgPool.php      |  21 +
 gosa-core/include/utils/class_tests.inc            |   2 +-
 gosa-core/include/utils/class_xml.inc              |   2 +-
 gosa-core/locale/core/de/LC_MESSAGES/messages.po   | 945 ++++++++++----------
 gosa-core/locale/core/es/LC_MESSAGES/messages.po   | 940 ++++++++++----------
 gosa-core/locale/core/fr/LC_MESSAGES/messages.po   | 939 ++++++++++----------
 gosa-core/locale/core/it/LC_MESSAGES/messages.po   | 936 ++++++++++----------
 gosa-core/locale/core/messages.po                  | 915 ++++++++++----------
 gosa-core/locale/core/nl/LC_MESSAGES/messages.po   | 936 ++++++++++----------
 gosa-core/locale/core/pl/LC_MESSAGES/messages.po   | 945 ++++++++++----------
 gosa-core/locale/core/pt/LC_MESSAGES/messages.po   | 930 ++++++++++----------
 .../locale/core/pt_BR/LC_MESSAGES/messages.po      | 947 +++++++++++----------
 gosa-core/locale/core/ru/LC_MESSAGES/messages.po   | 933 ++++++++++----------
 gosa-core/locale/core/vi/LC_MESSAGES/messages.po   | 946 ++++++++++----------
 gosa-core/locale/core/zh/LC_MESSAGES/messages.po   | 936 ++++++++++----------
 .../addons/dyngroup/class_DynamicLdapGroup.inc     |  17 +-
 .../addons/propertyEditor/class_propertyEditor.inc |   2 +-
 .../addons/propertyEditor/property-list.xml        |   1 +
 .../plugins/admin/departments/class_department.inc |   4 +-
 gosa-core/plugins/admin/groups/class_group.inc     |  55 +-
 gosa-core/plugins/admin/groups/generic.tpl         |  61 +-
 gosa-core/plugins/admin/ogroups/class_ogroup.inc   |  40 +-
 gosa-core/plugins/admin/ogroups/generic.tpl        |   7 +
 .../ogroups/objectSelect/class_objectSelect.inc    |   2 +-
 gosa-core/plugins/admin/ogroups/tabs_ogroups.inc   |   6 +-
 .../plugins/admin/users/class_userManagement.inc   |  33 +-
 gosa-core/plugins/admin/users/template.tpl         |  21 +-
 .../generic/dashBoard/Register/register.tpl        |   2 +-
 .../plugins/generic/dashBoard/class_rssReader.inc  |   2 +-
 .../plugins/generic/infoPage/class_infoPage.inc    |   2 +-
 .../generic/references/class_aclResolver.inc       |   2 +-
 .../chartClasses/class_actionSelectChart.inc       |   2 +-
 .../chartClasses/class_categoryActionOverTime.inc  |   8 +-
 .../chartClasses/class_objectCountChart.inc        |   2 +-
 .../chartClasses/class_passwordChangeChart.inc     |   2 +-
 .../statistics/chartClasses/class_statChart.inc    |   2 +-
 .../generic/statistics/class_statistics.inc        |   4 +-
 gosa-core/plugins/personal/generic/class_user.inc  |  36 +-
 .../plugins/personal/password/class_password.inc   |  21 +-
 .../plugins/personal/posix/class_posixAccount.inc  | 129 ++-
 gosa-core/plugins/personal/posix/generic.tpl       |  19 +-
 .../groupSelect/class_filterLDAPBlacklist.inc      |   2 +-
 .../trustModeDialog/class_trustModeDialog.inc      |  10 +-
 gosa-core/setup/class_setupStep_Ldap.inc           |   4 +-
 gosa-core/setup/class_setupStep_Migrate.inc        |   4 +-
 gosa-core/setup/class_setupStep_Schema.inc         |   2 +-
 98 files changed, 7066 insertions(+), 5907 deletions(-)

diff --cc debian/changelog
index 066beef,0000000..ad458d1
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,93 -1,0 +1,109 @@@
++gosa (2.7.2-1) unstable; urgency=low
++
++  * New upstream release
++  * Added danish template translation (Closes: #628223)
++  * Removed extra spurious Czech translation file (Closes: #624209)
++  * Upstream has followed the whishlist bug (Closes: #629315)
++  * Fixed an incorrect warning issue (Closes: #629318)
++
++ -- Cajus Pollmeier <cajus at debian.org>  Tue, 25 Oct 2011 13:48:03 +0200
++
++gosa (2.7.1-2) unstable; urgency=low
++
++  * Updated debconf translation (Closes: #624209)
++
++ -- Cajus Pollmeier <cajus at debian.org>  Wed, 27 Apr 2011 08:32:00 +0200
++
 +gosa (2.7.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Updated packaging to not include smarty (Closes: #620489)
 +  * Fixed case of POSIX (Closes: #620486)
 +
 + -- Cajus Pollmeier <cajus at debian.org>  Mon, 04 Oct 2010 10:45:44 +0200
 +
 +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 10e8e0c,0000000..5cd33d7
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,559 -1,0 +1,536 @@@
 +Source: gosa
 +Section: web
 +Priority: optional
 +Maintainer: GOsa packages maintainers group <gosa-pkg at oss.gonicus.de>
 +Uploaders: Cajus Pollmeier <cajus at debian.org>
 +Build-Depends: debhelper (>= 7.0.50~)
 +Build-Depends-Indep: po-debconf
- Standards-Version: 3.9.1
++Standards-Version: 3.9.2
 +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 | 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, php5-recode, smarty3-gettext, smarty3-gosa, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl, ttf-liberation
++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, php5-recode, smarty3 (>= 3.0.8-1), gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl, ttf-liberation
 +Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf
++Conflicts: smarty3-gosa, smarty3-gettext, smarty-acl-render
 +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: smarty3-gosa
- Architecture: all
- Depends: ${misc:Depends}, smarty3
- Suggests: gosa
- Description: Provide ACL based rendering for Smarty
-  smarty3-gosa 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: smarty3-gettext
- Architecture: all
- Depends: ${misc:Depends}, smarty3
- Suggests: gosa
- Description: Provide gettext support for Smarty
-  smarty3-gettext provides getext 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-connectivity
 +Architecture: all
 +Depends: ${misc:Depends}, gosa
 +Breaks: gosa (<<2.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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-mail
 +Architecture: all
 +Depends: ${misc:Depends}, gosa, gosa-plugin-systems
 +Breaks: gosa (<<2.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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.7)
 +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/control.in
index e912920,0000000..4ebc6c2
mode 100644,000000..100644
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,128 -1,0 +1,105 @@@
 +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
++Standards-Version: 3.9.2
 +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 | 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, php5-recode, smarty3-gettext, smarty3-gosa, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl
++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, php5-recode, smarty3, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl
 +Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf
++Conflicts: smarty3-gettext, smarty3-gosa, smarty-acl-render
 +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: smarty3-gosa
- Architecture: all
- Depends: ${misc:Depends}, smarty3
- Suggests: gosa
- Description: Provide ACL based rendering for Smarty
-  smarty3-gosa 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: smarty3-gettext
- Architecture: all
- Depends: ${misc:Depends}, smarty3
- Suggests: gosa
- Description: Provide gettext support for Smarty
-  smarty3-gettext provides getext 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: smarty3
 +Architecture: all
 +Depends: php5 | php5-cgi | php5-cli, ${misc:Depends}
 +Description: Template engine for PHP
 + Smarty is a template engine for PHP. More specifically, it
 + facilitates a manageable way to separate application logic and content
 + from its presentation.
 + .
 + The Smarty 3 API has been refactored to a syntax geared for consistency 
 + and modularity. The Smarty 2 API syntax is still supported, but will 
 + throw a deprecation notice. You can disable the notices, but it is highly
 + recommended to adjust your syntax to Smarty 3, as the Smarty 2 syntax 
 + must run through an extra rerouting wrapper.
diff --cc debian/patches/01_fix_smarty_location.patch
index d5d9f8a,0000000..d7325ae
mode 100644,000000..100644
--- a/debian/patches/01_fix_smarty_location.patch
+++ b/debian/patches/01_fix_smarty_location.patch
@@@ -1,17 -1,0 +1,17 @@@
 +Author: <cajus at debian.org>
 +Description: Adapt location for debian packaged smarty
- --- a/include/php_setup.inc
++--- a/gosa-core/include/php_setup.inc
 ++++ b/gosa-core/include/php_setup.inc
- @@ -285,7 +285,11 @@
++@@ -295,7 +295,11 @@
 + ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel:/usr/share/php");
 + 
 + /* Do smarty setup */
 +-require("smarty/Smarty.class.php");
 ++if (file_exists("/usr/share/php/smarty3/Smarty.class.php")){
 ++	require("/usr/share/php/smarty3/Smarty.class.php");
 ++} else {
 ++	require("/usr/share/php/smarty3/libs/Smarty.class.php");
 ++}
 + $smarty = new Smarty;
 + $smarty->template_dir = $BASE_DIR.'/ihtml/';
 + $smarty->caching= false;
diff --cc debian/patches/02_fix_template_location.patch
index 78ba89e,0000000..cd93a24
mode 100644,000000..100644
--- a/debian/patches/02_fix_template_location.patch
+++ b/debian/patches/02_fix_template_location.patch
@@@ -1,13 -1,0 +1,13 @@@
 +Author: <cajus at debian.org>
 +Description: Fix location of configuration template.
- --- a/include/functions.inc
++--- a/gosa-core/include/functions.inc
 ++++ b/gosa-core/include/functions.inc
- @@ -40,7 +40,7 @@
++@@ -44,7 +44,7 @@
 + }
 + 
 + /* Define common locatitions */
 +-define ("CONFIG_TEMPLATE_DIR", "../contrib");
 ++define ("CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa");
 + define ("TEMP_DIR","/var/cache/gosa/tmp");
 + 
 + /* Define get_list flags */
diff --cc debian/patches/03_fix_class_mapping.patch
index 0fdc137,0000000..51243bd
mode 100644,000000..100644
--- a/debian/patches/03_fix_class_mapping.patch
+++ b/debian/patches/03_fix_class_mapping.patch
@@@ -1,58 -1,0 +1,52 @@@
 +Author: <cajus at debian.org>
 +Description: Fix location of auto-generated class mapping file
- Index: gosa/gosa-core/include/class_config.inc
- ===================================================================
- --- gosa.orig/gosa-core/include/class_config.inc	2010-11-10 16:44:26.000000000 +0100
- +++ gosa/gosa-core/include/class_config.inc	2010-10-23 17:29:16.000000000 +0200
++--- a/gosa-core/include/class_config.inc
+++++ b/gosa-core/include/class_config.inc
 +@@ -116,12 +116,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){
- Index: gosa/gosa-core/include/functions.inc
- ===================================================================
- --- gosa.orig/gosa-core/include/functions.inc	2010-10-23 17:29:16.000000000 +0200
- +++ gosa/gosa-core/include/functions.inc	2010-10-23 17:29:16.000000000 +0200
++--- a/gosa-core/include/functions.inc
+++++ b/gosa-core/include/functions.inc
 +@@ -73,7 +73,7 @@
 + define('DES3_CBC_SHA1',16);
 + 
 + /* Include required files */
- -require_once("class_location.inc");
++-include_once("class_location.inc");
 ++require_once("/var/cache/gosa/class.cache");
 + require_once ("functions_debug.inc");
 + require_once ("accept-to-gettext.inc");
 + 
- Index: gosa/gosa-core/update-gosa
- ===================================================================
- --- gosa.orig/gosa-core/update-gosa	2010-11-19 12:21:50.000000000 +0100
- +++ gosa/gosa-core/update-gosa	2010-10-23 17:34:41.000000000 +0200
++--- a/gosa-core/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");
 + 
- @@ -136,8 +136,8 @@
++@@ -138,8 +138,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)) {
diff --cc debian/patches/04_fix_locale_location.patch
index 2a27f18,0000000..72f381c
mode 100644,000000..100644
--- a/debian/patches/04_fix_locale_location.patch
+++ b/debian/patches/04_fix_locale_location.patch
@@@ -1,41 -1,0 +1,41 @@@
 +Author: <cajus at debian.org>
 +Description: Fixed location of auto-generated locales
- --- a/include/php_setup.inc
++--- a/gosa-core/include/php_setup.inc
 ++++ b/gosa-core/include/php_setup.inc
 +@@ -20,7 +20,7 @@
 +  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 +  */
 + 
 +-define ("LOCALE_DIR", dirname(dirname(__FILE__))."/locale/compiled");
 ++define ("LOCALE_DIR", "/var/cache/gosa/locale");
 + 
 + function gosaRaiseError($errno, $errstr, $errfile, $errline)
 + {
- --- a/update-gosa
++--- a/gosa-core/update-gosa
 ++++ b/gosa-core/update-gosa
- @@ -169,20 +169,20 @@
++@@ -185,20 +185,20 @@
 + 
 + 	/* For each language, merge the target .mo to the compiled directory. */
 + 	foreach ($languages as $language => $po_files){
 +-		if (!is_dir(LOCALE_DIR."/compiled/${language}/LC_MESSAGES")){
 +-			if (!mkdir (LOCALE_DIR."/compiled/${language}/LC_MESSAGES", 0755, TRUE)){
 +-				echo "Failed to create '".LOCALE_DIR."/compiled/${language}/LC_MESSAGES'- aborted";
 ++		if (!is_dir("/var/cache/gosa/locale/${language}/LC_MESSAGES")){
 ++			if (!mkdir ("/var/cache/gosa/locale/${language}/LC_MESSAGES", 0755, TRUE)){
 ++				echo "Failed to create '/var/cache/gosa/locale/${language}/LC_MESSAGES'- aborted";
 + 				exit (3);
 + 			}
 + 		}
 + 
 + 		/* Cat all these po files into one single file */
 +-		system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
 ++		system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > /var/cache/gosa/locale/${language}/LC_MESSAGES/messages.po)", $val);
 + 		if ($val != 0){
 + 			echo "Merging of message files failed - aborted";
 + 			exit (4);
 + 		}
 +-		system ("(cd ".LOCALE_DIR."/compiled/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
 ++		system ("(cd /var/cache/gosa/locale/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
 + 		if ($val != 0){
 + 			echo "Compiling of message files failed - aborted";
 + 			exit (5);
diff --cc debian/po/cs.po
index bb66999,0000000..eae993d
mode 100644,000000..100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@@ -1,39 -1,0 +1,39 @@@
 +# Czech translation for GOsa desktop file installer debconf messages.
 +# Copyright (C) 2007 Cajus Pollmeier <cajus at debian.org>
 +# This file is distributed under the same license as the gosa-desktop package.
 +# Cajus Pollmeier <cajus at debian.org>, 2007.
 +# Daniel Kavan <kuan at maradan.org>, 2008
 +#
 +msgid ""
 +msgstr ""
 +"Project-Id-Version: gosa 2.5.16.1-1\n"
 +"Report-Msgid-Bugs-To: cajus at debian.org\n"
 +"POT-Creation-Date: 2007-06-27 10:59+0200\n"
 +"PO-Revision-Date: 2008-05-27 17:49+0200\n"
 +"Last-Translator: Daniel Kavan <kuan at maradan.org>\n"
 +"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
 +#. Type: string
 +#. Description
 +#: ../gosa-desktop.templates:1001
 +msgid "URL to your GOsa installation:"
 +msgstr "URL k vaší instalaci GOsa:"
 +
 +#. Type: string
 +#. Description
 +#: ../gosa-desktop.templates:1001
 +msgid ""
 +"The gosa start script can automatically point your browser to a system wide "
 +"default location of your GOsa instance."
 +msgstr ""
 +"Startovací skript gosa může automaticky nasměrovat váš prohlížeč na celosystémovou "
 +"adresu vaší GOsa instance."
 +
 +#. Type: string
 +#. Description
 +#: ../gosa-desktop.templates:1001
 +msgid "Enter the URL in order to set this default."
- msgstr "Chcete-li dané URL nastavit jako výchozí, zadejte je zde."
++msgstr "Chcete-li danou URL nastavit jako výchozí, zadejte ji zde."
diff --cc debian/po/da.po
index 0000000,0000000..7755803
new file mode 100644
--- /dev/null
+++ b/debian/po/da.po
@@@ -1,0 -1,0 +1,38 @@@
++# Danish translation gosa.
++# Copyright (C) gosa & nedenstående oversættere.
++# This file is distributed under the same license as the gosa package.
++# Joe Hansen (joedalton2 at yahoo.dk), 2011.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: gosa\n"
++"Report-Msgid-Bugs-To: cajus at debian.org\n"
++"POT-Creation-Date: 2008-12-01 10:40+0100\n"
++"PO-Revision-Date: 2011-05-28 18:30+01:00\n"
++"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
++"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. Type: string
++#. Description
++#: ../gosa-desktop.templates:1001
++msgid "URL to your GOsa installation:"
++msgstr "Adresse til din GOsa-installation:"
++
++#. Type: string
++#. Description
++#: ../gosa-desktop.templates:1001
++msgid ""
++"The gosa start script can automatically point your browser to a system wide "
++"default location of your GOsa instance."
++msgstr ""
++"Startskriptet for gosa kan automatisk pege din browser til en fælles "
++"standardlokation for din GOsa-instans."
++
++#. Type: string
++#. Description
++#: ../gosa-desktop.templates:1001
++msgid "Enter the URL in order to set this default."
++msgstr "Indtast adressen (URL) for at angive denne standard."

-- 
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