Initial cleanup

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12173 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/debian/control b/gosa-si/debian/control
index 9dcc92e236d54267554d705fea1d1f091cf8ce3c..4ccd62b5f6dcdcba83e97da83430c17696385e4d 100644 (file)
--- a/gosa-si/debian/control
+++ b/gosa-si/debian/control
@@ -19,7 +19,7 @@ Description: GOsa support infrastructure
 Package: gosa-si-server
 Architecture: any
 Depends: gosa-si-common, libcrypt-smbhash-perl
-Suggests: gosa
+Suggests: gosa, gosa-si-server-postfix
 Description: GOsa support infrastructure server
  This package provides everything you need in order to deploy a simple
  or distributed GOsa support infrastructure. It can be used to trigger
@@ -31,10 +31,40 @@ Description: GOsa support infrastructure server
 Package: gosa-si-client
 Architecture: any
 Depends: gosa-si-common, hwinfo, libdatetime-perl
-Suggests: fai-progress
+Suggests: fai-progress, gosa-si-client-krb5, gosa-si-client-dak
 Description: GOsa support infrastructure client
  This package lets you join to a GOsa support infrastructure as a
  client in order to provide information or to act on events.
  .
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
+
+Package: gosa-si-server-postfix
+Architecture: any
+Depends: gosa-si-server, postfix
+Description: GOsa support infrastructure postfix module
+ This package controls postfix mail queues.
+ .
+ GOsa is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-si-client-krb5
+Architecture: any
+Depends: gosa-si-client, libauthen-krb5-perl
+Description: GOsa support infrastructure kerberos module
+ This package controls keberos setups and enables administrators
+ to maintain accounts and keys.
+ .
+ GOsa is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
+Package: gosa-si-server-dak
+Architecture: any
+Depends: gosa-si-server, dak
+Description: GOsa support infrastructure dak module
+ This package controls debian archive kit setups and enables
+ administrators to manage queue and keyring related issues.
+ .
+ GOsa is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+

diff --git a/gosa-si/debian/gosa-si-client-dak.dirs b/gosa-si/debian/gosa-si-client-dak.dirs
new file mode 100644 (file)
index 0000000..d94a1b5
--- /dev/null
+++ b/gosa-si/debian/gosa-si-client-dak.dirs
@@ -0,0 +1 @@
+usr/lib/gosa-si/client/events

diff --git a/gosa-si/debian/gosa-si-client-dak.install b/gosa-si/debian/gosa-si-client-dak.install
new file mode 100644 (file)
index 0000000..1b0abd1
--- /dev/null
+++ b/gosa-si/debian/gosa-si-client-dak.install
@@ -0,0 +1 @@
+client/events/dak.pm      usr/lib/gosa-si/client/events

diff --git a/gosa-si/debian/gosa-si-client-krb5.dirs b/gosa-si/debian/gosa-si-client-krb5.dirs
new file mode 100644 (file)
index 0000000..d94a1b5
--- /dev/null
+++ b/gosa-si/debian/gosa-si-client-krb5.dirs
@@ -0,0 +1 @@
+usr/lib/gosa-si/client/events

diff --git a/gosa-si/debian/gosa-si-client-krb5.install b/gosa-si/debian/gosa-si-client-krb5.install
new file mode 100644 (file)
index 0000000..54a30b7
--- /dev/null
+++ b/gosa-si/debian/gosa-si-client-krb5.install
@@ -0,0 +1 @@
+client/events/krb5.pm      usr/lib/gosa-si/client/events

diff --git a/gosa-si/debian/gosa-si-client.install b/gosa-si/debian/gosa-si-client.install
index c39f2939afa9053d8e4a21ea17522d0e2425c81e..29f50699198937615959ee9bcee238144a7cafe7 100644 (file)
--- a/gosa-si/debian/gosa-si-client.install
+++ b/gosa-si/debian/gosa-si-client.install
@@ -3,4 +3,3 @@ client.conf                     etc/gosa-si
 client/events/corefunctions.pm usr/lib/gosa-si/client/events
 client/events/installation.pm   usr/lib/gosa-si/client/events
 client/events/gosaTriggered.pm  usr/lib/gosa-si/client/events
-client/events/mailqueue.pm      usr/lib/gosa-si/client/events

diff --git a/gosa-si/debian/gosa-si-client.manpages b/gosa-si/debian/gosa-si-client.manpages
new file mode 100644 (file)
index 0000000..b18a406
--- /dev/null
+++ b/gosa-si/debian/gosa-si-client.manpages
@@ -0,0 +1,2 @@
+gosa-si-client.conf.5
+gosa-si-client.1

diff --git a/gosa-si/debian/gosa-si-server-opsi.dirs b/gosa-si/debian/gosa-si-server-opsi.dirs
new file mode 100644 (file)
index 0000000..df081d1
--- /dev/null
+++ b/gosa-si/debian/gosa-si-server-opsi.dirs
@@ -0,0 +1,2 @@
+usr/lib/gosa-si/server/GosaPackages
+usr/lib/gosa-si/server/ServerPackages

diff --git a/gosa-si/debian/gosa-si-server-opsi.install b/gosa-si/debian/gosa-si-server-opsi.install
new file mode 100644 (file)
index 0000000..ffe16d0
--- /dev/null
+++ b/gosa-si/debian/gosa-si-server-opsi.install
@@ -0,0 +1,3 @@
+server/events/opsi_com.pm    usr/lib/gosa-si/server/GosaPackages
+server/events/opsi_com.pm    usr/lib/gosa-si/server/ServerPackages
+

diff --git a/gosa-si/debian/gosa-si-server-postfix.dirs b/gosa-si/debian/gosa-si-server-postfix.dirs
new file mode 100644 (file)
index 0000000..df081d1
--- /dev/null
+++ b/gosa-si/debian/gosa-si-server-postfix.dirs
@@ -0,0 +1,2 @@
+usr/lib/gosa-si/server/GosaPackages
+usr/lib/gosa-si/server/ServerPackages

diff --git a/gosa-si/debian/gosa-si-server-postfix.install b/gosa-si/debian/gosa-si-server-postfix.install
new file mode 100644 (file)
index 0000000..45b4a69
--- /dev/null
+++ b/gosa-si/debian/gosa-si-server-postfix.install
@@ -0,0 +1,3 @@
+server/events/mailqueue_com.pm    usr/lib/gosa-si/server/GosaPackages
+server/events/mailqueue_com.pm    usr/lib/gosa-si/server/ServerPackages
+

diff --git a/gosa-si/debian/gosa-si-server.install b/gosa-si/debian/gosa-si-server.install
index 5fdb4b966e4fa1ac686a91a385e114bc4b14cce2..99882e7ad4d41cee91970ef75b9516b74dc3f9d8 100644 (file)
--- a/gosa-si/debian/gosa-si-server.install
+++ b/gosa-si/debian/gosa-si-server.install
@@ -13,6 +13,4 @@ server/events/databases.pm                    usr/lib/gosa-si/server/ServerPackages
 server/events/logHandling.pm                   usr/lib/gosa-si/server/GosaPackages
 server/events/logHandling.pm                   usr/lib/gosa-si/server/ServerPackages
 server/events/server_server_com.pm     usr/lib/gosa-si/server/ServerPackages
-server/events/mailqueue_com.pm         usr/lib/gosa-si/server/GosaPackages
-server/events/mailqueue_com.pm         usr/lib/gosa-si/server/ServerPackages
 

diff --git a/gosa-si/debian/gosa-si-server.manpages b/gosa-si/debian/gosa-si-server.manpages
new file mode 100644 (file)
index 0000000..dbc5a7e
--- /dev/null
+++ b/gosa-si/debian/gosa-si-server.manpages
@@ -0,0 +1,2 @@
+gosa-si-server.conf.5
+gosa-si-server.1

diff --git a/gosa-si/debian/rules b/gosa-si/debian/rules
index 6f863bc0325bdcde5281e563632ca5bfd9ef8187..892de833cbcea10e684d584719876dd7e1926dcd 100755 (executable)
--- a/gosa-si/debian/rules
+++ b/gosa-si/debian/rules
@@ -37,7 +37,7 @@ install-stamp:
        done
        -find debian/tmp -name '*.svn' -type d -exec rm -rf {} \; 2> /dev/null
 
-       -for i in gosa-si-client gosa-si-server modules/GosaPackages.pm modules/ClientPackages.pm modules/ServerPackages.pm modules/TestModule.pm server/events/*; do sed -i 's/use GosaSupportDaemon;/use GOSA::GosaSupportDaemon;/g;s/use DBsqlite;/use GOSA::DBsqlite;/g' debian/tmp/$$i; done
+       -for i in gosa-si-client gosa-si-server modules/GosaPackages.pm modules/ClientPackages.pm modules/ServerPackages.pm server/events/*; do sed -i 's/use GosaSupportDaemon;/use GOSA::GosaSupportDaemon;/g;s/use DBsqlite;/use GOSA::DBsqlite;/g' debian/tmp/$$i; done
 
        -sed -i 's!"/etc/gosa-si/modules";!use lib "/usr/lib/gosa-si/modules";!g' debian/tmp/gosa-si-server
 
@@ -63,6 +63,7 @@ binary-indep: install
        dh_installcron
        dh_installexamples
        dh_installchangelogs
+       dh_installman
        dh_installlogrotate
        #dh_installdebconf
        dh_installinit --init-script=gosa-si -- start 00 2 3 4 5 . stop 29 1 .