Added debian packaging fixes

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

diff --git a/gosa-core/debian/install b/gosa-core/debian/install
index 3ed2dc219b76993e1566b8f514e39d0d385d72cb..dc1441dd537152f1c469c64fa74d61f396c33d49 100644 (file)
--- a/gosa-core/debian/install
+++ b/gosa-core/debian/install
@@ -12,3 +12,4 @@ contrib/resolutions           /etc/gosa
 contrib/encodings              /etc/gosa
 contrib/openldap/slapd.conf    /usr/share/doc/gosa/slapd.conf-example
 contrib/vacation_example.txt   /usr/share/doc/gosa
+contrib/gosa.conf              /usr/share/doc/gosa

diff --git a/gosa-core/debian/patches/01_fix_smarty_location.dpatch b/gosa-core/debian/patches/01_fix_smarty_location.dpatch
new file mode 100755 (executable)
index 0000000..153aa40
--- /dev/null
+++ b/gosa-core/debian/patches/01_fix_smarty_location.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_smarty_location.dpatch by  <cajus@localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gosa-core~/include/php_setup.inc gosa-core/include/php_setup.inc
+--- gosa-core~/include/php_setup.inc   2008-03-17 23:52:36.000000000 +0100
++++ gosa-core/include/php_setup.inc    2008-04-07 23:12:32.000000000 +0200
+@@ -274,7 +274,7 @@
+ ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel");
+ 
+ /* Do smarty setup */
+-require("smarty/Smarty.class.php");
++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
new file mode 100755 (executable)
index 0000000..448eca8
--- /dev/null
+++ b/gosa-core/debian/patches/02_fix_template_location.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_template_location.dpatch by  <cajus@localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gosa-core~/include/functions.inc gosa-core/include/functions.inc
+--- gosa-core~/include/functions.inc   2008-04-07 23:17:29.000000000 +0200
++++ gosa-core/include/functions.inc    2008-04-07 23:17:56.000000000 +0200
+@@ -23,7 +23,7 @@
+ /* Configuration file location */
+ define ("CONFIG_DIR", "/etc/gosa");
+ define ("CONFIG_FILE", "gosa.conf");
+-define ("CONFIG_TEMPLATE_DIR", "../contrib/");
++define ("CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/");
+ 
+ /* Define get_list flags */
+ define("GL_NONE",         0);

diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index b11407e897425f926f9c216e9392e80e723c02f3..437c274fcc852eea61ea93fd938d8293db9857e5 100755 (executable)
--- a/gosa-core/dh-make-gosa
+++ b/gosa-core/dh-make-gosa
@@ -1,14 +1,7 @@
 #!/bin/sh
 
 usage() {
-#       file plugin.tgz
-#       dir plugin
-#       --download
-#       --branch | -b
-#       --email | -e EMAIL
-#       --depends DEPENDS
-
-  echo "Usage: ${0##*/}" >&2
+  echo "Usage: ${0##*/} [--download] [-b|--branch branch] [-e|--email mail] [--depends] plugin-dir|plugin.tar.gz" >&2
   exit 1
 }
 

diff --git a/gosa-core/dh-make-gosa.1 b/gosa-core/dh-make-gosa.1
new file mode 100644 (file)
index 0000000..5cffd42
--- /dev/null
+++ b/gosa-core/dh-make-gosa.1
@@ -0,0 +1,76 @@
+.\" Process this file with
+.\" groff -man -Tascii foo.1
+.\"
+.TH DH-MAKE-GOSA 1 "2008-04-07" "GOsa v2.6" "Debian"
+.SH NAME
+dh-make-gosa \- Create debian source packages from GOsa plugins
+.SH SYNOPSIS
+.B dh-make-gosa [OPTION]...
+.B SOURCE
+.SH DESCRIPTION
+.B foo
+frobnicates the bar library by tweaking internal
+symbol tables. By default it parses all baz segments
+and rearranges them in reverse order by time for the
+.BR xyzzy (1)
+linker to find them. The symdef entry is then compressed
+using the WBG (Whiz-Bang-Gizmo) algorithm.
+All files are processed in the order specified.
+.SH OPTIONS
+.\"[--download] [-b|--branch branch] [-e|--email mail] [--depends] plugin-dir|plugin.tar.gz
+.IP -b
+Do not write `busy' to stdout while processing.
+.IP "-c config-file"
+Use the alternate system wide
+.I config-file
+instead of
+.IR /etc/foo.conf .
+This overrides any
+.B FOOCONF
+environment variable.
+.IP -a
+In addition to the baz segments, also parse the
+blurfl headers.
+.IP -r
+Recursive mode. Operates as fast as lightning
+at the expense of a megabyte of virtual memory.
+.SH FILES
+.I /etc/foo.conf
+.RS
+The system wide configuration file. See
+.BR foo (5)
+for further details.
+.RE
+.I ~/.foorc
+.RS
+Per user configuration file. See
+.BR foo (5)
+for further details.
+.SH ENVIRONMENT
+.IP FOOCONF
+If non-null the full pathname for an alternate system wide
+.IR foo.conf .
+Overridden by the
+.B -c
+option.
+.SH DIAGNOSTICS
+The following diagnostics may be issued on stderr:
+ 
+Bad magic number.
+.RS
+The input file does not look like an archive file.
+.RE
+Old style baz segments.
+.RS
+.B foo
+can only handle new style baz segments. COBOL
+object libraries are not supported in this version.
+.SH BUGS
+The command name should have been chosen more carefully
+to reflect its purpose.
+.SH AUTHOR
+Jens Schweikhardt <howto at schweikhardt dot net>
+.SH "SEE ALSO"
+.BR bar (1),
+.BR foo (5),
+.BR xyzzy (1)

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 51360acd339437596e513105b2b1b63b3161d52f..6fc523247ad3255c3fae25e6d6338d2429f19aa6 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -22,9 +22,8 @@
 
 /* Configuration file location */
 define ("CONFIG_DIR", "/etc/gosa");
-define ("CONFIG_FILE", "gosa.conf-trunk");
+define ("CONFIG_FILE", "gosa.conf");
 define ("CONFIG_TEMPLATE_DIR", "../contrib/");
-define ("HELP_BASEDIR", "/var/www/doc/");
 
 /* Define get_list flags */
 define("GL_NONE",         0);