[debian-edu-commits] debian-edu/pkg-team/ 02/07: debian/{control, *.install}: Process with wrap-and-sort.

Mike Gabriel sunweaver at debian.org
Fri Jul 24 10:35:40 UTC 2015


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

sunweaver pushed a commit to branch master
in repository gosa.

commit dd0c9922f7505b6dcfe1a69467be45f002b411cc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 24 12:02:44 2015 +0200

    debian/{control,*.install}: Process with wrap-and-sort.
---
 debian/control                                | 251 +++++++++++++++-----------
 debian/copyright.in                           |   1 -
 debian/gosa-desktop.install                   |   4 +-
 debian/gosa-dev.install                       |   2 +-
 debian/gosa-plugin-addressbook.install        |   2 +-
 debian/gosa-plugin-connectivity.install       |   4 +-
 debian/gosa-plugin-dhcp-schema.install        |   2 +-
 debian/gosa-plugin-dhcp.install               |   2 +-
 debian/gosa-plugin-dns-schema.install         |   2 +-
 debian/gosa-plugin-dns.install                |   2 +-
 debian/gosa-plugin-fai-schema.install         |   2 +-
 debian/gosa-plugin-fai.install                |   2 +-
 debian/gosa-plugin-gofax.install              |   4 +-
 debian/gosa-plugin-gofon.install              |   6 +-
 debian/gosa-plugin-goto.install               |   6 +-
 debian/gosa-plugin-kolab-schema.install       |   4 +-
 debian/gosa-plugin-kolab.install              |   4 +-
 debian/gosa-plugin-ldapmanager.install        |   2 +-
 debian/gosa-plugin-log-schema.install         |   2 +-
 debian/gosa-plugin-log.install                |   2 +-
 debian/gosa-plugin-mail.install               |   8 +-
 debian/gosa-plugin-mit-krb5-schema.install    |   2 +-
 debian/gosa-plugin-mit-krb5.install           |   2 +-
 debian/gosa-plugin-nagios-schema.install      |   2 +-
 debian/gosa-plugin-nagios.install             |   4 +-
 debian/gosa-plugin-netatalk.install           |   4 +-
 debian/gosa-plugin-opengroupware.install      |   2 +-
 debian/gosa-plugin-openxchange-schema.install |   2 +-
 debian/gosa-plugin-openxchange.install        |   4 +-
 debian/gosa-plugin-opsi.install               |   2 +-
 debian/gosa-plugin-phpgw.install              |   4 +-
 debian/gosa-plugin-phpscheduleit.install      |   4 +-
 debian/gosa-plugin-pptp.install               |   4 +-
 debian/gosa-plugin-pureftpd-schema.install    |   2 +-
 debian/gosa-plugin-pureftpd.install           |   4 +-
 debian/gosa-plugin-rolemanagement.install     |   2 +-
 debian/gosa-plugin-rsyslog.install            |   4 +-
 debian/gosa-plugin-samba.install              |   4 +-
 debian/gosa-plugin-scalix.install             |   4 +-
 debian/gosa-plugin-squid.install              |   4 +-
 debian/gosa-plugin-ssh.install                |   4 +-
 debian/gosa-plugin-sudo.install               |   2 +-
 debian/gosa-plugin-systems.install            |   2 +-
 debian/gosa-plugin-uw-imap.install            |   4 +-
 debian/gosa-plugin-webdav.install             |   2 +-
 debian/gosa-schema.install                    |  26 +--
 debian/gosa.install                           |  14 +-
 47 files changed, 236 insertions(+), 192 deletions(-)

diff --git a/debian/control b/debian/control
index bd0dcd0..f9f9e69 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: gosa
 Section: web
 Priority: optional
-Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team at lists.alioth.debian.org> 
+Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team at lists.alioth.debian.org>
 Uploaders:
  Mike Gabriel <sunweaver at debian.org>,
 Build-Depends:
@@ -16,40 +16,40 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/pkg-team/gosa.git;a=
 Package: gosa
 Architecture: all
 Depends:
- php5,
- php5-cli,
  apache2 | lighttpd | httpd,
  exim4 | mail-transport-agent,
+ fonts-liberation,
+ gettext,
+ libapache2-mod-php5 | php5-cgi | php5-fpm,
+ libcrypt-smbhash-perl,
+ libjs-scriptaculous,
+ php5,
+ php5-cli,
+ php5-curl,
  php5-gd,
+ php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat,
  php5-imap,
  php5-ldap,
  php5-mcrypt,
  php5-mysqlnd | php5-mysql,
- php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat,
- libcrypt-smbhash-perl,
  php5-recode,
- smarty3 (>= 3.1.10-1),
  smarty-gettext,
- gettext,
+ smarty3 (>= 3.1.10-1),
  ${misc:Depends},
- libapache2-mod-php5 | php5-cgi | php5-fpm,
- php5-curl,
- fonts-liberation,
- libjs-scriptaculous,
 Recommends:
  ${misc:Recommends},
 Suggests:
- gosa-si-server,
  cyrus21-imapd (>= 2.1.11),
- postfix-ldap,
- slapd,
  gosa-schema,
- php5-suhosin,
+ gosa-si-server,
  php-apc,
  php-fpdf,
+ php5-suhosin,
+ postfix-ldap,
+ slapd,
 Conflicts:
- smarty3-gosa,
  smarty-acl-render,
+ smarty3-gosa,
 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
@@ -61,11 +61,11 @@ Description: Web Based LDAP Administration Program
 Package: gosa-dev
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
- php5-cli,
  latex2html,
  lyx,
+ php5-cli,
+ ${misc:Depends},
 Description: GOsa² development utilities
  This package contains a couple of tools to generate online
  help, extract localizations and howto's for developing Gosa² plugins.
@@ -76,9 +76,9 @@ Description: GOsa² development utilities
 Package: gosa-desktop
 Architecture: all
 Depends:
- ${misc:Depends},
- konqueror | iceweasel | mozilla | firefox,
  debconf,
+ konqueror | iceweasel | mozilla | firefox,
+ ${misc:Depends},
 Description: Desktop integration for GOsa²
  This package includes a Gosa² menu definition for your desktop
  environment.
@@ -90,7 +90,8 @@ Package: gosa-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa
  This package includes the basics LDAP schemas needed by GOsa².
  .
@@ -100,8 +101,8 @@ Description: LDAP schema for GOsa
 Package: gosa-help-en
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
+ ${misc:Depends},
 Description: English online help for GOsa
  This package includes the English online documentation for GOsa²
  .
@@ -111,8 +112,8 @@ Description: English online help for GOsa
 Package: gosa-help-de
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
+ ${misc:Depends},
 Description: German online help for GOsa²
  This package includes the German online documentation for GOsa²
  .
@@ -122,8 +123,8 @@ Description: German online help for GOsa²
 Package: gosa-help-fr
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
+ ${misc:Depends},
 Description: French online help for GOsa²
  This package includes the French online documentation for GOsa²
  .
@@ -133,8 +134,8 @@ Description: French online help for GOsa²
 Package: gosa-help-nl
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
+ ${misc:Depends},
 Description: Dutch online help for GOsa
  This package includes the Dutch online documentation for GOsa²
  .
@@ -144,9 +145,10 @@ Description: Dutch online help for GOsa
 Package: gosa-plugin-connectivity
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: connectivity plugin for GOsa²
  Connectivity base plugin - base for really small plugins.
  .
@@ -156,10 +158,11 @@ Description: connectivity plugin for GOsa²
 Package: gosa-plugin-dhcp
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-systems (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: dhcp plugin for GOsa²
  DHCP service management plugin.
  .
@@ -170,7 +173,8 @@ Package: gosa-plugin-dhcp-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² dhcp plugin
  This package includes the LDAP schema needed by the GOsa²
  dhcp plugin.
@@ -181,10 +185,11 @@ Description: LDAP schema for GOsa² dhcp plugin
 Package: gosa-plugin-dns
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-systems,
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: dns plugin for GOsa²
  DNS service management plugin.
  .
@@ -195,7 +200,8 @@ Package: gosa-plugin-dns-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² dns plugin
  This package includes the LDAP schema needed by the GOsa²
  dns plugin.
@@ -206,10 +212,11 @@ Description: LDAP schema for GOsa² dns plugin
 Package: gosa-plugin-fai
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-goto (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: fai plugin for GOsa²
  FAI plugin for managing Linux system deployment.
  .
@@ -220,7 +227,8 @@ Package: gosa-plugin-fai-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² fai plugin
  This package includes the LDAP schema needed by the GOsa²
  fai plugin.
@@ -231,10 +239,11 @@ Description: LDAP schema for GOsa² fai plugin
 Package: gosa-plugin-gofax
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-systems (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: gofax plugin for GOsa²
  GOfax management with report functionality
  .
@@ -244,10 +253,11 @@ Description: gofax plugin for GOsa²
 Package: gosa-plugin-gofon
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-systems (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: gofon plugin for GOsa²
  GOfon management with report functionality
  .
@@ -257,10 +267,11 @@ Description: gofon plugin for GOsa²
 Package: gosa-plugin-goto
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-systems (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: goto plugin for GOsa²
  GOto desktop management plugin
  .
@@ -270,11 +281,12 @@ Description: goto plugin for GOsa²
 Package: gosa-plugin-kolab
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
  gosa-plugin-mail (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: kolab plugin for GOsa²
  Kolab2 account management plugin
  .
@@ -285,7 +297,8 @@ Package: gosa-plugin-kolab-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² kolab plugin
  This package includes the LDAP schema needed by the GOsa²
  kolab plugin.
@@ -296,9 +309,10 @@ Description: LDAP schema for GOsa² kolab plugin
 Package: gosa-plugin-ldapmanager
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: ldapmanager plugin for GOsa²
  LDAP import and export management plugin
  .
@@ -308,10 +322,11 @@ Description: ldapmanager plugin for GOsa²
 Package: gosa-plugin-mail
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-systems (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: base mail plugin for GOsa²
  Mail management base plugin
  .
@@ -320,12 +335,14 @@ Description: base mail plugin for GOsa²
 
 Package: gosa-plugin-mit-krb5
 Architecture: all
-Conflicts: gosa-plugin-heimdal 
-Breaks: gosa (<<2.7)
+Conflicts:
+ gosa-plugin-heimdal,
+Breaks:
+ gosa (<<2.7),
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-systems (= ${binary:Version}),
+ ${misc:Depends},
 Description: mit-krb5 plugin for GOsa²
  MIT kerberos management plugin
  .
@@ -336,7 +353,8 @@ Package: gosa-plugin-mit-krb5-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² mit-krb5 plugin
  This package includes the LDAP schema needed by the GOsa²
  mit-krb5 plugin.
@@ -347,10 +365,11 @@ Description: LDAP schema for GOsa² mit-krb5 plugin
 Package: gosa-plugin-nagios
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  libswitch-perl | perl (<< 5.10.1-13),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: nagios plugin for GOsa²
  Nagios account settings management
  .
@@ -361,7 +380,8 @@ Package: gosa-plugin-nagios-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² nagios plugin
  This package includes the LDAP schema needed by the GOsa²
  nagios plugin.
@@ -372,11 +392,12 @@ Description: LDAP schema for GOsa² nagios plugin
 Package: gosa-plugin-netatalk
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
- gosa-plugin-systems (= ${binary:Version}),
  gosa-plugin-goto (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ gosa-plugin-systems (= ${binary:Version}),
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: netatalk plugin for GOsa²
  Netatalk account management plugin
  .
@@ -386,11 +407,12 @@ Description: netatalk plugin for GOsa²
 Package: gosa-plugin-opengroupware
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
- gosa-plugin-mail (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ gosa-plugin-mail (= ${binary:Version}),
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: opengroupware plugin for GOsa²
  Opengroupware account management plugin
  .
@@ -400,11 +422,12 @@ Description: opengroupware plugin for GOsa²
 Package: gosa-plugin-openxchange
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
- gosa-plugin-mail (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ gosa-plugin-mail (= ${binary:Version}),
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: openxchange plugin for GOsa²
  Open-Xchange account management plugin
  .
@@ -415,7 +438,8 @@ Package: gosa-plugin-openxchange-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² openxchange plugin
  This package includes the LDAP schema needed by the GOsa²
  openxchange plugin.
@@ -426,11 +450,12 @@ Description: LDAP schema for GOsa² openxchange plugin
 Package: gosa-plugin-opsi
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-fai (= ${binary:Version}),
  gosa-plugin-goto (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: opsi plugin for GOsa²
  opsi plugin for managing windows system and software deployment
  .
@@ -440,11 +465,12 @@ Description: opsi plugin for GOsa²
 Package: gosa-plugin-phpgw
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
- gosa-plugin-mail (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ gosa-plugin-mail (= ${binary:Version}),
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: phpgw plugin for GOsa²
  PHP Groupware connectivity plugin
  .
@@ -455,7 +481,8 @@ Package: gosa-plugin-phpgw-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² phpgw plugin
  This package includes the LDAP schema needed by the GOsa²
  phpgw plugin.
@@ -466,10 +493,11 @@ Description: LDAP schema for GOsa² phpgw plugin
 Package: gosa-plugin-phpscheduleit
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: phpscheduleit plugin for GOsa²
  PHP scheduleit connectivity plugin
  .
@@ -480,7 +508,8 @@ Package: gosa-plugin-phpscheduleit-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² phpscheduleit plugin
  This package includes the LDAP schema needed by the GOsa²
  phpscheduleit plugin.
@@ -491,10 +520,11 @@ Description: LDAP schema for GOsa² phpscheduleit plugin
 Package: gosa-plugin-pptp
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: pptp plugin for GOsa²
  PPTP connectivity plugin
  .
@@ -505,7 +535,8 @@ Package: gosa-plugin-pptp-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² pptp plugin
  This package includes the LDAP schema needed by the GOsa²
  pptp plugin.
@@ -516,10 +547,11 @@ Description: LDAP schema for GOsa² pptp plugin
 Package: gosa-plugin-pureftpd
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: pureftpd plugin for GOsa²
  PureFTPD connectivity plugin.
  .
@@ -530,7 +562,8 @@ Package: gosa-plugin-pureftpd-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² pureftpd plugin
  This package includes the LDAP schema needed by the GOsa²
  pureftpd plugin.
@@ -541,9 +574,10 @@ Description: LDAP schema for GOsa² pureftpd plugin
 Package: gosa-plugin-rolemanagement
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: rolemanagement plugin for GOsa²
  Role Management plugin.
  .
@@ -553,10 +587,11 @@ Description: rolemanagement plugin for GOsa²
 Package: gosa-plugin-rsyslog
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-systems (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: rsyslog plugin for GOsa²
  Syslog and GOsa logging plugin.
  .
@@ -566,9 +601,10 @@ Description: rsyslog plugin for GOsa²
 Package: gosa-plugin-samba
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: samba3 plugin for GOsa²
  Plugin for Samba 3 management.
  .
@@ -578,9 +614,10 @@ Description: samba3 plugin for GOsa²
 Package: gosa-plugin-scalix
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: scalix plugin for GOsa²
  Scalix account management plugin.
  .
@@ -590,10 +627,11 @@ Description: scalix plugin for GOsa²
 Package: gosa-plugin-squid
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: squid plugin for GOsa²
  Squid connectivity plugin.
  .
@@ -603,9 +641,10 @@ Description: squid plugin for GOsa²
 Package: gosa-plugin-ssh
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: ssh plugin for GOsa²
  SSH key management plugin.
  .
@@ -616,7 +655,8 @@ Package: gosa-plugin-ssh-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² ssh plugin
  This package includes the LDAP schema needed by the GOsa²
  ssh plugin.
@@ -627,9 +667,10 @@ Description: LDAP schema for GOsa² ssh plugin
 Package: gosa-plugin-sudo
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: sudo plugin for GOsa²
  Sudo management plugin.
  .
@@ -640,7 +681,8 @@ Package: gosa-plugin-sudo-schema
 Architecture: all
 Depends:
  ${misc:Depends},
-Recommends: slapd
+Recommends:
+ slapd,
 Description: LDAP schema for GOsa² sudo plugin
  This package includes the LDAP schema needed by the GOsa
  sudo plugin.
@@ -651,9 +693,10 @@ Description: LDAP schema for GOsa² sudo plugin
 Package: gosa-plugin-systems
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: systems plugin for GOsa²
  Systems management base plugin.
  .
@@ -663,10 +706,11 @@ Description: systems plugin for GOsa²
 Package: gosa-plugin-uw-imap
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-mail (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: uw-imap plugin for GOsa²
  UW imap mail method.
  .
@@ -676,10 +720,11 @@ Description: uw-imap plugin for GOsa²
 Package: gosa-plugin-webdav
 Architecture: all
 Depends:
- ${misc:Depends},
  gosa (= ${binary:Version}),
  gosa-plugin-connectivity (= ${binary:Version}),
-Breaks: gosa (<<2.7)
+ ${misc:Depends},
+Breaks:
+ gosa (<<2.7),
 Description: webdav plugin for GOsa²
  WebDAV connectivity plugin.
  .
diff --git a/debian/copyright.in b/debian/copyright.in
index 229a7a9..d0818f4 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -696,4 +696,3 @@ Copyright: 2001, Dan Ellis
   2001, Dan Ellis <danellis at rushmore.com>
 License: UNKNOWN
  FIXME
-
diff --git a/debian/gosa-desktop.install b/debian/gosa-desktop.install
index 45d2daa..b63daf5 100644
--- a/debian/gosa-desktop.install
+++ b/debian/gosa-desktop.install
@@ -1,4 +1,4 @@
-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
+debian/gosa.xpm			/usr/share/pixmaps
+gosa-core/contrib/gosa		/usr/bin
diff --git a/debian/gosa-dev.install b/debian/gosa-dev.install
index 47693d6..09f5aaf 100644
--- a/debian/gosa-dev.install
+++ b/debian/gosa-dev.install
@@ -1,3 +1,3 @@
+gosa-core/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
diff --git a/debian/gosa-plugin-addressbook.install b/debian/gosa-plugin-addressbook.install
index 599163f..ade6f74 100644
--- a/debian/gosa-plugin-addressbook.install
+++ b/debian/gosa-plugin-addressbook.install
@@ -1,4 +1,4 @@
 addressbook/addons			/usr/share/gosa/plugins
-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
+addressbook/locale			/usr/share/gosa/locale/plugins/addressbook
diff --git a/debian/gosa-plugin-connectivity.install b/debian/gosa-plugin-connectivity.install
index e0aa68a..6211271 100644
--- a/debian/gosa-plugin-connectivity.install
+++ b/debian/gosa-plugin-connectivity.install
@@ -1,3 +1,3 @@
-connectivity/personal			/usr/share/gosa/plugins
-connectivity/locale			/usr/share/gosa/locale/plugins/connectivity
 connectivity/html/images		/usr/share/gosa/html/plugins/connectivity
+connectivity/locale			/usr/share/gosa/locale/plugins/connectivity
+connectivity/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-dhcp-schema.install b/debian/gosa-plugin-dhcp-schema.install
index ad8752d..e1607b8 100644
--- a/debian/gosa-plugin-dhcp-schema.install
+++ b/debian/gosa-plugin-dhcp-schema.install
@@ -1,2 +1,2 @@
-dhcp/contrib/dhcp.schema /etc/ldap/schema/gosa
 dhcp/contrib/dhcp.ldif /etc/ldap/schema/gosa
+dhcp/contrib/dhcp.schema /etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-dhcp.install b/debian/gosa-plugin-dhcp.install
index 57965fc..93ab8c7 100644
--- a/debian/gosa-plugin-dhcp.install
+++ b/debian/gosa-plugin-dhcp.install
@@ -1,3 +1,3 @@
 dhcp/admin			/usr/share/gosa/plugins
-dhcp/locale			/usr/share/gosa/locale/plugins/dhcp
 dhcp/contrib			/usr/share/doc/gosa-plugin-dhcp
+dhcp/locale			/usr/share/gosa/locale/plugins/dhcp
diff --git a/debian/gosa-plugin-dns-schema.install b/debian/gosa-plugin-dns-schema.install
index fa3d401..bd39b8f 100644
--- a/debian/gosa-plugin-dns-schema.install
+++ b/debian/gosa-plugin-dns-schema.install
@@ -1,2 +1,2 @@
-dns/contrib/dnszone.schema /etc/ldap/schema/gosa
 dns/contrib/dnszone.ldif /etc/ldap/schema/gosa
+dns/contrib/dnszone.schema /etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-dns.install b/debian/gosa-plugin-dns.install
index 775edd9..bc19956 100644
--- a/debian/gosa-plugin-dns.install
+++ b/debian/gosa-plugin-dns.install
@@ -1,3 +1,3 @@
 dns/admin			/usr/share/gosa/plugins
-dns/locale			/usr/share/gosa/locale/plugins/dns
 dns/contrib			/usr/share/doc/gosa-plugin-dns
+dns/locale			/usr/share/gosa/locale/plugins/dns
diff --git a/debian/gosa-plugin-fai-schema.install b/debian/gosa-plugin-fai-schema.install
index 4b46f9d..79b01f2 100644
--- a/debian/gosa-plugin-fai-schema.install
+++ b/debian/gosa-plugin-fai-schema.install
@@ -1,2 +1,2 @@
-fai/contrib/fai.schema /etc/ldap/schema/gosa
 fai/contrib/fai.ldif /etc/ldap/schema/gosa
+fai/contrib/fai.schema /etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-fai.install b/debian/gosa-plugin-fai.install
index fc649b6..c9b2dab 100644
--- a/debian/gosa-plugin-fai.install
+++ b/debian/gosa-plugin-fai.install
@@ -1,4 +1,4 @@
 fai/admin			/usr/share/gosa/plugins
-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
+fai/locale			/usr/share/gosa/locale/plugins/fai
diff --git a/debian/gosa-plugin-gofax.install b/debian/gosa-plugin-gofax.install
index 7018dda..d3e5bd8 100644
--- a/debian/gosa-plugin-gofax.install
+++ b/debian/gosa-plugin-gofax.install
@@ -1,6 +1,6 @@
 gofax/admin			/usr/share/gosa/plugins
-gofax/gofax			/usr/share/gosa/plugins
-gofax/locale			/usr/share/gosa/locale/plugins/gofax
 gofax/contrib			/usr/share/doc/gosa-plugin-gofax
+gofax/gofax			/usr/share/gosa/plugins
 gofax/html/getfax.php		/usr/share/gosa/html/plugins/gofax
 gofax/html/images		/usr/share/gosa/html/plugins/gofax
+gofax/locale			/usr/share/gosa/locale/plugins/gofax
diff --git a/debian/gosa-plugin-gofon.install b/debian/gosa-plugin-gofon.install
index 407b177..139d3ba 100644
--- a/debian/gosa-plugin-gofon.install
+++ b/debian/gosa-plugin-gofon.install
@@ -1,6 +1,6 @@
 gofon/admin		/usr/share/gosa/plugins
-gofon/gofon		/usr/share/gosa/plugins
-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/asterisk	/etc/gosa
+gofon/gofon		/usr/share/gosa/plugins
+gofon/html/images	/usr/share/gosa/html/plugins/gofon
+gofon/locale		/usr/share/gosa/locale/plugins/gofon
diff --git a/debian/gosa-plugin-goto.install b/debian/gosa-plugin-goto.install
index 52f28ed..453868b 100644
--- a/debian/gosa-plugin-goto.install
+++ b/debian/gosa-plugin-goto.install
@@ -1,6 +1,6 @@
-goto/admin			/usr/share/gosa/plugins
-goto/personal			/usr/share/gosa/plugins
 goto/addons			/usr/share/gosa/plugins
-goto/locale			/usr/share/gosa/locale/plugins/goto
+goto/admin			/usr/share/gosa/plugins
 goto/contrib			/usr/share/doc/gosa-plugin-goto
 goto/html/images		/usr/share/gosa/html/plugins/goto
+goto/locale			/usr/share/gosa/locale/plugins/goto
+goto/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-kolab-schema.install b/debian/gosa-plugin-kolab-schema.install
index d9ed35d..eafd46c 100644
--- a/debian/gosa-plugin-kolab-schema.install
+++ b/debian/gosa-plugin-kolab-schema.install
@@ -1,4 +1,4 @@
-kolab/contrib/kolab2.schema	/etc/ldap/schema/gosa
-kolab/contrib/rfc2739.schema	/etc/ldap/schema/gosa
 kolab/contrib/kolab2.ldif	/etc/ldap/schema/gosa
+kolab/contrib/kolab2.schema	/etc/ldap/schema/gosa
 kolab/contrib/rfc2739.ldif	/etc/ldap/schema/gosa
+kolab/contrib/rfc2739.schema	/etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-kolab.install b/debian/gosa-plugin-kolab.install
index 739552d..bf5fe9e 100644
--- a/debian/gosa-plugin-kolab.install
+++ b/debian/gosa-plugin-kolab.install
@@ -1,4 +1,4 @@
 kolab/admin			/usr/share/gosa/plugins
-kolab/personal			/usr/share/gosa/plugins
-kolab/locale			/usr/share/gosa/locale/plugins/kolab
 kolab/contrib			/usr/share/doc/gosa-plugin-kolab
+kolab/locale			/usr/share/gosa/locale/plugins/kolab
+kolab/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-ldapmanager.install b/debian/gosa-plugin-ldapmanager.install
index 6fab599..0827653 100644
--- a/debian/gosa-plugin-ldapmanager.install
+++ b/debian/gosa-plugin-ldapmanager.install
@@ -1,4 +1,4 @@
 ldapmanager/addons		/usr/share/gosa/plugins
-ldapmanager/locale		/usr/share/gosa/locale/plugins/ldapmanager
 ldapmanager/html/getxls.php	/usr/share/gosa/html/plugins/ldapmanager
 ldapmanager/html/images		/usr/share/gosa/html/plugins/ldapmanager
+ldapmanager/locale		/usr/share/gosa/locale/plugins/ldapmanager
diff --git a/debian/gosa-plugin-log-schema.install b/debian/gosa-plugin-log-schema.install
index efe8e8a..48ad47a 100644
--- a/debian/gosa-plugin-log-schema.install
+++ b/debian/gosa-plugin-log-schema.install
@@ -1,2 +1,2 @@
-log/contrib/goconfig.schema	/etc/ldap/schema/gosa
 log/contrib/goconfig.ldif	/etc/ldap/schema/gosa
+log/contrib/goconfig.schema	/etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-log.install b/debian/gosa-plugin-log.install
index ef35de8..6250167 100644
--- a/debian/gosa-plugin-log.install
+++ b/debian/gosa-plugin-log.install
@@ -1,4 +1,4 @@
 log/admin			/usr/share/gosa/plugins
-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
+log/locale			/usr/share/gosa/locale/plugins/log
diff --git a/debian/gosa-plugin-mail.install b/debian/gosa-plugin-mail.install
index c0c9366..c826176 100644
--- a/debian/gosa-plugin-mail.install
+++ b/debian/gosa-plugin-mail.install
@@ -1,7 +1,7 @@
-mail/admin			/usr/share/gosa/plugins
-mail/personal			/usr/share/gosa/plugins
 mail/addons			/usr/share/gosa/plugins
-mail/locale			/usr/share/gosa/locale/plugins/mail
+mail/admin			/usr/share/gosa/plugins
 mail/contrib			/usr/share/doc/gosa-plugin-mail
-mail/html/images		/usr/share/gosa/html/plugins/mail
 mail/etc/*			/etc/gosa
+mail/html/images		/usr/share/gosa/html/plugins/mail
+mail/locale			/usr/share/gosa/locale/plugins/mail
+mail/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-mit-krb5-schema.install b/debian/gosa-plugin-mit-krb5-schema.install
index 7df5184..171c464 100644
--- a/debian/gosa-plugin-mit-krb5-schema.install
+++ b/debian/gosa-plugin-mit-krb5-schema.install
@@ -1,2 +1,2 @@
-mit-krb5/contrib/hdb.schema	/etc/ldap/schema/gosa
 mit-krb5/contrib/hdb.ldif	/etc/ldap/schema/gosa
+mit-krb5/contrib/hdb.schema	/etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-mit-krb5.install b/debian/gosa-plugin-mit-krb5.install
index 237357a..63e5a3e 100644
--- a/debian/gosa-plugin-mit-krb5.install
+++ b/debian/gosa-plugin-mit-krb5.install
@@ -1,3 +1,3 @@
 mit-krb5/admin			/usr/share/gosa/plugins
-mit-krb5/locale			/usr/share/gosa/locale/plugins/mit-krb5
 mit-krb5/contrib		/usr/share/doc/gosa-plugin-mit-krb5
+mit-krb5/locale			/usr/share/gosa/locale/plugins/mit-krb5
diff --git a/debian/gosa-plugin-nagios-schema.install b/debian/gosa-plugin-nagios-schema.install
index 8602bca..c46ecec 100644
--- a/debian/gosa-plugin-nagios-schema.install
+++ b/debian/gosa-plugin-nagios-schema.install
@@ -1,2 +1,2 @@
-nagios/contrib/nagios.schema	/etc/ldap/schema/gosa
 nagios/contrib/nagios.ldif	/etc/ldap/schema/gosa
+nagios/contrib/nagios.schema	/etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-nagios.install b/debian/gosa-plugin-nagios.install
index 7386745..e2b4f3b 100644
--- a/debian/gosa-plugin-nagios.install
+++ b/debian/gosa-plugin-nagios.install
@@ -1,4 +1,4 @@
-nagios/personal			/usr/share/gosa/plugins
-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
+nagios/locale			/usr/share/gosa/locale/plugins/nagios
+nagios/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-netatalk.install b/debian/gosa-plugin-netatalk.install
index a2f7149..0a6491c 100644
--- a/debian/gosa-plugin-netatalk.install
+++ b/debian/gosa-plugin-netatalk.install
@@ -1,4 +1,4 @@
-netatalk/personal		/usr/share/gosa/plugins
-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
+netatalk/locale			/usr/share/gosa/locale/plugins/netatalk
+netatalk/personal		/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-opengroupware.install b/debian/gosa-plugin-opengroupware.install
index 096dcfa..d8ce504 100644
--- a/debian/gosa-plugin-opengroupware.install
+++ b/debian/gosa-plugin-opengroupware.install
@@ -1,2 +1,2 @@
-opengroupware/personal			/usr/share/gosa/plugins
 opengroupware/locale			/usr/share/gosa/locale/plugins/opengroupware
+opengroupware/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-openxchange-schema.install b/debian/gosa-plugin-openxchange-schema.install
index c362372..99f2fc4 100644
--- a/debian/gosa-plugin-openxchange-schema.install
+++ b/debian/gosa-plugin-openxchange-schema.install
@@ -1,2 +1,2 @@
-openxchange/contrib/openxchange.schema	/etc/ldap/schema/gosa
 openxchange/contrib/openxchange.ldif	/etc/ldap/schema/gosa
+openxchange/contrib/openxchange.schema	/etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-openxchange.install b/debian/gosa-plugin-openxchange.install
index fad1f03..f50a036 100644
--- a/debian/gosa-plugin-openxchange.install
+++ b/debian/gosa-plugin-openxchange.install
@@ -1,3 +1,3 @@
-openxchange/personal		/usr/share/gosa/plugins
-openxchange/locale		/usr/share/gosa/locale/plugins/openxchange
 openxchange/contrib		/usr/share/doc/gosa-plugin-openxchange
+openxchange/locale		/usr/share/gosa/locale/plugins/openxchange
+openxchange/personal		/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-opsi.install b/debian/gosa-plugin-opsi.install
index 64a3def..eaeb36c 100644
--- a/debian/gosa-plugin-opsi.install
+++ b/debian/gosa-plugin-opsi.install
@@ -1,3 +1,3 @@
 opsi/admin			/usr/share/gosa/plugins
-opsi/locale			/usr/share/gosa/locale/plugins/opsi
 opsi/html/images		/usr/share/gosa/html/plugins/opsi
+opsi/locale			/usr/share/gosa/locale/plugins/opsi
diff --git a/debian/gosa-plugin-phpgw.install b/debian/gosa-plugin-phpgw.install
index 51acbdd..d0c38ef 100644
--- a/debian/gosa-plugin-phpgw.install
+++ b/debian/gosa-plugin-phpgw.install
@@ -1,3 +1,3 @@
-phpgw/personal			/usr/share/gosa/plugins
-phpgw/locale			/usr/share/gosa/locale/plugins/phpgw
 phpgw/contrib			/usr/share/doc/gosa-plugin-phpgw
+phpgw/locale			/usr/share/gosa/locale/plugins/phpgw
+phpgw/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-phpscheduleit.install b/debian/gosa-plugin-phpscheduleit.install
index dc87708..0d1c16d 100644
--- a/debian/gosa-plugin-phpscheduleit.install
+++ b/debian/gosa-plugin-phpscheduleit.install
@@ -1,3 +1,3 @@
-phpscheduleit/personal			/usr/share/gosa/plugins
-phpscheduleit/locale			/usr/share/gosa/locale/plugins/phpscheduleit
 phpscheduleit/contrib			/usr/share/doc/gosa-plugin-phpscheduleit
+phpscheduleit/locale			/usr/share/gosa/locale/plugins/phpscheduleit
+phpscheduleit/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-pptp.install b/debian/gosa-plugin-pptp.install
index 7136fd2..bab7b9a 100644
--- a/debian/gosa-plugin-pptp.install
+++ b/debian/gosa-plugin-pptp.install
@@ -1,3 +1,3 @@
-pptp/personal		/usr/share/gosa/plugins
-pptp/locale		/usr/share/gosa/locale/plugins/pptp
 pptp/contrib		/usr/share/doc/gosa-plugin-pptp
+pptp/locale		/usr/share/gosa/locale/plugins/pptp
+pptp/personal		/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-pureftpd-schema.install b/debian/gosa-plugin-pureftpd-schema.install
index f58ff9c..8771336 100644
--- a/debian/gosa-plugin-pureftpd-schema.install
+++ b/debian/gosa-plugin-pureftpd-schema.install
@@ -1,2 +1,2 @@
-pureftpd/contrib/pureftpd.schema	/etc/ldap/schema/gosa
 pureftpd/contrib/pureftpd.ldif	/etc/ldap/schema/gosa
+pureftpd/contrib/pureftpd.schema	/etc/ldap/schema/gosa
diff --git a/debian/gosa-plugin-pureftpd.install b/debian/gosa-plugin-pureftpd.install
index 6ea79fc..c3b7c2a 100644
--- a/debian/gosa-plugin-pureftpd.install
+++ b/debian/gosa-plugin-pureftpd.install
@@ -1,3 +1,3 @@
-pureftpd/personal		/usr/share/gosa/plugins
-pureftpd/locale			/usr/share/gosa/locale/plugins/pureftpd
 pureftpd/contrib		/usr/share/doc/gosa-plugin-pureftpd
+pureftpd/locale			/usr/share/gosa/locale/plugins/pureftpd
+pureftpd/personal		/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-rolemanagement.install b/debian/gosa-plugin-rolemanagement.install
index 1adefb0..604d968 100644
--- a/debian/gosa-plugin-rolemanagement.install
+++ b/debian/gosa-plugin-rolemanagement.install
@@ -1,3 +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
+rolemanagement/locale		/usr/share/gosa/locale/plugins/rolemanagement
diff --git a/debian/gosa-plugin-rsyslog.install b/debian/gosa-plugin-rsyslog.install
index 0be83c8..01c661f 100644
--- a/debian/gosa-plugin-rsyslog.install
+++ b/debian/gosa-plugin-rsyslog.install
@@ -1,4 +1,4 @@
-rsyslog/admin		/usr/share/gosa/plugins
 rsyslog/addons		/usr/share/gosa/plugins
-rsyslog/locale		/usr/share/gosa/locale/plugins/rsyslog
+rsyslog/admin		/usr/share/gosa/plugins
 rsyslog/html/images	/usr/share/gosa/html/plugins/rsyslog
+rsyslog/locale		/usr/share/gosa/locale/plugins/rsyslog
diff --git a/debian/gosa-plugin-samba.install b/debian/gosa-plugin-samba.install
index cf2de76..4183e26 100644
--- a/debian/gosa-plugin-samba.install
+++ b/debian/gosa-plugin-samba.install
@@ -1,5 +1,5 @@
 samba/admin			/usr/share/gosa/plugins
-samba/personal			/usr/share/gosa/plugins
-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
+samba/locale			/usr/share/gosa/locale/plugins/samba
+samba/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-scalix.install b/debian/gosa-plugin-scalix.install
index b3e357b..b48fd4d 100644
--- a/debian/gosa-plugin-scalix.install
+++ b/debian/gosa-plugin-scalix.install
@@ -1,4 +1,4 @@
 scalix/admin			/usr/share/gosa/plugins
-scalix/personal			/usr/share/gosa/plugins
-scalix/locale			/usr/share/gosa/locale/plugins/scalix
 scalix/html/images		/usr/share/gosa/html/plugins/scalix
+scalix/locale			/usr/share/gosa/locale/plugins/scalix
+scalix/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-squid.install b/debian/gosa-plugin-squid.install
index efbf231..444ea98 100644
--- a/debian/gosa-plugin-squid.install
+++ b/debian/gosa-plugin-squid.install
@@ -1,3 +1,3 @@
-squid/personal		/usr/share/gosa/plugins
-squid/locale		/usr/share/gosa/locale/plugins/squid
 squid/contrib		/usr/share/doc/gosa-plugin-squid
+squid/locale		/usr/share/gosa/locale/plugins/squid
+squid/personal		/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-ssh.install b/debian/gosa-plugin-ssh.install
index b5a9ad1..e89e6b5 100644
--- a/debian/gosa-plugin-ssh.install
+++ b/debian/gosa-plugin-ssh.install
@@ -1,3 +1,3 @@
-ssh/personal		/usr/share/gosa/plugins
-ssh/locale		/usr/share/gosa/locale/plugins/ssh
 ssh/contrib		/usr/share/doc/gosa-plugin-ssh
+ssh/locale		/usr/share/gosa/locale/plugins/ssh
+ssh/personal		/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-sudo.install b/debian/gosa-plugin-sudo.install
index fe90fbf..e9458bb 100644
--- a/debian/gosa-plugin-sudo.install
+++ b/debian/gosa-plugin-sudo.install
@@ -1,4 +1,4 @@
 sudo/admin			/usr/share/gosa/plugins
-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
+sudo/locale			/usr/share/gosa/locale/plugins/sudo
diff --git a/debian/gosa-plugin-systems.install b/debian/gosa-plugin-systems.install
index 5826182..706647d 100644
--- a/debian/gosa-plugin-systems.install
+++ b/debian/gosa-plugin-systems.install
@@ -1,3 +1,3 @@
 systems/admin		/usr/share/gosa/plugins
-systems/locale		/usr/share/gosa/locale/plugins/systems
 systems/html/images	/usr/share/gosa/html/plugins/systems
+systems/locale		/usr/share/gosa/locale/plugins/systems
diff --git a/debian/gosa-plugin-uw-imap.install b/debian/gosa-plugin-uw-imap.install
index 7089413..28d15fd 100644
--- a/debian/gosa-plugin-uw-imap.install
+++ b/debian/gosa-plugin-uw-imap.install
@@ -1,3 +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
+uw-imap/locale		/usr/share/gosa/locale/plugins/uw-imap
+uw-imap/personal	/usr/share/gosa/plugins
diff --git a/debian/gosa-plugin-webdav.install b/debian/gosa-plugin-webdav.install
index 1871d0f..e0fca5d 100644
--- a/debian/gosa-plugin-webdav.install
+++ b/debian/gosa-plugin-webdav.install
@@ -1,2 +1,2 @@
-webdav/personal			/usr/share/gosa/plugins
 webdav/locale			/usr/share/gosa/locale/plugins/webdav
+webdav/personal			/usr/share/gosa/plugins
diff --git a/debian/gosa-schema.install b/debian/gosa-schema.install
index f9a7a17..e553a04 100644
--- a/debian/gosa-schema.install
+++ b/debian/gosa-schema.install
@@ -1,20 +1,20 @@
-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/trust.schema         /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/gofax.ldif           /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.ldif           /etc/ldap/schema/gosa
 gosa-core/contrib/openldap/gofon.schema         /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/gosa-samba3.ldif     /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/gosa-samba3.schema   /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/goserver.ldif        /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.ldif        /etc/ldap/schema/gosa
 gosa-core/contrib/openldap/gosystem.schema      /etc/ldap/schema/gosa
-gosa-core/contrib/openldap/gosa-samba3.ldif     /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/goto-mime.ldif       /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/goto-mime.schema     /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/goto.ldif            /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/goto.schema          /etc/ldap/schema/gosa
 gosa-core/contrib/openldap/rfc2307bis.ldif      /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/rfc2307bis.schema    /etc/ldap/schema/gosa
 gosa-core/contrib/openldap/samba3.ldif          /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/samba3.schema        /etc/ldap/schema/gosa
 gosa-core/contrib/openldap/trust.ldif           /etc/ldap/schema/gosa
-gosa-core/contrib/openldap/gofax.ldif           /etc/ldap/schema/gosa
-gosa-core/contrib/openldap/goto-mime.ldif       /etc/ldap/schema/gosa
-gosa-core/contrib/openldap/gofon.ldif           /etc/ldap/schema/gosa
-gosa-core/contrib/openldap/goserver.ldif        /etc/ldap/schema/gosa
-gosa-core/contrib/openldap/goto.ldif            /etc/ldap/schema/gosa
-gosa-core/contrib/openldap/gosystem.ldif        /etc/ldap/schema/gosa
+gosa-core/contrib/openldap/trust.schema         /etc/ldap/schema/gosa
diff --git a/debian/gosa.install b/debian/gosa.install
index 8a3d752..9b78fa2 100644
--- a/debian/gosa.install
+++ b/debian/gosa.install
@@ -1,14 +1,14 @@
-gosa-core/update-gosa			/usr/sbin
+debian/gosa-apache.conf			/etc/gosa
+debian/gosa-lighttpd.conf		/etc/gosa
 gosa-core/bin/gosa-encrypt-passwords	/usr/sbin
+gosa-core/contrib/encodings		/etc/gosa
+gosa-core/contrib/gosa.conf		/usr/share/doc/gosa
+gosa-core/contrib/openldap/slapd.conf	/usr/share/doc/gosa/slapd.conf-example
+gosa-core/contrib/shells		/etc/gosa
 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
+gosa-core/update-gosa			/usr/sbin

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