![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f7d27f)
raw | patch | inline | side by side (parent: 1f7d27f)
| author | opensides <opensides@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Sat, 3 Jul 2010 09:11:51 +0000 (09:11 +0000) | ||
| committer | opensides <opensides@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Sat, 3 Jul 2010 09:11:51 +0000 (09:11 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@18921 594d385d-05f5-0310-b6e9-bd551577e9d8
122 files changed:
index 814ecb9d16bc4e529683881d3952c1096ac15acb..202395a9cda49fc1ecd3b30f1bbb0141d59f67e6 100644 (file)
gosa (2.6.10-1) unstable; urgency=low
+ [ Cajus Pollmeier ]
* New upstream release
- -- Cajus Pollmeier <cajus@debian.org> Wed, 05 May 2010 08:25:05 +0200
+ [ Benoit Mortier ]
+ * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Benoit Mortier <benoit.mortier@opensides.be> Sat, 26 Jun 2010 22:48:41 +0200
gosa (2.6.9-1) unstable; urgency=low
index 704bc92cae79174f4994bffcc265290a97b963b8..e7b85d0d7291cf63a4df25d84307c08d793545d1 100644 (file)
--- a/gosa-core/debian/control
+++ b/gosa-core/debian/control
Priority: optional
Maintainer: GOsa packages maintainers group <gosa-pkg@oss.gonicus.de>
Uploaders: Cajus Pollmeier <cajus@debian.org>, Benoit Mortier <benoit.mortier@opensides.be>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 7.0.50~)
Build-Depends-Indep: po-debconf
Standards-Version: 3.8.4
Homepage: https://oss.gonicus.de/labs/gosa/
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
+ GOsa² is a combination of system-administrator and end-user web
interface, designed to handle LDAP based setups.
Package: gosa-dev
Architecture: all
-Depends: gosa, php5-cli, latex2html, lyx, ${misc:Depends}
-Description: GOsa development utiles
+Depends: ${misc:Depends}, gosa, php5-cli, latex2html, lyx
+Description: GOsa² development utilities
This package contains a couple of tools to generate online
- help, extract localisations and aid developing.
+ help, extract localizations and howto's for developing Gosa² plugins.
.
- GOsa is a combination of system-administrator and end-user web
+ GOsa² is a combination of system-administrator and end-user web
interface, designed to handle LDAP based setups.
Package: gosa-desktop
Architecture: all
-Depends: konqueror | iceweasel | mozilla | firefox, debconf, ${misc:Depends}
-Description: Desktop integration for GOsa
- This package includes a menu definition for your desktop
+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
+ GOsa² is a combination of system-administrator and end-user web
interface, designed to handle LDAP based setups.
Package: gosa-schema
Depends: ${misc:Depends}
Recommends: slapd
Description: LDAP schema for GOsa
- This package includes the LDAP schema needed by GOsa.
+ This package includes the basics LDAP schemas needed by GOsa².
.
- GOsa is a combination of system-administrator and end-user web
+ 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: gosa, ${misc:Depends}
+Depends: ${misc:Depends}, gosa
Description: English online help for GOsa
- This package includes the English online documentation for GOsa
+ This package includes the English online documentation for GOsa²
.
- GOsa is a combination of system-administrator and end-user web
+ 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: gosa, ${misc:Depends}
-Description: German online help for GOsa
- This package includes the German online documentation for GOsa
+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
+ 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: gosa, ${misc:Depends}
-Description: French online help for GOsa
- This package includes the French online documentation for GOsa
+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
+ 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: gosa, ${misc:Depends}
+Depends: ${misc:Depends}, gosa
Description: Dutch online help for GOsa
- This package includes the Dutch online documentation for GOsa
+ This package includes the Dutch online documentation for GOsa²
.
- GOsa is a combination of system-administrator and end-user web
+ 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: smarty, ${misc:Depends}
+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.
+ module is mainly used by GOsa².
.
- GOsa is a combination of system-administrator and end-user web
+ 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.
index 0be551155c3bd088b86470e3aebec35bf22085e6..19a4f65ab773d845171c6b40d389453a71148a63 100644 (file)
-contrib/desktoprc /etc/gosa
-contrib/gosa /usr/bin
-debian/gosa.xpm /usr/share/pixmaps
-debian/gosa-16.xpm /usr/share/pixmaps
-debian/gosa-desktop.desktop /usr/share/applications
+gosa-core/contrib/desktoprc /etc/gosa
+gosa-core/contrib/gosa /usr/bin
+debian/gosa.xpm /usr/share/pixmaps
+debian/gosa-16.xpm /usr/share/pixmaps
+debian/gosa-desktop.desktop /usr/share/applications
index dac696456cbebf571801614498841ee343816cf0..601e6ccdf6ff1be77e54ab717a732dd3b1c5fbcc 100644 (file)
-contrib/gosa.1
+gosa-core/contrib/gosa.1
index 1e2645c98846a937580716f020e8122cb1570164..47693d6b6177f0af5e1b2e19ec6050e613ae2716 100644 (file)
-update-locale /usr/bin
-update-pdf-help /usr/bin
-dh-make-gosa /usr/bin
+gosa-core/update-locale /usr/bin
+gosa-core/update-pdf-help /usr/bin
+gosa-core/dh-make-gosa /usr/bin
index cf07bd069772e921d558530d6e516a9408dea3cd..9778cb8f3acf27179fadde184b4389b855b07bf2 100644 (file)
-dh-make-gosa.1
-update-locale.1
-update-online-help.1
-update-pdf-help.1
+gosa-core/dh-make-gosa.1
+gosa-core/update-locale.1
+gosa-core/update-online-help.1
+gosa-core/update-pdf-help.1
index fe29d06e2387455a31487ae7801406e0e503ceaa..191d9ba39c226914ef09498a39e9791fe5b41400 100644 (file)
-doc/core/de/html /usr/share/gosa/doc/core/de
+gosa-core/doc/core/de/html /usr/share/gosa/doc/core/de
index 1a90312635187e3f97aa90ec812a3ae4757e94db..187667da3ccde038b1a24095416db93a59bdb730 100644 (file)
-doc/core/en/html /usr/share/gosa/doc/core/en
+gosa-core/doc/core/en/html /usr/share/gosa/doc/core/en
index ddc282d736ab2f715efae5d767fe148f2446a661..c31ecd7279c4bb8a3007172caa4633923bda845b 100644 (file)
-doc/core/es/html /usr/share/gosa/doc/core/es
+gosa-core/doc/core/es/html /usr/share/gosa/doc/core/es
index af2c9f6842a077aedb5e00ec562279a053982449..2dbb8521442406baefc0c76e083edbbbef34bb4e 100644 (file)
-doc/core/fr/html /usr/share/gosa/doc/core/fr
+gosa-core/doc/core/fr/html /usr/share/gosa/doc/core/fr
index 3614967395f1e84cc01fda4d301fb679c721a24d..d5513346ec5c2ec383a5393f0eed0c0ed2e3f772 100644 (file)
-doc/core/nl/html /usr/share/gosa/doc/core/nl
+gosa-core/doc/core/nl/html /usr/share/gosa/doc/core/nl
diff --git a/gosa-core/debian/gosa-plugin-addressbook.dirs b/gosa-core/debian/gosa-plugin-addressbook.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-addressbook.install b/gosa-core/debian/gosa-plugin-addressbook.install
--- /dev/null
@@ -0,0 +1,6 @@
+addressbook/addons /usr/share/gosa/plugins
+addressbook/help /usr/share/gosa/doc/plugins/addressbook
+addressbook/help/guide.xml /usr/share/gosa/doc/plugins/addressbook
+addressbook/locale /usr/share/gosa/locale/plugins/addressbook
+addressbook/html/getvcard.php /usr/share/gosa/html/plugins/addressbook
+addressbook/html/images /usr/share/gosa/html/plugins/addressbook
diff --git a/gosa-core/debian/gosa-plugin-connectivity.dirs b/gosa-core/debian/gosa-plugin-connectivity.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-connectivity.install b/gosa-core/debian/gosa-plugin-connectivity.install
--- /dev/null
@@ -0,0 +1,4 @@
+connectivity/personal /usr/share/gosa/plugins
+connectivity/help/guide.xml /usr/share/gosa/doc/plugins/connectivity
+connectivity/locale /usr/share/gosa/locale/plugins/connectivity
+connectivity/html/images /usr/share/gosa/html/plugins/connectivity
diff --git a/gosa-core/debian/gosa-plugin-dhcp-schema.dirs b/gosa-core/debian/gosa-plugin-dhcp-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-dhcp-schema.install b/gosa-core/debian/gosa-plugin-dhcp-schema.install
--- /dev/null
@@ -0,0 +1 @@
+dhcp/contrib/dhcp.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-dhcp.dirs b/gosa-core/debian/gosa-plugin-dhcp.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-dhcp.install b/gosa-core/debian/gosa-plugin-dhcp.install
--- /dev/null
@@ -0,0 +1,4 @@
+dhcp/admin /usr/share/gosa/plugins
+dhcp/help/guide.xml /usr/share/gosa/doc/plugins/dhcp
+dhcp/locale /usr/share/gosa/locale/plugins/dhcp
+dhcp/contrib /usr/share/doc/gosa-plugin-dhcp
diff --git a/gosa-core/debian/gosa-plugin-dns-schema.dirs b/gosa-core/debian/gosa-plugin-dns-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-dns-schema.install b/gosa-core/debian/gosa-plugin-dns-schema.install
--- /dev/null
@@ -0,0 +1 @@
+dns/contrib/dnszone.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-dns.dirs b/gosa-core/debian/gosa-plugin-dns.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-dns.install b/gosa-core/debian/gosa-plugin-dns.install
--- /dev/null
@@ -0,0 +1,4 @@
+dns/admin /usr/share/gosa/plugins
+dns/help/guide.xml /usr/share/gosa/doc/plugins/dns
+dns/locale /usr/share/gosa/locale/plugins/dns
+dns/contrib /usr/share/doc/gosa-plugin-dns
diff --git a/gosa-core/debian/gosa-plugin-fai-schema.dirs b/gosa-core/debian/gosa-plugin-fai-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-fai-schema.install b/gosa-core/debian/gosa-plugin-fai-schema.install
--- /dev/null
@@ -0,0 +1 @@
+fai/contrib/fai.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-fai.dirs b/gosa-core/debian/gosa-plugin-fai.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-fai.install b/gosa-core/debian/gosa-plugin-fai.install
--- /dev/null
@@ -0,0 +1,6 @@
+fai/admin /usr/share/gosa/plugins
+fai/help/de /usr/share/gosa/doc/plugins/fai
+fai/help/guide.xml /usr/share/gosa/doc/plugins/fai
+fai/locale /usr/share/gosa/locale/plugins/fai
+fai/contrib /usr/share/doc/gosa-plugin-fai
+fai/html/images /usr/share/gosa/html/plugins/fai
diff --git a/gosa-core/debian/gosa-plugin-gofax.dirs b/gosa-core/debian/gosa-plugin-gofax.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-gofax.install b/gosa-core/debian/gosa-plugin-gofax.install
--- /dev/null
@@ -0,0 +1,6 @@
+gofax/admin /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 --git a/gosa-core/debian/gosa-plugin-gofon.dirs b/gosa-core/debian/gosa-plugin-gofon.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-gofon.install b/gosa-core/debian/gosa-plugin-gofon.install
--- /dev/null
@@ -0,0 +1,6 @@
+gofon/admin /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 --git a/gosa-core/debian/gosa-plugin-goto.dirs b/gosa-core/debian/gosa-plugin-goto.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-goto.install b/gosa-core/debian/gosa-plugin-goto.install
--- /dev/null
@@ -0,0 +1,7 @@
+goto/admin /usr/share/gosa/plugins
+goto/personal /usr/share/gosa/plugins
+goto/addons /usr/share/gosa/plugins
+goto/help/guide.xml /usr/share/gosa/doc/plugins/goto
+goto/locale /usr/share/gosa/locale/plugins/goto
+goto/contrib /usr/share/doc/gosa-plugin-goto
+goto/html/images /usr/share/gosa/html/plugins/goto
diff --git a/gosa-core/debian/gosa-plugin-kolab-schema.dirs b/gosa-core/debian/gosa-plugin-kolab-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-kolab-schema.install b/gosa-core/debian/gosa-plugin-kolab-schema.install
--- /dev/null
@@ -0,0 +1,2 @@
+kolab/contrib/kolab2.schema /etc/ldap/schema/gosa
+kolab/contrib/rfc2739.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-kolab.dirs b/gosa-core/debian/gosa-plugin-kolab.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-kolab.install b/gosa-core/debian/gosa-plugin-kolab.install
--- /dev/null
@@ -0,0 +1,5 @@
+kolab/admin /usr/share/gosa/plugins
+kolab/personal /usr/share/gosa/plugins
+kolab/help/guide.xml /usr/share/gosa/doc/plugins/kolab
+kolab/locale /usr/share/gosa/locale/plugins/kolab
+kolab/contrib /usr/share/doc/gosa-plugin-kolab
diff --git a/gosa-core/debian/gosa-plugin-ldapmanager.dirs b/gosa-core/debian/gosa-plugin-ldapmanager.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-ldapmanager.install b/gosa-core/debian/gosa-plugin-ldapmanager.install
--- /dev/null
@@ -0,0 +1,6 @@
+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 --git a/gosa-core/debian/gosa-plugin-log-schema.dirs b/gosa-core/debian/gosa-plugin-log-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-log-schema.install b/gosa-core/debian/gosa-plugin-log-schema.install
--- /dev/null
@@ -0,0 +1 @@
+log/contrib/goconfig.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-log.dirs b/gosa-core/debian/gosa-plugin-log.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-log.install b/gosa-core/debian/gosa-plugin-log.install
--- /dev/null
@@ -0,0 +1,5 @@
+log/admin /usr/share/gosa/plugins
+log/help/guide.xml /usr/share/gosa/doc/plugins/log
+log/locale /usr/share/gosa/locale/plugins/log
+log/contrib /usr/share/doc/gosa-plugin-log
+log/html/images /usr/share/gosa/html/plugins/log
diff --git a/gosa-core/debian/gosa-plugin-mail.dirs b/gosa-core/debian/gosa-plugin-mail.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-mail.install b/gosa-core/debian/gosa-plugin-mail.install
--- /dev/null
@@ -0,0 +1,8 @@
+mail/admin /usr/share/gosa/plugins
+mail/personal /usr/share/gosa/plugins
+mail/addons /usr/share/gosa/plugins
+mail/help/guide.xml /usr/share/gosa/doc/plugins/mail
+mail/locale /usr/share/gosa/locale/plugins/mail
+mail/contrib /usr/share/doc/gosa-plugin-mail
+mail/html/images /usr/share/gosa/html/plugins/mail
+mail/etc/ /etc/gosa
diff --git a/gosa-core/debian/gosa-plugin-mit-krb5-schema.dirs b/gosa-core/debian/gosa-plugin-mit-krb5-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-mit-krb5-schema.install b/gosa-core/debian/gosa-plugin-mit-krb5-schema.install
--- /dev/null
@@ -0,0 +1 @@
+mit-krb5/contrib/hdb.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-mit-krb5.dirs b/gosa-core/debian/gosa-plugin-mit-krb5.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-mit-krb5.install b/gosa-core/debian/gosa-plugin-mit-krb5.install
--- /dev/null
@@ -0,0 +1,4 @@
+mit-krb5/admin /usr/share/gosa/plugins
+mit-krb5/help/guide.xml /usr/share/gosa/doc/plugins/mit-krb5
+mit-krb5/locale /usr/share/gosa/locale/plugins/mit-krb5
+mit-krb5/contrib /usr/share/doc/gosa-plugin-mit-krb5
diff --git a/gosa-core/debian/gosa-plugin-nagios-schema.dirs b/gosa-core/debian/gosa-plugin-nagios-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-nagios-schema.install b/gosa-core/debian/gosa-plugin-nagios-schema.install
--- /dev/null
@@ -0,0 +1 @@
+nagios/contrib/nagios.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-nagios.dirs b/gosa-core/debian/gosa-plugin-nagios.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-nagios.install b/gosa-core/debian/gosa-plugin-nagios.install
--- /dev/null
@@ -0,0 +1,5 @@
+nagios/personal /usr/share/gosa/plugins
+nagios/help/guide.xml /usr/share/gosa/doc/plugins/nagios
+nagios/locale /usr/share/gosa/locale/plugins/nagios
+nagios/contrib /usr/share/doc/gosa-plugin-nagios
+nagios/html/images /usr/share/gosa/html/plugins/nagios
diff --git a/gosa-core/debian/gosa-plugin-netatalk.dirs b/gosa-core/debian/gosa-plugin-netatalk.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-netatalk.install b/gosa-core/debian/gosa-plugin-netatalk.install
--- /dev/null
@@ -0,0 +1,5 @@
+netatalk/personal /usr/share/gosa/plugins
+netatalk/help/guide.xml /usr/share/gosa/doc/plugins/netatalk
+netatalk/locale /usr/share/gosa/locale/plugins/netatalk
+netatalk/contrib /usr/share/doc/gosa-plugin-netatalk
+netatalk/html/images /usr/share/gosa/html/plugins/netatalk
diff --git a/gosa-core/debian/gosa-plugin-opengroupware.dirs b/gosa-core/debian/gosa-plugin-opengroupware.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-opengroupware.install b/gosa-core/debian/gosa-plugin-opengroupware.install
--- /dev/null
@@ -0,0 +1,3 @@
+opengroupware/personal /usr/share/gosa/plugins
+opengroupware/help/guide.xml /usr/share/gosa/doc/plugins/opengroupware
+opengroupware/locale /usr/share/gosa/locale/plugins/opengroupware
diff --git a/gosa-core/debian/gosa-plugin-openxchange-schema.dirs b/gosa-core/debian/gosa-plugin-openxchange-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-openxchange-schema.install b/gosa-core/debian/gosa-plugin-openxchange-schema.install
--- /dev/null
@@ -0,0 +1 @@
+openxchange/contrib/openxchange.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-openxchange.dirs b/gosa-core/debian/gosa-plugin-openxchange.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-openxchange.install b/gosa-core/debian/gosa-plugin-openxchange.install
--- /dev/null
@@ -0,0 +1,4 @@
+openxchange/personal /usr/share/gosa/plugins
+openxchange/help/guide.xml /usr/share/gosa/doc/plugins/openxchange
+openxchange/locale /usr/share/gosa/locale/plugins/openxchange
+openxchange/contrib /usr/share/doc/gosa-plugin-openxchange
diff --git a/gosa-core/debian/gosa-plugin-opsi.dirs b/gosa-core/debian/gosa-plugin-opsi.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-opsi.install b/gosa-core/debian/gosa-plugin-opsi.install
--- /dev/null
@@ -0,0 +1,4 @@
+opsi/admin /usr/share/gosa/plugins
+opsi/help/guide.xml /usr/share/gosa/doc/plugins/opsi
+opsi/locale /usr/share/gosa/locale/plugins/opsi
+opsi/html/images /usr/share/gosa/html/plugins/opsi
diff --git a/gosa-core/debian/gosa-plugin-opsi.lintian-overrides b/gosa-core/debian/gosa-plugin-opsi.lintian-overrides
--- /dev/null
@@ -0,0 +1 @@
+gosa-plugin-opsi: extra-license-file usr/share/gosa/plugins/admin/opsiLicenses/class_filterOpsiLicense.inc
diff --git a/gosa-core/debian/gosa-plugin-phpgw-schema.dirs b/gosa-core/debian/gosa-plugin-phpgw-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-phpgw-schema.install b/gosa-core/debian/gosa-plugin-phpgw-schema.install
--- /dev/null
@@ -0,0 +1 @@
+phpgw/contrib/phpgwaccount.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-phpgw.dirs b/gosa-core/debian/gosa-plugin-phpgw.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-phpgw.install b/gosa-core/debian/gosa-plugin-phpgw.install
--- /dev/null
@@ -0,0 +1,4 @@
+phpgw/personal /usr/share/gosa/plugins
+phpgw/help/guide.xml /usr/share/gosa/doc/plugins/phpgw
+phpgw/locale /usr/share/gosa/locale/plugins/phpgw
+phpgw/contrib /usr/share/doc/gosa-plugin-phpgw
diff --git a/gosa-core/debian/gosa-plugin-phpscheduleit-schema.dirs b/gosa-core/debian/gosa-plugin-phpscheduleit-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-phpscheduleit-schema.install b/gosa-core/debian/gosa-plugin-phpscheduleit-schema.install
--- /dev/null
@@ -0,0 +1 @@
+phpscheduleit/contrib/phpscheduleit.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-phpscheduleit.dirs b/gosa-core/debian/gosa-plugin-phpscheduleit.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-phpscheduleit.install b/gosa-core/debian/gosa-plugin-phpscheduleit.install
--- /dev/null
@@ -0,0 +1,4 @@
+phpscheduleit/personal /usr/share/gosa/plugins
+phpscheduleit/help/guide.xml /usr/share/gosa/doc/plugins/phpscheduleit
+phpscheduleit/locale /usr/share/gosa/locale/plugins/phpscheduleit
+phpscheduleit/contrib /usr/share/doc/gosa-plugin-phpscheduleit
diff --git a/gosa-core/debian/gosa-plugin-pptp-schema.dirs b/gosa-core/debian/gosa-plugin-pptp-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-pptp-schema.install b/gosa-core/debian/gosa-plugin-pptp-schema.install
--- /dev/null
@@ -0,0 +1 @@
+pptp/contrib/pptp.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-pptp.dirs b/gosa-core/debian/gosa-plugin-pptp.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-pptp.install b/gosa-core/debian/gosa-plugin-pptp.install
--- /dev/null
@@ -0,0 +1,4 @@
+pptp/personal /usr/share/gosa/plugins
+pptp/help/guide.xml /usr/share/gosa/doc/plugins/pptp
+pptp/locale /usr/share/gosa/locale/plugins/pptp
+pptp/contrib /usr/share/doc/gosa-plugin-pptp
diff --git a/gosa-core/debian/gosa-plugin-pureftpd-schema.dirs b/gosa-core/debian/gosa-plugin-pureftpd-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-pureftpd-schema.install b/gosa-core/debian/gosa-plugin-pureftpd-schema.install
--- /dev/null
@@ -0,0 +1 @@
+pureftpd/contrib/pureftpd.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-pureftpd.dirs b/gosa-core/debian/gosa-plugin-pureftpd.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-pureftpd.install b/gosa-core/debian/gosa-plugin-pureftpd.install
--- /dev/null
@@ -0,0 +1,4 @@
+pureftpd/personal /usr/share/gosa/plugins
+pureftpd/help/guide.xml /usr/share/gosa/doc/plugins/pureftpd
+pureftpd/locale /usr/share/gosa/locale/plugins/pureftpd
+pureftpd/contrib /usr/share/doc/gosa-plugin-pureftpd
diff --git a/gosa-core/debian/gosa-plugin-rolemanagement.dirs b/gosa-core/debian/gosa-plugin-rolemanagement.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-rolemanagement.install b/gosa-core/debian/gosa-plugin-rolemanagement.install
--- /dev/null
@@ -0,0 +1,3 @@
+rolemanagement/admin /usr/share/gosa/plugins
+rolemanagement/locale /usr/share/gosa/locale/plugins/rolemanagement
+rolemanagement/html/images /usr/share/gosa/html/plugins/rolemanagement
diff --git a/gosa-core/debian/gosa-plugin-rsyslog.dirs b/gosa-core/debian/gosa-plugin-rsyslog.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-rsyslog.install b/gosa-core/debian/gosa-plugin-rsyslog.install
--- /dev/null
@@ -0,0 +1,5 @@
+rsyslog/admin /usr/share/gosa/plugins
+rsyslog/addons /usr/share/gosa/plugins
+rsyslog/locale /usr/share/gosa/locale/plugins/rsyslog
+rsyslog/contrib /usr/share/doc/gosa-plugin-rsyslog
+rsyslog/html/images /usr/share/gosa/html/plugins/rsyslog
diff --git a/gosa-core/debian/gosa-plugin-samba.dirs b/gosa-core/debian/gosa-plugin-samba.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-samba.install b/gosa-core/debian/gosa-plugin-samba.install
--- /dev/null
@@ -0,0 +1,6 @@
+samba/admin /usr/share/gosa/plugins
+samba/personal /usr/share/gosa/plugins
+samba/help/guide.xml /usr/share/gosa/doc/plugins/samba
+samba/locale /usr/share/gosa/locale/plugins/samba
+samba/contrib /usr/share/doc/gosa-plugin-samba
+samba/html/images /usr/share/gosa/html/plugins/samba
diff --git a/gosa-core/debian/gosa-plugin-scalix.dirs b/gosa-core/debian/gosa-plugin-scalix.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-scalix.install b/gosa-core/debian/gosa-plugin-scalix.install
--- /dev/null
@@ -0,0 +1,5 @@
+scalix/admin /usr/share/gosa/plugins
+scalix/personal /usr/share/gosa/plugins
+scalix/help/guide.xml /usr/share/gosa/doc/plugins/scalix
+scalix/locale /usr/share/gosa/locale/plugins/scalix
+scalix/html/images /usr/share/gosa/html/plugins/scalix
diff --git a/gosa-core/debian/gosa-plugin-squid.dirs b/gosa-core/debian/gosa-plugin-squid.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-squid.install b/gosa-core/debian/gosa-plugin-squid.install
--- /dev/null
@@ -0,0 +1,4 @@
+squid/personal /usr/share/gosa/plugins
+squid/help/guide.xml /usr/share/gosa/doc/plugins/squid
+squid/locale /usr/share/gosa/locale/plugins/squid
+squid/contrib /usr/share/doc/gosa-plugin-squid
diff --git a/gosa-core/debian/gosa-plugin-ssh-schema.dirs b/gosa-core/debian/gosa-plugin-ssh-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-ssh-schema.install b/gosa-core/debian/gosa-plugin-ssh-schema.install
--- /dev/null
@@ -0,0 +1 @@
+ssh/contrib/openssh-lpk.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-ssh.dirs b/gosa-core/debian/gosa-plugin-ssh.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-ssh.install b/gosa-core/debian/gosa-plugin-ssh.install
--- /dev/null
@@ -0,0 +1,4 @@
+ssh/personal /usr/share/gosa/plugins
+ssh/help/guide.xml /usr/share/gosa/doc/plugins/ssh
+ssh/locale /usr/share/gosa/locale/plugins/ssh
+ssh/contrib /usr/share/doc/gosa-plugin-ssh
diff --git a/gosa-core/debian/gosa-plugin-sudo-schema.dirs b/gosa-core/debian/gosa-plugin-sudo-schema.dirs
--- /dev/null
@@ -0,0 +1 @@
+etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-sudo-schema.install b/gosa-core/debian/gosa-plugin-sudo-schema.install
--- /dev/null
@@ -0,0 +1 @@
+sudo/contrib/sudo.schema /etc/ldap/schema/gosa
diff --git a/gosa-core/debian/gosa-plugin-sudo.dirs b/gosa-core/debian/gosa-plugin-sudo.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-sudo.install b/gosa-core/debian/gosa-plugin-sudo.install
--- /dev/null
@@ -0,0 +1,5 @@
+sudo/admin /usr/share/gosa/plugins
+sudo/help/guide.xml /usr/share/gosa/doc/plugins/sudo
+sudo/locale /usr/share/gosa/locale/plugins/sudo
+sudo/contrib /usr/share/doc/gosa-plugin-sudo
+sudo/html/images /usr/share/gosa/html/plugins/sudo
diff --git a/gosa-core/debian/gosa-plugin-systems.dirs b/gosa-core/debian/gosa-plugin-systems.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-systems.install b/gosa-core/debian/gosa-plugin-systems.install
--- /dev/null
@@ -0,0 +1,5 @@
+systems/admin /usr/share/gosa/plugins
+systems/help /usr/share/gosa/doc/plugins/systems
+systems/help/guide.xml /usr/share/gosa/doc/plugins/systems
+systems/locale /usr/share/gosa/locale/plugins/systems
+systems/html/images /usr/share/gosa/html/plugins/systems
diff --git a/gosa-core/debian/gosa-plugin-uw-imap.dirs b/gosa-core/debian/gosa-plugin-uw-imap.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-uw-imap.install b/gosa-core/debian/gosa-plugin-uw-imap.install
--- /dev/null
@@ -0,0 +1,3 @@
+uw-imap/personal /usr/share/gosa/plugins
+uw-imap/locale /usr/share/gosa/locale/plugins/uw-imap
+uw-imap/contrib /usr/share/doc/gosa-plugin-uw-imap
diff --git a/gosa-core/debian/gosa-plugin-webdav.dirs b/gosa-core/debian/gosa-plugin-webdav.dirs
--- /dev/null
@@ -0,0 +1 @@
+usr/share/gosa
diff --git a/gosa-core/debian/gosa-plugin-webdav.install b/gosa-core/debian/gosa-plugin-webdav.install
--- /dev/null
@@ -0,0 +1,3 @@
+webdav/personal /usr/share/gosa/plugins
+webdav/help/guide.xml /usr/share/gosa/doc/plugins/webdav
+webdav/locale /usr/share/gosa/locale/plugins/webdav
index 88a5e6dd86d4ce626cc10513277c39578fa25dfe..52b64a2a3a7e5ba9918298d67e1544aa283139d1 100644 (file)
-contrib/openldap/gosa-samba3.schema /etc/ldap/schema/gosa
-contrib/openldap/rfc2307bis.schema /etc/ldap/schema/gosa
-contrib/openldap/samba3.schema /etc/ldap/schema/gosa
-contrib/openldap/samba.schema /etc/ldap/schema/gosa
-contrib/openldap/trust.schema /etc/ldap/schema/gosa
-contrib/openldap/gofax.schema /etc/ldap/schema/gosa
-contrib/openldap/goto-mime.schema /etc/ldap/schema/gosa
-contrib/openldap/gofon.schema /etc/ldap/schema/gosa
-contrib/openldap/goserver.schema /etc/ldap/schema/gosa
-contrib/openldap/goto.schema /etc/ldap/schema/gosa
-contrib/openldap/gosystem.schema /etc/ldap/schema/gosa
+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
index 3c121149f8a8782b79a519dfd43005d9244fe757..729b65803e53267dc1ab3d3313ddb0a5e94f2503 100644 (file)
-FAQ
-AUTHORS
-README
-README.safemode
+gosa-core/FAQ
+gosa-core/AUTHORS
+gosa-core/README
+gosa-core/README.safemode
index f3bc55e2ce63d8844c00ce80b7a100ae3aff1a61..8a3d75215f084caf7875bbc5ba93132816542a82 100644 (file)
-update-gosa /usr/sbin
-bin/gosa-encrypt-passwords /usr/sbin
-html /usr/share/gosa
-ihtml /usr/share/gosa
-include /usr/share/gosa
-locale /usr/share/gosa
-plugins /usr/share/gosa
-setup /usr/share/gosa
-debian/gosa-apache.conf /etc/gosa
-debian/gosa-lighttpd.conf /etc/gosa
-contrib/shells /etc/gosa
-contrib/encodings /etc/gosa
-contrib/openldap/slapd.conf /usr/share/doc/gosa/slapd.conf-example
-contrib/gosa.conf /usr/share/doc/gosa
+gosa-core/update-gosa /usr/sbin
+gosa-core/bin/gosa-encrypt-passwords /usr/sbin
+gosa-core/html /usr/share/gosa
+gosa-core/ihtml /usr/share/gosa
+gosa-core/include /usr/share/gosa
+gosa-core/locale /usr/share/gosa
+gosa-core/plugins /usr/share/gosa
+gosa-core/setup /usr/share/gosa
+debian/gosa-apache.conf /etc/gosa
+debian/gosa-lighttpd.conf /etc/gosa
+gosa-core/contrib/shells /etc/gosa
+gosa-core/contrib/encodings /etc/gosa
+gosa-core/contrib/openldap/slapd.conf /usr/share/doc/gosa/slapd.conf-example
+gosa-core/contrib/gosa.conf /usr/share/doc/gosa
index 96d11e4319bc910d401e12666bd488cad5dbeb2e..b74fc84e5d7e9ed5fa576dad1f2d3bf4ea27fa79 100644 (file)
gosa: extra-license-file usr/share/gosa/setup/class_setupStep_License.inc
gosa: extra-license-file usr/share/gosa/setup/license.txt
gosa: extra-license-file usr/share/gosa/setup/setup_license.tpl
-gosa: package-contains-empty-directory usr/share/gosa/locale/core/en/LC_MESSAGES/
-gosa: package-contains-empty-directory usr/share/gosa/html/plugins/welcome/
-gosa: package-contains-empty-directory usr/share/gosa/bin/
-gosa: package-contains-empty-directory usr/share/gosa/html/plugins/references/
+gosa: embedded-javascript-library usr/share/gosa/html/include/prototype.js
+gosa: embedded-javascript-library usr/share/gosa/html/include/scriptaculous.js
+gosa: embedded-php-library usr/share/gosa/include/smarty/Smarty.class.php
+
index 742cd4ccbdb40d2ffd31bc843c0b15e03b473d1d..bc837b9033c4bee560afa746aa7b24a0dbd7a0d3 100644 (file)
-contrib/gosa.conf.5
-gosa-encrypt-passwords.1
-update-gosa.1
+gosa-core/contrib/gosa.conf.5
+gosa-core/gosa-encrypt-passwords.1
+gosa-core/update-gosa.1
diff --git a/gosa-core/debian/patches/01_fix_smarty_location.dpatch b/gosa-core/debian/patches/01_fix_smarty_location.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_smarty_location.dpatch by <cajus@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adapt location for debian packaged smarty
-
-@DPATCH@
-diff -urNad gosa-core~/include/php_setup.inc gosa-core/include/php_setup.inc
---- gosa-core~/include/php_setup.inc 2008-12-12 13:31:08.000000000 +0100
-+++ gosa-core/include/php_setup.inc 2009-02-09 17:25:51.000000000 +0100
-@@ -277,7 +277,11 @@
- ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel");
-
- /* Do smarty setup */
--require("smarty/Smarty.class.php");
-+if (file_exists("/usr/share/php/smarty/Smarty.class.php")){
-+ require("/usr/share/php/smarty/Smarty.class.php");
-+} else {
-+ require("/usr/share/php/smarty/libs/Smarty.class.php");
-+}
- $smarty = new Smarty;
- $smarty->template_dir = $BASE_DIR.'/ihtml/';
- $smarty->caching= false;
diff --git a/gosa-core/debian/patches/01_fix_smarty_location.patch b/gosa-core/debian/patches/01_fix_smarty_location.patch
--- /dev/null
@@ -0,0 +1,17 @@
+Author: <cajus@debian.org>
+Description: Adapt location for debian packaged smarty
+--- a/include/php_setup.inc
++++ b/gosa-core/include/php_setup.inc
+@@ -285,7 +285,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/smarty/Smarty.class.php")){
++ require("/usr/share/php/smarty/Smarty.class.php");
++} else {
++ require("/usr/share/php/smarty/libs/Smarty.class.php");
++}
+ $smarty = new Smarty;
+ $smarty->template_dir = $BASE_DIR.'/ihtml/';
+ $smarty->caching= false;
diff --git a/gosa-core/debian/patches/02_fix_template_location.dpatch b/gosa-core/debian/patches/02_fix_template_location.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_template_location.dpatch by <cajus@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix location of configuration template.
-
-@DPATCH@
-diff -uNr gosa-core/include/functions.inc gosa-core/include/functions.new
---- gosa-core/include/functions.inc 2009-12-03 11:23:55.000000000 +0100
-+++ gosa-core/include/functions.new 2009-12-03 11:26:16.000000000 +0100
-@@ -40,7 +40,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 --git a/gosa-core/debian/patches/02_fix_template_location.patch b/gosa-core/debian/patches/02_fix_template_location.patch
--- /dev/null
@@ -0,0 +1,13 @@
+Author: <cajus@debian.org>
+Description: Fix location of configuration template.
+--- a/include/functions.inc
++++ b/gosa-core/include/functions.inc
+@@ -40,7 +40,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 --git a/gosa-core/debian/patches/03_fix_class_mapping.dpatch b/gosa-core/debian/patches/03_fix_class_mapping.dpatch
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_class_mapping.dpatch by <cajus@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix location of auto-generated class mapping file
-
-@DPATCH@
-diff -urNad gosa-2.6.3~/include/class_config.inc gosa-2.6.3/include/class_config.inc
---- gosa-2.6.3~/include/class_config.inc 2008-12-18 15:13:44.000000000 +0100
-+++ gosa-2.6.3/include/class_config.inc 2009-01-15 14:08:54.000000000 +0100
-@@ -76,12 +76,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']);
-
-
-diff -urNad gosa-2.6.3~/include/functions.inc gosa-2.6.3/include/functions.inc
---- gosa-2.6.3~/include/functions.inc 2009-01-15 14:07:35.000000000 +0100
-+++ gosa-2.6.3/include/functions.inc 2009-01-15 14:07:36.000000000 +0100
-@@ -73,7 +73,7 @@
- $svn_revision = '$Revision: 13322 $';
-
- /* 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");
-
-diff -urNad gosa-2.6.3~/update-gosa gosa-2.6.3/update-gosa
---- gosa-2.6.3~/update-gosa 2008-06-10 09:56:22.000000000 +0200
-+++ gosa-2.6.3/update-gosa 2009-01-15 14:07:36.000000000 +0100
-@@ -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)) {
diff --git a/gosa-core/debian/patches/03_fix_class_mapping.patch b/gosa-core/debian/patches/03_fix_class_mapping.patch
--- /dev/null
@@ -0,0 +1,52 @@
+Author: <cajus@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 $';
+
+ /* 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)) {
diff --git a/gosa-core/debian/patches/04_fix_locale_location.dpatch b/gosa-core/debian/patches/04_fix_locale_location.dpatch
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_locale_location.dpatch by <cajus@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixed location of auto-generated locales
-
-@DPATCH@
-diff -urNad gosa-2.6.0+svn11288~/include/php_setup.inc gosa-2.6.0+svn11288/include/php_setup.inc
---- gosa-2.6.0+svn11288~/include/php_setup.inc 2008-06-11 15:55:59.000000000 +0200
-+++ gosa-2.6.0+svn11288/include/php_setup.inc 2008-06-11 15:56:00.000000000 +0200
-@@ -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)
- {
-diff -urNad gosa-2.6.0+svn11288~/update-gosa gosa-2.6.0+svn11288/update-gosa
---- gosa-2.6.0+svn11288~/update-gosa 2008-06-11 15:55:59.000000000 +0200
-+++ gosa-2.6.0+svn11288/update-gosa 2008-06-11 16:02:30.000000000 +0200
-@@ -169,20 +169,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 --git a/gosa-core/debian/patches/04_fix_locale_location.patch b/gosa-core/debian/patches/04_fix_locale_location.patch
--- /dev/null
@@ -0,0 +1,41 @@
+Author: <cajus@debian.org>
+Description: Fixed location of auto-generated locales
+--- a/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
++++ b/gosa-core/update-gosa
+@@ -169,20 +169,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 --git a/gosa-core/debian/patches/04_fix_online_help_location.dpatch b/gosa-core/debian/patches/04_fix_online_help_location.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_online_help_location.dpatch by <cajus@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix location of auto-generated online help.
-
-@DPATCH@
-diff -urNad gosa-core~/html/helpviewer.php gosa-core/html/helpviewer.php
---- gosa-core~/html/helpviewer.php 2008-04-12 19:58:14.000000000 +0200
-+++ gosa-core/html/helpviewer.php 2008-04-14 17:25:10.000000000 +0200
-@@ -110,7 +110,7 @@
- if(session::is_set('current_class_for_help')){
-
- /* Create new XML parser with the path to the Xml file */
-- $xml = new parseXml("../doc/guide.xml");
-+ $xml = new parseXml("/etc/gosa/guide.xml");
-
- /* Generate help array */
- $str = $xml->parse();
-diff -urNad gosa-core~/update-gosa gosa-core/update-gosa
---- gosa-core~/update-gosa 2008-04-14 14:59:22.000000000 +0200
-+++ gosa-core/update-gosa 2008-04-14 17:24:53.000000000 +0200
-@@ -193,7 +193,7 @@
-
- function rescan_guide()
- {
-- $master_guide= "doc/guide.xml";
-+ $master_guide= "/etc/gosa/guide.xml";
- echo "Updating Online Help Index...\n";
- $master_guide_content="<?xml version=\"1.0\"?>\n".
- "<!--\n".
diff --git a/gosa-core/debian/patches/05_fix_online_help_location.patch b/gosa-core/debian/patches/05_fix_online_help_location.patch
--- /dev/null
@@ -0,0 +1,24 @@
+Author: <cajus@debian.org>
+Description: Fix location of auto-generated online help.
+--- a/html/helpviewer.php
++++ b/gosa-core/html/helpviewer.php
+@@ -104,7 +104,7 @@
+ if(session::global_is_set('current_class_for_help')){
+
+ /* Create new XML parser with the path to the Xml file */
+- $xml = new parseXml("../doc/guide.xml");
++ $xml = new parseXml("/etc/gosa/guide.xml");
+
+ /* Generate help array */
+ $str = $xml->parse();
+--- a/update-gosa
++++ b/gosa-core/update-gosa
+@@ -195,7 +195,7 @@
+
+ function rescan_guide()
+ {
+- $master_guide= "doc/guide.xml";
++ $master_guide= "/etc/gosa/guide.xml";
+ echo "Updating Online Help Index...\n";
+ $master_guide_content="<?xml version=\"1.0\"?>\n".
+ "<!--\n".
diff --git a/gosa-core/debian/patches/series b/gosa-core/debian/patches/series
--- /dev/null
@@ -0,0 +1,6 @@
+01_fix_smarty_location.patch
+02_fix_template_location.patch
+03_fix_class_mapping.patch
+04_fix_locale_location.patch
+05_fix_online_help_location.patch
+debian-changes-2.6.10-1
diff --git a/gosa-core/debian/rules b/gosa-core/debian/rules
index cc4af94a7eac61149475206a80cbf1f2ff1f6f10..abde6ef2247c11c22ac217ed285e5a54929f335c 100755 (executable)
--- a/gosa-core/debian/rules
+++ b/gosa-core/debian/rules
#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules file to build GOsa packages.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-build: patch build-indep
- #*************************************************
- #* Building GOsa into a Debian/GNU Linux Package *
- #* please stand by *
- #*************************************************
-
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
- touch $@
-
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-indep-stamp configure-stamp
-
- dh_clean
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-install: install-indep
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- dh_install -i --exclude COPYING
-
-binary-common:
- dh_testdir
- dh_testroot
- install -D -m 644 debian/gosa.lintian-overrides debian/gosa/usr/share/lintian/overrides/gosa
- dh_installchangelogs Changelog
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installdebconf
- dh_installman
- rm -rf debian/gosa/usr/share/gosa/include/smarty
- dh_strip
- dh_desktop
- dh_compress
- # This is an ugly workaround to preserve gosa.conf from beeing compressed. Excluding it
- # above does not work, because the manual page will match the expression, too.
- gzip -d debian/gosa/usr/share/doc/gosa/gosa.conf.gz
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary: binary-indep
-
-binary-arch:
-.PHONY: build clean binary-indep binary install install-indep configure
diff --git a/gosa-core/debian/smarty-acl-render.install b/gosa-core/debian/smarty-acl-render.install
index 3132482d70dbc148c85149b71590c1b8c7690274..7a6650a18159881dae1a08f012c8526148c360ca 100644 (file)
-include/smarty/plugins/block.render.php /usr/share/php/smarty/libs/plugins
-include/smarty/plugins/function.msgPool.php /usr/share/php/smarty/libs/plugins
+gosa-core/include/smarty/plugins/block.render.php /usr/share/php/smarty/libs/plugins
+gosa-core/include/smarty/plugins/function.msgPool.php /usr/share/php/smarty/libs/plugins