Updated debian env

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

diff --git a/debian/changelog b/debian/changelog
index 8fb6bdfcf9986679a529a519210425253aaf7586..8962925cf1090658922e19e3d899cce367f49439 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gosa (2.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cajus Pollmeier <cajus@frost>  Mon, 03 Sep 2007 14:56:46 +0200
+
+gosa (2.5.13-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cajus Pollmeier <cajus@debian.org>  Wed, 22 Aug 2007 10:47:55 +0200
+
 gosa (2.5.12-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/control b/debian/control
index 39f9082224795cf78499286e5c4f67db2b478f27..8c617c8f728826c6de27f150fede822c3e3dfb84 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Description: Web Based LDAP Administration Program
 Package: gosa-desktop
 Architecture: all
 Depends: iceweasel | mozilla | firefox, debconf, po-debconf
+Suggests: xbase-clients
 Description: Desktop integration for GOsa
  This package includes a menu definition for your desktop
  environment.

diff --git a/debian/control.sarge b/debian/control.sarge
index 8c23760fb733629d443ec91b6a1e35d1f1c8b684..c14904debf0bcfba394875e681624774f7dcc9bc 100644 (file)
--- a/debian/control.sarge
+++ b/debian/control.sarge
@@ -17,6 +17,17 @@ Description: Web Based LDAP Administration Program
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
 
+Package: gosa-desktop
+Architecture: all
+Depends: iceweasel | mozilla | firefox, debconf, po-debconf
+Suggests: xbase-clients
+Description: Desktop integration for GOsa
+ This package includes a menu definition for your desktop
+ environment.
+ .
+ GOsa is a combination of system-administrator and end-user web
+ interface, designed to handle LDAP based setups.
+
 Package: gosa-schema
 Architecture: all
 Depends: slapd

diff --git a/debian/gosa-desktop.desktop b/debian/gosa-desktop.desktop
new file mode 100644 (file)
index 0000000..b5293cc
--- /dev/null
+++ b/debian/gosa-desktop.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+MimeType=text/plain
+GenericName=GOsa²
+Exec=/usr/bin/gosa
+Icon=gosa
+Path=
+Type=Application
+Terminal=false
+Name=GOsa
+X-KDE-StartupNotify=true
+Categories=Qt;KDE;Utility;System

diff --git a/debian/gosa-desktop.dirs b/debian/gosa-desktop.dirs
index 69b860f763310a331b932d2a1e132e76f348d29d..d519c52326b8c37a05b4e1d237bafe194a1c2a7d 100644 (file)
--- a/debian/gosa-desktop.dirs
+++ b/debian/gosa-desktop.dirs
@@ -1,3 +1,4 @@
 etc/gosa
 usr/bin
 usr/share/pixmaps
+usr/share/applications

diff --git a/debian/gosa-desktop.menu b/debian/gosa-desktop.menu
index d221e7e87da9fdf455f5caf1c4407c59c9cf3368..ba39a861c0abe56628ac2ee0346db3646b1a01cd 100644 (file)
--- a/debian/gosa-desktop.menu
+++ b/debian/gosa-desktop.menu
@@ -4,6 +4,5 @@
        hints="KDE"\
         icon32x32="/usr/share/pixmaps/gosa.xpm"\
         icon16x16="/usr/share/pixmaps/gosa-16.xpm"\
-       kderemove="y"\
        title="GOsa"\
        command="gosa"

diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644 (file)
index 0000000..25fcd0f
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,41 @@
+# translation of templates.po to Français
+# GOsa desktop file installer.
+# Copyright (C) 2007 Cajus Pollmeier <cajus@debian.org>
+# This file is distributed under the same license as the gosa-desktop package.
+#
+# Cajus Pollmeier <cajus@debian.org>, 2007.
+# Benoit Mortier <benoit.mortier@opensides.be>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: templates\n"
+"Report-Msgid-Bugs-To: cajus@debian.org\n"
+"POT-Creation-Date: 2007-06-27 10:59+0200\n"
+"PO-Revision-Date: 2007-07-16 15:37+0200\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Français <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid "URL to your GOsa installation:"
+msgstr "URL vers votre installation de GOsa"
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid ""
+"The gosa start script can automatically point your browser to a system wide "
+"default location of your GOsa instance."
+msgstr "Le script de démarrage permet de configurer votre navigateur pour aller directement à votre GOsa."
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid "Enter the URL in order to set this default."
+msgstr "Veuillez entrer l'url pour activer cette fonctionnalité."
+

diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644 (file)
index 0000000..62883da
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,41 @@
+# translation of gosa debconf to Portuguese
+# GOsa desktop file installer.
+# Copyright (C) 2007 Américo Monteiro
+# This file is distributed under the same license as the gosa-desktop package.
+#
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: gosa 2.5.12-1\n"
+"Report-Msgid-Bugs-To: cajus@debian.org\n"
+"POT-Creation-Date: 2007-06-27 10:59+0200\n"
+"PO-Revision-Date: 2007-08-01 23:35+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid "URL to your GOsa installation:"
+msgstr "URL da sua instalação GOsa:"
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid ""
+"The gosa start script can automatically point your browser to a system wide "
+"default location of your GOsa instance."
+msgstr ""
+"O script de arranque do gosa pode automaticamente apontar o seu navegador Web "
+"para uma localização de omissão da sua instância GOsa para todo o sistema."
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid "Enter the URL in order to set this default."
+msgstr "Indique o URL para regular isto como omissão."
+

diff --git a/debian/rules b/debian/rules
index e09ffe05f09f01c77c48e92f2a294172d3f94481..7daedf5eaae4199be34a45b34b6ca361bcfedcb2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,13 @@ SARGE_PACKAGE=`cat debian/changelog  | head -n1 | grep sarge`
 #export DH_VERBOSE=1
 
 build: patch 
-       #**** Off we go... ****
+       #*************************************************
+       #* Building GOsa into a Debian/GNU Linux Package *
+       #*                 please stand by               *
+       #*************************************************
 
 clean: clean-patched unpatch
-clean-patched: clean-patched
+clean-patched:
        dh_testdir
        rm -f install-stamp 
        -rm -f debian/files
@@ -50,17 +53,17 @@ install-stamp:
        -mkdir -p debian/gosa-help-nl/usr/share/doc/gosa-help-nl
        -gzip -c9 debian/changelog > debian/gosa-help-nl/usr/share/doc/gosa-help-nl/changelog.Debian.gz
        -gzip -c9 Changelog > debian/gosa/usr/share/doc/gosa/changelog.gz
-       -cp AUTHORS TODO README FAQ README.safemode DEVEL debian/gosa/usr/share/doc/gosa/
+       -cp AUTHORS README FAQ doc/README.pptp doc/README.xls-export doc/README.glpi doc/README.nagios doc/README.phpscheduleit doc/README.safemode doc/README.devel doc/README.openxchange debian/gosa/usr/share/doc/gosa/
+       -rm debian/gosa/usr/share/gosa/doc/README.ssh
        -rm debian/gosa/usr/share/gosa/README debian/gosa/usr/share/gosa/INSTALL
-       -rm debian/gosa/usr/share/gosa/README.safemode
        -rm debian/gosa/usr/share/gosa/AUTHORS debian/gosa/usr/share/gosa/Changelog
-       -rm debian/gosa/usr/share/gosa/DEVEL
        -rm debian/gosa/usr/share/gosa/COPYING debian/gosa/usr/share/gosa/TODO
        -rm debian/gosa/usr/share/gosa/FAQ
        -mkdir -p debian/gosa/var/spool/gosa/compile
        -mkdir -p debian/gosa/var/spool/gosa/config
        -mkdir -p debian/gosa/var/spool/gosa/cache
        -rm -rf debian/gosa/usr/share/gosa/compile
+       -mv debian/gosa/usr/share/gosa/fix_config.sh debian/gosa/usr/share/doc/gosa/contrib
        -mkdir -p debian/gosa/etc/gosa/vacation
        -cp -R debian/apache.conf debian/gosa/etc/gosa/apache.conf
        -cp -R contrib/encodings debian/gosa/etc/gosa/encodings
@@ -82,6 +85,7 @@ install-stamp:
        -cp -R contrib/scripts/desktoprc debian/gosa-desktop/etc/gosa/desktoprc
        -cp -R contrib/scripts/start-gosa.sh debian/gosa-desktop/usr/bin/gosa
        -cp -R debian/gosa*.xpm debian/gosa-desktop/usr/share/pixmaps
+       -cp -R debian/gosa-desktop.desktop debian/gosa-desktop/usr/share/applications/gosa.desktop
        -rm -rf debian/gosa/usr/share/gosa/contrib
        -rm -rf debian/gosa/usr/share/gosa/locale/en
        -rm -rf debian/gosa/usr/share/gosa/gen_locale.sh
@@ -92,10 +96,10 @@ install-stamp:
        -rm -rf debian/gosa/usr/share/gosa/gen_function_list.php
        -rm -rf debian/gosa/usr/share/gosa/update.sh
        -rm -rf debian/gosa/usr/share/doc/gosa/guide*
+       sed 's%"CONFIG_TEMPLATE_DIR", "../contrib/"%"CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/"%g' debian/gosa/usr/share/gosa/include/functions.inc > debian/gosa/usr/share/gosa/include/functions.inc.new; \
+       mv debian/gosa/usr/share/gosa/include/functions.inc.new debian/gosa/usr/share/gosa/include/functions.inc;
        -if [ -z "${SARGE_PACKAGE}" ]; then \
                rm -rf debian/gosa/usr/share/gosa/include/smarty; \
-               sed 's%"CONFIG_TEMPLATE_DIR", "../contrib/"%"CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/"%g' debian/gosa/usr/share/gosa/include/functions.inc > debian/gosa/usr/share/gosa/include/functions.inc.new; \
-               mv debian/gosa/usr/share/gosa/include/functions.inc.new debian/gosa/usr/share/gosa/include/functions.inc; \
                sed 's%require("smarty/Smarty.class.php");%require("/usr/share/php/smarty/libs/Smarty.class.php");%g' debian/gosa/usr/share/gosa/include/php_setup.inc > debian/gosa/usr/share/gosa/include/php_setup.inc.new; \
                mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc; \
        fi