- cleaning package

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

diff --git a/gosa-si/debian/README.source b/gosa-si/debian/README.source
new file mode 100644 (file)
index 0000000..1c919f0
--- /dev/null
+++ b/gosa-si/debian/README.source
@@ -0,0 +1 @@
+/usr/share/doc/dpatch/README.source.gz

diff --git a/gosa-si/debian/control b/gosa-si/debian/control
index a5a0c11bde49ff8978f18fe3addf5da755e718aa..818a79b31b1238a88b56625a87ac035192a9c91a 100644 (file)
--- a/gosa-si/debian/control
+++ b/gosa-si/debian/control
@@ -3,15 +3,15 @@ Section: utils
 Priority: optional
 Maintainer: GOsa packages mainteners group <gosa-pkg@oss.gonicus.de>
 Uploaders: Cajus Pollmeier <cajus@debian.org>, Benoit Mortier <benoit.mortier@opensides.be>
-Standards-Version: 3.8.0
-Build-Depends: debhelper(>= 4.2.32), dpatch
+Standards-Version: 3.8.4
+Build-Depends: debhelper(>= 5), dpatch
 Homepage: https://oss.gonicus.de/labs/gosa/
 Vcs-Browser: https://oss.gonicus.de/repositories/gosa/trunk/gosa-si
 Vcs-Svn: https://oss.gonicus.de/repositories/gosa/trunk/gosa-si
 
 Package: gosa-si-common
 Architecture: any
-Depends: libconfig-inifiles-perl, libcrypt-rijndael-perl, libio-socket-ssl-perl, libxml-simple-perl, libdata-dumper-simple-perl, libmime-perl | 
+Depends: ${misc:Depends}, libconfig-inifiles-perl, libcrypt-rijndael-perl, libio-socket-ssl-perl, libxml-simple-perl, libdata-dumper-simple-perl, libmime-perl | 
  libmime-tools-perl, libdbd-sqlite3-perl, libnet-ldap-perl, libnetaddr-ip-perl, libpoe-perl, libnet-dns-perl, libnet-pcap-perl, 
  libconvert-asn1-perl, libdigest-hmac-perl, libnet-ip-perl, libdigest-sha1-perl, libnet-mac-vendor-perl, libpoe-component-pcap-perl, 
  libnet-arp-perl, libdatetime-perl, libjson-rpc-perl, libxml-quote-perl, libcrypt-ssleay-perl, libnet-arp-perl
@@ -25,7 +25,7 @@ Description: GOsa support infrastructure
 
 Package: gosa-si-server
 Architecture: any
-Depends: gosa-si-common, libcrypt-smbhash-perl
+Depends: ${misc:Depends}, gosa-si-common, libcrypt-smbhash-perl
 Suggests: gosa, gosa-si-server-postfix, gosa-si-server-dak
 Description: GOsa support infrastructure server
  GOsa is a combination of system-administrator and end-user web
@@ -37,7 +37,7 @@ Description: GOsa support infrastructure server
 
 Package: gosa-si-client
 Architecture: any
-Depends: gosa-si-common, hwinfo, libdatetime-perl
+Depends: ${misc:Depends}, gosa-si-common, hwinfo, libdatetime-perl
 Suggests: goto-fai-progress, gosa-si-client-krb5
 Description: GOsa support infrastructure client
  GOsa is a combination of system-administrator and end-user web
@@ -48,7 +48,7 @@ Description: GOsa support infrastructure client
 
 Package: gosa-si-server-postfix
 Architecture: any
-Depends: gosa-si-server, postfix
+Depends: ${misc:Depends}, gosa-si-server, postfix
 Description: GOsa support infrastructure postfix module
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
@@ -57,7 +57,7 @@ Description: GOsa support infrastructure postfix module
 
 Package: gosa-si-client-krb5
 Architecture: any
-Depends: gosa-si-client, libauthen-krb5-perl, libauthen-krb5-admin-perl
+Depends: ${misc:Depends}, gosa-si-client, libauthen-krb5-perl, libauthen-krb5-admin-perl
 Description: GOsa support infrastructure kerberos module
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
@@ -67,7 +67,7 @@ Description: GOsa support infrastructure kerberos module
 
 Package: gosa-si-server-dak
 Architecture: any
-Depends: gosa-si-server, dak
+Depends: ${misc:Depends}, gosa-si-server, dak
 Description: GOsa support infrastructure dak module
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
@@ -77,7 +77,7 @@ Description: GOsa support infrastructure dak module
 
 Package: gosa-si-server-opsi
 Architecture: any
-Depends: gosa-si-server
+Depends: ${misc:Depends}, gosa-si-server
 Description: GOsa support infrastructure opsi module
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
@@ -86,7 +86,7 @@ Description: GOsa support infrastructure opsi module
 
 Package: gosa-si-client-loadreporter
 Architecture: any
-Depends: gosa-si-client
+Depends: ${misc:Depends}, gosa-si-client
 Description: GOsa support infrastructure system load reporter module
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.

diff --git a/gosa-si/debian/rules b/gosa-si/debian/rules
index 933e5482a9f595463e3ba1bfb617686e0b78f82a..1ad15fefa9b6d900dc8dc131080b290951c51263 100755 (executable)
--- a/gosa-si/debian/rules
+++ b/gosa-si/debian/rules
@@ -56,9 +56,6 @@ binary-indep: install
        
        dh_install --sourcedir=debian/tmp
        
-       install -D -m 644 debian/gosa-si-server.lintian-overrides debian/gosa-si-server/usr/share/lintian/overrides/gosa-si-server
-       install -D -m 644 debian/gosa-si-client.lintian-overrides debian/gosa-si-client/usr/share/lintian/overrides/gosa-si-client
-
        dh_installdocs 
        dh_installcron
        dh_installexamples

diff --git a/gosa-si/server.conf.pod b/gosa-si/server.conf.pod
index 2ad848e68a85803abe44bd4b464cf997eb5905c2..3bc87dbc2868c9b318be850f0c83cf8d9c616034 100644 (file)
--- a/gosa-si/server.conf.pod
+++ b/gosa-si/server.conf.pod
@@ -188,7 +188,7 @@ the user is marked to be no longer logged in or the host is no longer running.
 
 =item address = 
 
-Comma seperated list of GOsa-si-servers (1.2.3.4:20081,9.8.7.6:123) in network where this SI-server should register. These given SI-servers extend the list of SI-servers found in DNS. 
+Comma separated list of GOsa-si-servers (1.2.3.4:20081,9.8.7.6:123) in network where this SI-server should register. These given SI-servers extend the list of SI-servers found in DNS. 
 
 =item dns-lookup = true
 
@@ -208,7 +208,7 @@ Defines the lifetime in seconds of a GOsa-SI-server key. After expiring the key
 
 =item job-synchronization-enabled = true
 
-Defines whether job queue informations are be shared with other GOsa-SI-server in network.
+Defines whether job queue information are be shared with other GOsa-SI-server in network.
 
 =item synchronization-loog = 5
 
@@ -237,7 +237,7 @@ Space- or comma-separated list of interfaces on which to start an ARP-Daemon. En
 
 =item enabled = false
 
-Defines wheter Opsi integration is being enabled or not.
+Defines whether Opsi integration is being enabled or not.
 
 =item server = localhost