X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=debian%2Frules;h=b302d9039c28288baed8264bae06207dceac049f;hb=f3a0e7f138048b6d78f2a659754437870f75e0fc;hp=ba1daf98444a879ccfdcb91f03ca4875cf4a98bc;hpb=6855525e48fad5de270500a5445c4f4ff85d8bda;p=diogenes.git

diff --git a/debian/rules b/debian/rules
index ba1daf9..b302d90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
-# definitions
-SCRIPTDIR := usr/share/diogenes/scripts
-
 # documentation
 DEB_INSTALL_DOCS_ALL :=
 DEB_INSTALL_DOCS_diogenes := AUTHORS README
@@ -20,21 +17,22 @@ DEB_INSTALL_DIRS_diogenes := etc/diogenes var/lib/diogenes var/spool/diogenes/te
 
 binary-install/diogenes::
 	# config
-	dh_install -X.arch-ids -pdiogenes debian/diogenes.debian.inc.php \
-			      debian/diogenes.config.inc.php \
-	                      config/apache.conf \
-			      usr/share/diogenes/config
+	dh_install -pdiogenes debian/diogenes.debian.inc.php \
+		debian/diogenes.config.inc.php \
+		config/apache.conf \
+		usr/share/diogenes/config
 	
-	# files for db installation
-	dh_install -X.arch-ids -pdiogenes config/updatedb.php $(SCRIPTDIR)
-	cat debian/prefix.sql config/db/diogenes.sql > debian/diogenes/$(SCRIPTDIR)/diogenes.tables.sql.in
-	cat debian/prefix.sql config/db/diogenes.logactions.sql > debian/diogenes/$(SCRIPTDIR)/diogenes.logactions.sql.in
-
 	# PHP files, templates, locales et al.
-	dh_install -X.arch-ids -pdiogenes -Xdiogenes.globals.inc.php.in \
-	                       cvs.pl style.css \
-	                       htdocs include locale plugins templates \
-			       usr/share/diogenes
+	dh_install -X.svn -pdiogenes -Xdiogenes.globals.inc.php.in \
+		cvs.pl \
+		htdocs include locale plugins scripts styles templates \
+		usr/share/diogenes
+	
+	# files for db installation
+	cat debian/prefix.sql config/db/diogenes.sql \
+	  > debian/diogenes/usr/share/diogenes/scripts/diogenes.tables.sql.in
+	cat debian/prefix.sql config/db/diogenes.logactions.sql \
+	  > debian/diogenes/usr/share/diogenes/scripts/diogenes.logactions.sql.in
 	
 	# remove library files
 	rm -rf debian/diogenes/usr/share/diogenes/include/diogenes
@@ -42,6 +40,6 @@ binary-install/diogenes::
 binary-install/libphp-diogenes::
 
 	# PHP files and templates
-	dh_install -X.arch-ids -plibphp-diogenes include/diogenes/*.php usr/share/php/diogenes
-	dh_install -X.arch-ids -plibphp-diogenes include/diogenes/templates usr/share/php/diogenes
+	dh_install -X.svn -plibphp-diogenes include/diogenes/*.php usr/share/php/diogenes
+	dh_install -X.svn -plibphp-diogenes include/diogenes/templates usr/share/php/diogenes