First roll of updates

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

diff --git a/gosa-core/contrib/scripts/gosa.1 b/gosa-core/contrib/scripts/gosa.1
new file mode 100644 (file)
index 0000000..73f383e
--- /dev/null
+++ b/gosa-core/contrib/scripts/gosa.1
@@ -0,0 +1,41 @@
+.TH gosa 1
+.SH NAME
+gosa \- start script for the GOsa web interface
+.SH SYNOPSIS
+.PP
+.B gosa
+[
+URL
+]
+.SH DESCRIPTION
+Start the 
+.B GOsa
+web interface using a gecko based browser and generate
+a special browser profile for
+.B GOsa
+usage. This profile will disable
+normal style browser navigation and URL fields.
+.SH OPTIONS
+.TP
+.BR URL
+Open this URL when launching the browser with the GOsa profile. This
+option is optional and may be preset by the
+.B configuration
+files.
+.SH "RETURN VALUE"
+The script return zero values on success.
+.SH EXAMPLES
+.B gosa
+https://admin.example.net
+.SH FILES
+Presetting the URL works by placing something like
+.B URL="http://admin.example.net"
+inside one of these files:
+.br
+.nf
+.\" set tabstop to longest possible filename, plus a wee bit
+.ta \w'/usr/lib/perl/getopts.pl   'u
+\fI/etc/gosa/desktoprc\fR      system wide setting
+\fI$HOME/.gosa-desktop\fR      user specific setting
+.SH AUTHOR
+Cajus Pollmeier <cajus@debian.org>

diff --git a/gosa-core/debian/gosa-desktop.install b/gosa-core/debian/gosa-desktop.install
index 367c52ca0b39dcfe60fa19025fa9197e1a0ffcca..831d7b1d5c3ae22b161f749ba3bcdb1c9a10bb07 100644 (file)
--- a/gosa-core/debian/gosa-desktop.install
+++ b/gosa-core/debian/gosa-desktop.install
@@ -1,5 +1,5 @@
 contrib/scripts/desktoprc   /etc/gosa
 contrib/scripts/gosa        /usr/bin
 debian/gosa.xpm             /usr/share/pixmaps
-debian/gosa16.xpm           /usr/share/pixmaps
+debian/gosa-16.xpm          /usr/share/pixmaps
 debian/gosa-desktop.desktop /usr/share/applications

diff --git a/gosa-core/debian/gosa-dev.install b/gosa-core/debian/gosa-dev.install
index 9dc0b86893d86b23fb137ed314848457d57c7c1d..8892a030190c01953b3d42e2f23f5f9a19257e92 100644 (file)
--- a/gosa-core/debian/gosa-dev.install
+++ b/gosa-core/debian/gosa-dev.install
@@ -1,3 +1,4 @@
 update-locale       /usr/bin
 update-online-help  /usr/bin
 update-pdf-help     /usr/bin
+dh-make-gosa        /usr/bin

diff --git a/gosa-core/debian/gosa-schema.install b/gosa-core/debian/gosa-schema.install
index 690b769058edec06bc38ebfae56d66a06d25944b..d4b8e13d5faf8caa3639985dde1aceb849cffda3 100644 (file)
--- a/gosa-core/debian/gosa-schema.install
+++ b/gosa-core/debian/gosa-schema.install
@@ -1,6 +1,6 @@
-contrib/openldap/gosa-with-samba3.schema   /etc/ldap/schema/gosa
-contrib/openldap/gosa-with-samba2.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/gosa-samba3.schema   /etc/ldap/schema/gosa
+contrib/openldap/gosa-samba2.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

diff --git a/gosa-core/debian/rules b/gosa-core/debian/rules
index d3c9067f9807afa14ababaff456b532e80459266..31b76695d20673a474ffba95a8e89decebd01f2c 100755 (executable)
--- a/gosa-core/debian/rules
+++ b/gosa-core/debian/rules
@@ -1,14 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
+# 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.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -19,33 +16,23 @@ export DH_OPTIONS
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # Add here commands to configure the package.
-
        touch configure-stamp
 
-
-#Architecture 
-build: patch build-arch build-indep
+build: patch build-indep
         #*************************************************
         #* Building GOsa into a Debian/GNU Linux Package *
-        #*                 please stand by               *
+        #*                please stand by                *
         #*************************************************
 
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp 
-
-       touch $@
-
 build-indep: build-indep-stamp
 build-indep-stamp: configure-stamp 
-
        touch $@
 
 clean: clean-patched unpatch
 clean-patched:
        dh_testdir
        dh_testroot
-       rm -f build-arch-stamp build-indep-stamp configure-stamp
+       rm -f build-indep-stamp configure-stamp
 
        dh_clean
 
@@ -53,7 +40,7 @@ unpatch:
        dpatch deapply-all
        rm -rf patch-stamp debian/patched
 
-install: install-indep install-arch
+install: install-indep
 install-indep:
        dh_testdir
        dh_testroot
@@ -66,17 +53,6 @@ install-indep:
 
        dh_install -i
 
-install-arch:
-       dh_testdir
-       dh_testroot
-       dh_clean -k -s 
-       dh_installdirs -s
-
-       dh_install -s
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
 binary-common:
        dh_testdir
        dh_testroot
@@ -85,7 +61,7 @@ binary-common:
        dh_installexamples
        dh_installmenu
        dh_installdebconf       
-       dh_installman -pgosa-desktop debian/gosa.1
+       dh_installman -pgosa-desktop contrib/scripts/gosa.1
        dh_link
        dh_strip
        dh_compress 
@@ -102,13 +78,8 @@ patch-stamp:
        dpatch apply-all
        dpatch cat-all >patch-stamp
 
-# Build architecture independant packages using the common target.
 binary-indep: build-indep install-indep
        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-       $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+binary: binary-indep
+.PHONY: build clean binary-indep binary install install-indep configure

diff --git a/gosa-core/gosa.1 b/gosa-core/gosa.1
deleted file mode 100644 (file)
index 73f383e..0000000
--- a/gosa-core/gosa.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH gosa 1
-.SH NAME
-gosa \- start script for the GOsa web interface
-.SH SYNOPSIS
-.PP
-.B gosa
-[
-URL
-]
-.SH DESCRIPTION
-Start the 
-.B GOsa
-web interface using a gecko based browser and generate
-a special browser profile for
-.B GOsa
-usage. This profile will disable
-normal style browser navigation and URL fields.
-.SH OPTIONS
-.TP
-.BR URL
-Open this URL when launching the browser with the GOsa profile. This
-option is optional and may be preset by the
-.B configuration
-files.
-.SH "RETURN VALUE"
-The script return zero values on success.
-.SH EXAMPLES
-.B gosa
-https://admin.example.net
-.SH FILES
-Presetting the URL works by placing something like
-.B URL="http://admin.example.net"
-inside one of these files:
-.br
-.nf
-.\" set tabstop to longest possible filename, plus a wee bit
-.ta \w'/usr/lib/perl/getopts.pl   'u
-\fI/etc/gosa/desktoprc\fR      system wide setting
-\fI$HOME/.gosa-desktop\fR      user specific setting
-.SH AUTHOR
-Cajus Pollmeier <cajus@debian.org>