Improve debian rules file

diff --git a/debian/dirs b/debian/dirs
index 1cbb177..71acc96 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -3,6 +3,7 @@ etc/ldap/schema
 usr/bin
 usr/share
 usr/share/doc/ldapsaisie
-usr/local/share
+usr/local/share/ldapsaisie/conf
+usr/share/ldapsaisie/local
 var/tmp/ldapsaisie
 var/log/ldapsaisie

diff --git a/debian/ldapsaisie.install b/debian/ldapsaisie.install
new file mode 100644 (file)
index 0000000..a4c330d
--- /dev/null
+++ b/debian/ldapsaisie.install
@@ -0,0 +1,5 @@
+debian/conf/apache.conf etc/ldapsaisie/
+debian/bin/* usr/bin/
+lsexample/schema/lsexample.schema  etc/ldap/schema/
+lsexample/schema/lsexample.ldif  etc/ldap/schema/
+public_html/* usr/share/ldapsaisie/

diff --git a/debian/ldapsaisie.links b/debian/ldapsaisie.links
new file mode 100644 (file)
index 0000000..a6c9a54
--- /dev/null
+++ b/debian/ldapsaisie.links
@@ -0,0 +1,3 @@
+var/tmp/ldapsaisie usr/share/ldapsaisie/tmp
+usr/local/share/ldapsaisie usr/share/ldapsaisie/local
+usr/local/share/ldapsaisie etc/ldapsaisie/local

diff --git a/debian/ldapsaisie.postinst b/debian/ldapsaisie.postinst
index 49c0efc..b3ff1e0 100644 (file)
--- a/debian/ldapsaisie.postinst
+++ b/debian/ldapsaisie.postinst
@@ -2,12 +2,6 @@
 
 chown www-data:adm /var/tmp/ldapsaisie /var/log/ldapsaisie
 chmod 750 /var/tmp/ldapsaisie /var/log/ldapsaisie
-if test ! -L /etc/ldapsaisie/local
-then
-       echo "Install /etc/ldapsaisie/local symbolic link"
-       [ -e /etc/ldapsaisie/local ] && mv -f /etc/ldapsaisie/local /etc/ldapsaisie/local.dpkg-old
-       ln -s /usr/local/share/ldapsaisie /etc/ldapsaisie/local
-fi
 
 if [ -f /usr/local/share/ldapsaisie/conf/config.inc.php.dpkg-move ]
 then

diff --git a/debian/ldapsaisie.preinst b/debian/ldapsaisie.preinst
deleted file mode 100644 (file)
index 13c08a6..0000000
--- a/debian/ldapsaisie.preinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if test  -e /etc/ldapsaisie/local -a ! -L /etc/ldapsaisie/local
-then
-       echo "Move /etc/ldapsaisie/local in /usr/local/share/ldapsaisie"
-       mv /etc/ldapsaisie/local /usr/local/share/ldapsaisie
-       mv /usr/local/share/ldapsaisie/conf/config.inc.php /usr/local/share/ldapsaisie/conf/config.inc.php.dpkg-move
-fi

diff --git a/debian/rules b/debian/rules
index 915390d..0398314 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,81 +1,21 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+       dh $@
 
-build: build-doc
-
-build-doc:
+override_dh_auto_build:
        make -C $(CURDIR)/doc/exports/html -f Makefile debian
 
-clean:
-       dh_testdir
-       dh_testroot
-
+override_dh_clean:
        dh_clean
        make -C $(CURDIR)/doc -f Makefile clean
 
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs
-
-       dh_install debian/conf/apache.conf /etc/ldapsaisie/
-
-       cp -fr $(CURDIR)/public_html $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie
-       find $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie -name .gitignore -exec rm -f {} \;
-       find $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie -name .placefolder -exec rm -f {} \;
+override_dh_install:
+       dh_install -X .gitignore -X .placefolder -X tmp
 
        mv $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie/local $(CURDIR)/debian/ldapsaisie/usr/local/share/ldapsaisie
        find $(CURDIR)/debian/ldapsaisie/usr/local/share/ldapsaisie -type f -exec rm -f \{\} \;
-       dh_link /usr/local/share/ldapsaisie /usr/share/ldapsaisie/local
        sed -i 's/tmp\/LS.log/\/var\/log\/ldapsaisie\/ldapsaisie.log/' $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie/conf/config.inc.php
        cp $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie/conf/config.inc.php $(CURDIR)/debian/ldapsaisie/usr/local/share/ldapsaisie/conf/config.inc.example.php
 
-       rm -fr $(CURDIR)/debian/ldapsaisie/usr/share/ldapsaisie/tmp
-       dh_link /var/tmp/ldapsaisie /usr/share/ldapsaisie/tmp
-
-       cp -fr $(CURDIR)/debian/bin/* $(CURDIR)/debian/ldapsaisie/usr/bin/
-
-       cp -f $(CURDIR)/lsexample/schema/lsexample.schema  $(CURDIR)/debian/ldapsaisie/etc/ldap/schema/
-       cp -f $(CURDIR)/lsexample/schema/lsexample.ldif  $(CURDIR)/debian/ldapsaisie/etc/ldap/schema/
-       
-
-# Build architecture-independent files here.
-binary-indep: build install
-       dh_installdocs
-       dh_installlogrotate
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-#      dh_installchangelogs ChangeLog
-#      dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-#      dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_usrlocal: