X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=4ee900c256e45322d3d6cb6811de955c25300f81;hb=1c85d4d2cf54f769d9c410c847b648f6c521e5ce;hp=f667c90d624cd6c5059c22e28454987bd73459cc;hpb=6357081d09842a2f08efcfb22f815d008408f017;p=clsql.git

diff --git a/debian/rules b/debian/rules
index f667c90..4ee900c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,43 +12,44 @@ plain-pkg	:= clsql
 
 pkg		:= cl-sql
 pkg-base	:= cl-sql-base
+pkg-uffi	:= cl-sql-uffi
 pkg-mysql	:= cl-sql-mysql
 pkg-pg		:= cl-sql-postgresql
 pkg-pg-socket	:= cl-sql-postgresql-socket
 pkg-aodbc	:= cl-sql-aodbc
-all-pkgs	:= $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
+all-pkgs	:= $(pkg) $(pkg-base) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
 
 
-UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1)
+UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)
 
 ## Lisp sources
-srcs		:= $(wildcard sql/*.cl)
-srcs-base	:= $(wildcard base/*.cl)
-srcs-base-uffi	:= $(wildcard interfaces/clsql-uffi/*.cl) 
-srcs-base-uffi-so:= $(wildcard interfaces/clsql-uffi/*.so)
-srcs-mysql	:= $(wildcard interfaces/mysql/*.cl)
-srcs-mysql-so	:=  $(wildcard interfaces/mysql/*.so)
-srcs-pg		:= $(wildcard interfaces/postgresql/*.cl)
-srcs-pg-socket	:= $(wildcard interfaces/postgresql-socket/*.cl)
-srcs-aodbc	:= $(wildcard interfaces/aodbc/*.cl)
+srcs		:= $(wildcard clsql/*.cl)
+srcs-base	:= $(wildcard clsql-base/*.cl)
+srcs-base-uffi	:= $(wildcard clsql-uffi/*.cl) 
+srcs-base-uffi-so:= $(wildcard clsql-uffi/*.so)
+srcs-mysql	:= $(wildcard clsql-mysql/*.cl)
+srcs-mysql-so	:=  $(wildcard clsql-mysql/*.so)
+srcs-pg		:= $(wildcard clsql-postgresql/*.cl)
+srcs-pg-socket	:= $(wildcard clsql-postgresql-socket/*.cl)
+srcs-aodbc	:= $(wildcard clsql-aodbc/*.cl)
 
 clc-base	:= usr/share/common-lisp
 clc-source	:= $(clc-base)/source
 clc-systems	:= $(clc-base)/systems
 doc-dir		:= usr/share/doc/cl-sql-base
 
-clc-clsql	:= $(clc-source)/$(plain-pkg)-$(UPSTREAM_VER)
+#clc-clsql	:= $(clc-source)/$(plain-pkg)-$(UPSTREAM_VER)
+clc-clsql	:= $(clc-source)/$(plain-pkg)
 
-lispdir		:= $(clc-clsql)
-lispdir-sql	:= $(clc-clsql)/sql
-lispdir-base	:= $(clc-clsql)/base
-lispdir-base-uffi := $(clc-clsql)/interfaces/clsql-uffi
+lispdir-sql	:= $(clc-source)/clsql
+lispdir-base	:= $(clc-source)/clsql-base
+lispdir-base-uffi := $(clc-source)/clsql-uffi
 sodir-base-uffi := usr/lib/clsql
-lispdir-mysql	:= $(clc-clsql)/interfaces/mysql
+lispdir-mysql	:= $(clc-source)/clsql-mysql
 sodir-mysql	:= usr/lib/clsql
-lispdir-pg	:= $(clc-clsql)/interfaces/postgresql
-lispdir-pg-socket := $(clc-clsql)/interfaces/postgresql-socket
-lispdir-aodbc	:= $(clc-clsql)/interfaces/aodbc
+lispdir-pg	:= $(clc-source)/clsql-postgresql
+lispdir-pg-socket := $(clc-source)/clsql-postgresql-socket
+lispdir-aodbc	:= $(clc-source)/clsql-aodbc
 
 
 configure: configure-stamp
@@ -81,7 +82,8 @@ install: build
 	dh_installdirs --all  $(clc-systems) $(clc-source)
 
 	dh_installdirs -p $(pkg) $(lispdir-sql)
-	dh_installdirs -p $(pkg-base) $(lispdir-base) $(lispdir-base-uffi) $(sodir-base-uffi)
+	dh_installdirs -p $(pkg-base) $(lispdir-base)
+	dh_installdirs -p $(pkg-uffi) $(lispdir-base-uffi) $(sodir-base-uffi)
 	dh_installdirs -p $(pkg-pg) $(lispdir-pg)
 	dh_installdirs -p $(pkg-pg-socket) $(lispdir-pg-socket)
 	dh_installdirs -p $(pkg-mysql) $(lispdir-mysql) $(sodir-mysql)
@@ -92,18 +94,22 @@ install: build
 
 	# Base
 	dh_install -p $(pkg-base) $(srcs-base) $(lispdir-base)
-	dh_install -p $(pkg-base) $(srcs-base-uffi) $(lispdir-base-uffi)
-	dh_install -p $(pkg-base) $(srcs-base-uffi-so) $(sodir-base-uffi)
 
+	# UFFI
+	dh_install -p $(pkg-uffi) $(srcs-base-uffi) $(lispdir-base-uffi)
+	dh_install -p $(pkg-uffi) $(srcs-base-uffi-so) $(sodir-base-uffi)
+
+	# Backends
 	dh_install -p $(pkg-mysql) $(srcs-mysql) $(lispdir-mysql)
 	dh_install -p $(pkg-mysql) $(srcs-mysql-so) $(sodir-mysql)
 	dh_install -p $(pkg-pg) $(srcs-pg) $(lispdir-pg)
 	dh_install -p $(pkg-pg-socket) $(srcs-pg-socket) $(lispdir-pg-socket)
-	dh_install -p $(pkg-pg-socket) $(srcs-aodbc) $(lispdir-pg-aodbc)
+	dh_install -p $(pkg-aodbc) $(srcs-aodbc) $(lispdir-aodbc)
 
 	# CLC Systems
-	dh_install -p $(pkg) $(INSTALLFLAGS) clsql.system $(clc-systems)
-	dh_install -p $(pkg-base) clsql-base.system clsql-uffi.system $(clc-systems)
+	dh_install -p $(pkg) clsql.system $(clc-systems)
+	dh_install -p $(pkg-base) clsql-base.system $(clc-systems)
+	dh_install -p $(pkg-uffi) clsql-uffi.system $(clc-systems)
 	dh_install -p $(pkg-mysql) clsql-mysql.system $(clc-systems)
 	dh_install -p $(pkg-pg) clsql-postgresql.system $(clc-systems)
 	dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.system $(clc-systems)
@@ -124,14 +130,15 @@ install: build
 	dh_install -p $(pkg) doc/cl-sql.pdf.gz $(doc-dir)
 	rm -f doc/cl-sql.pdf.gz
 
-#	From UncommonSQL Debian package: build prerm postinst from templates
 	set -e ;\
 	for p in $(all-pkgs); do \
                 echo "processing maintainer scripts for $$p" ;\
 		l=`echo $$p | sed -e "s/^cl-/cl/;"` ;\
+		sed -e "s/%%/$$l/;" debian/preinst.template > debian/$$p.preinst ;\
 		sed -e "s/%%/$$l/;" debian/prerm.template > debian/$$p.prerm ;\
 		sed -e "s/%%/$$l/;" debian/postinst.template > debian/$$p.postinst ;\
-		chmod +x debian/$$p.prerm debian/$$p.prerm; \
+		chown root.root debian/$$p.prerm debian/$$p.prerm debian/$$p.preinst; \
+		chmod +x debian/$$p.prerm debian/$$p.prerm debian/$$p.preinst; \
 	done
 
 
@@ -148,12 +155,6 @@ binary-arch: build install
 	dh_installdocs
 #	dh_installexamples 
 	dh_installchangelogs ChangeLog
-	dh_link -p $(pkg-base) $(clc-clsql) $(clc-source)/clsql
-	dh_link -p $(pkg-base) $(clc-clsql) $(clc-source)/clsql-base
-	dh_link -p $(pkg-mysql) $(clc-clsql) $(clc-source)/clsql-mysql
-	dh_link -p $(pkg-pg) $(clc-clsql) $(clc-source)/clsql-postgresql
-	dh_link -p $(pkg-pg-socket) $(clc-clsql) $(clc-source)/clsql-postgresql-socket
-	dh_link -p $(pkg-aodbc) $(clc-clsql) $(clc-source)/clsql-aodbc
 	dh_strip
 	dh_compress
 	dh_fixperms