Updated rules and readme

[gosa.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index c68ba1a699cd799dbaa4fc4c598029119b4d8f96..8654e0f250cd72db7650263de8f27c3bd3f258ca 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 # Some lines taken from debmake, by Cristoph Lameter.
 
 SARGE_PACKAGE=`cat debian/changelog  | head -n1 | grep sarge`
+ETCH_PACKAGE=`cat debian/changelog  | head -n1 | grep etch`
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -35,7 +36,7 @@ install-stamp:
        for i in `ls | grep -v debian`; do \
          cp -R $$i debian/gosa/usr/share/gosa ; \
        done
-       -find debian/gosa -type d -name ".svn" -exec rm -rf {} \; &> /dev/null || /bin/true
+       -find debian/gosa -type d -name ".svn" -exec rm -rf {} \; >/dev/null 2>&1
        -cp -R debian/gosa/usr/share/gosa/contrib/* debian/gosa/usr/share/doc/gosa/contrib/
        -cp debian/gosa/usr/share/gosa/contrib/openldap/go*.schema debian/gosa-schema/etc/ldap/schema
        -cp -R INSTALL debian/gosa/usr/share/doc/gosa/README.INSTALL
@@ -53,16 +54,15 @@ 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 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/
+       -cp AUTHORS README FAQ doc/README.pptp 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/README debian/gosa/usr/share/gosa/INSTALL
        -rm debian/gosa/usr/share/gosa/AUTHORS debian/gosa/usr/share/gosa/Changelog
-       -rm debian/gosa/usr/share/gosa/COPYING debian/gosa/usr/share/gosa/TODO
-       -rm debian/gosa/usr/share/gosa/FAQ
+       -rm debian/gosa/usr/share/gosa/FAQ debian/gosa/usr/share/gosa/COPYING
        -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
+       -mv debian/gosa/usr/share/gosa/update-config 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
@@ -73,7 +73,7 @@ install-stamp:
        -mv debian/gosa/usr/share/gosa/bin/* debian/gosa/usr/bin
        -rm -rf debian/gosa/usr/share/gosa/bin
        -rm -rf debian/gosa/usr/share/doc/gosa/marketing
-       -find debian/gosa -type f -exec chmod -x {} \; &> /dev/null
+       -find debian/gosa -type f -exec chmod -x {} \; >/dev/null 2>&1
        -chmod +x debian/gosa/usr/bin/mkntpasswd
        -rm -rf debian/gosa/usr/share/gosa/doc/guide/user/*/lyx-source
        -rm -rf debian/gosa/usr/share/gosa/doc/guide/admin
@@ -84,15 +84,15 @@ 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
-       -rm -rf debian/gosa/usr/share/gosa/gen_pdf_help.sh
+       -rm -rf debian/gosa/usr/share/gosa/update-locale
+       -rm -rf debian/gosa/usr/share/gosa/update-pdf-help
        -rm -rf debian/gosa/usr/share/gosa/patch-stamp
-       -rm -rf debian/gosa/usr/share/gosa/gen_locale_mo.sh
-       -rm -rf debian/gosa/usr/share/gosa/gen_online_help.sh
-       -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/gosa/update-online-help
+       -rm -rf debian/gosa/usr/share/gosa/update-gosa
+       -rm -rf debian/gosa/usr/share/gosa/update-config
        -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;
@@ -120,6 +120,7 @@ binary-indep: install
        dh_installmenu
        dh_installman --package=gosa debian/mkntpasswd.1
        dh_installman --package=gosa-desktop debian/gosa.1
+       dh_installman --package=gosa debian/gosa-encrypt-passwords.1
        dh_link
        dh_strip
        dh_compress --exclude=gosa.conf
@@ -132,7 +133,11 @@ binary-indep: install
        chmod 644 debian/gosa/DEBIAN/conffiles
 
        -if [ -z "${SARGE_PACKAGE}" ]; then \
-               dh_gencontrol; \
+               if [ -z "${ETCH_PACKAGE}" ]; then \
+                       dh_gencontrol; \
+               else \
+                       dh_gencontrol -- -cdebian/control.etch; \
+               fi ; \
        else \
                dh_gencontrol -- -cdebian/control.sarge; \
        fi