r2140: *** empty log message ***

diff --git a/debian/cl-sql-aodbc.dirs b/debian/cl-sql-aodbc.dirs
index 295c6526155bfc822b352f02e1143932add0e2a7..4744bb4e724eb4a8791b96d3a6fd3c3333eb7d22 100644 (file)
--- a/debian/cl-sql-aodbc.dirs
+++ b/debian/cl-sql-aodbc.dirs
@@ -3,10 +3,9 @@ usr/share
 usr/share/common-lisp
 usr/share/common-lisp/systems
 usr/share/common-lisp/source
-usr/share/common-lisp/repositories
-usr/share/common-lisp/repositories/clsql
-usr/share/common-lisp/repositories/clsql/interfaces
-usr/share/common-lisp/repositories/clsql/interfaces/aodbc
+usr/share/common-lisp/source/clsql
+usr/share/common-lisp/source/clsql/interfaces
+usr/share/common-lisp/source/clsql/interfaces/aodbc
 
 
 

diff --git a/debian/cl-sql-base.dirs b/debian/cl-sql-base.dirs
index 44f819155d120d174651484757334743907964f2..a64dd7f0637fd07ec03eb94609cf787d5ff2edee 100644 (file)
--- a/debian/cl-sql-base.dirs
+++ b/debian/cl-sql-base.dirs
@@ -3,9 +3,8 @@ usr/share
 usr/share/common-lisp
 usr/share/common-lisp/systems
 usr/share/common-lisp/source
-usr/share/common-lisp/repositories
-usr/share/common-lisp/repositories/clsql
-usr/share/common-lisp/repositories/clsql/base
-usr/share/common-lisp/repositories/clsql/interfaces
-usr/share/common-lisp/repositories/clsql/interfaces/clsql-uffi
+usr/share/common-lisp/source/clsql
+usr/share/common-lisp/source/clsql/base
+usr/share/common-lisp/source/clsql/interfaces
+usr/share/common-lisp/source/clsql/interfaces/clsql-uffi
 

diff --git a/debian/cl-sql-mysql.dirs b/debian/cl-sql-mysql.dirs
index e31bb3df6ac4ee591e40a99a5427b9eadd69cfec..3798b07d99319613e3e0c115aa1aa1f5feb63bd7 100644 (file)
--- a/debian/cl-sql-mysql.dirs
+++ b/debian/cl-sql-mysql.dirs
@@ -3,10 +3,9 @@ usr/share
 usr/share/common-lisp
 usr/share/common-lisp/systems
 usr/share/common-lisp/source
-usr/share/common-lisp/repositories
-usr/share/common-lisp/repositories/clsql
-usr/share/common-lisp/repositories/clsql/interfaces
-usr/share/common-lisp/repositories/clsql/interfaces/mysql
+usr/share/common-lisp/source/clsql
+usr/share/common-lisp/source/clsql/interfaces
+usr/share/common-lisp/source/clsql/interfaces/mysql
 
 
 

diff --git a/debian/cl-sql-postgresql-socket.dirs b/debian/cl-sql-postgresql-socket.dirs
index 5559d66e7a7f7363edea88b3c192a78d840c4d72..b9f3755e5550dde4eb9c41043871b024ff140034 100644 (file)
--- a/debian/cl-sql-postgresql-socket.dirs
+++ b/debian/cl-sql-postgresql-socket.dirs
@@ -3,10 +3,9 @@ usr/share
 usr/share/common-lisp
 usr/share/common-lisp/systems
 usr/share/common-lisp/source
-usr/share/common-lisp/repositories
-usr/share/common-lisp/repositories/clsql
-usr/share/common-lisp/repositories/clsql/interfaces
-usr/share/common-lisp/repositories/clsql/interfaces/postgresql-socket
+usr/share/common-lisp/source/clsql
+usr/share/common-lisp/source/clsql/interfaces
+usr/share/common-lisp/source/clsql/interfaces/postgresql-socket
 
 
 

diff --git a/debian/cl-sql-postgresql.dirs b/debian/cl-sql-postgresql.dirs
index 6899ab6ee7a9689996d1f08d75d9245e0132bbc9..845bc203f5c795199d91c0a1d0c16f9f95e69b9c 100644 (file)
--- a/debian/cl-sql-postgresql.dirs
+++ b/debian/cl-sql-postgresql.dirs
@@ -3,10 +3,9 @@ usr/share
 usr/share/common-lisp
 usr/share/common-lisp/systems
 usr/share/common-lisp/source
-usr/share/common-lisp/repositories
-usr/share/common-lisp/repositories/clsql
-usr/share/common-lisp/repositories/clsql/interfaces
-usr/share/common-lisp/repositories/clsql/interfaces/postgresql
+usr/share/common-lisp/source/clsql
+usr/share/common-lisp/source/clsql/interfaces
+usr/share/common-lisp/source/clsql/interfaces/postgresql
 
 
 

diff --git a/debian/cl-sql.dirs b/debian/cl-sql.dirs
index 2007d97bf43102ff641625694e08af3b0613808f..cd3a06771ab9df28c1f8c1a9234f825b89022f6d 100644 (file)
--- a/debian/cl-sql.dirs
+++ b/debian/cl-sql.dirs
@@ -3,10 +3,9 @@ usr/share
 usr/share/common-lisp
 usr/share/common-lisp/systems
 usr/share/common-lisp/source
-usr/share/common-lisp/repositories
-usr/share/common-lisp/repositories/clsql
-usr/share/common-lisp/repositories/clsql/sql
-usr/share/common-lisp/repositories/clsql/cmucl-compat
+usr/share/common-lisp/source/clsql
+usr/share/common-lisp/source/clsql/sql
+usr/share/common-lisp/source/clsql/cmucl-compat
 usr/share/doc
 usr/share/doc/cl-sql
 usr/share/doc/cl-sql/html

diff --git a/debian/rules b/debian/rules
index 136cddb14b907761ece7e5b09ae64bcd5ddca6b1..f34fbe594bc5a43b8dd83b23ae23073e48baef52 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,6 @@ INSTALLDIRFLAGS       := -d -g root -o root -m 0755
 
 clc-base       := usr/share/common-lisp
 clc-source     := $(clc-base)/source
-clc-repos      := $(clc-base)/repositories
 clc-systems    := $(clc-base)/systems
 doc-dir                := $(prefix)/usr/share/doc/cl-sql
 
@@ -76,18 +75,18 @@ install: build
        dh_installdirs
 
        # Main package
-       $(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql/sql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-source)/clsql/sql
 
        # Base
-       $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql/base
-       $(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi
-       $(INSTALL) $(INSTALLEXECFLAGS) $(srcs-base-uffi-so) $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-source)/clsql/base
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(prefix-base)/$(clc-source)/clsql/interfaces/clsql-uffi
+       $(INSTALL) $(INSTALLEXECFLAGS) $(srcs-base-uffi-so) $(prefix-base)/$(clc-source)/clsql/interfaces/clsql-uffi
 
-       $(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
-       $(INSTALL) $(INSTALLEXECFLAGS) $(srcs-mysql-so) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
-       $(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(prefix-pg)/$(clc-repos)/clsql/interfaces/postgresql
-       $(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(prefix-pg-socket)/$(clc-repos)/clsql/interfaces/postgresql-socket
-       $(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(prefix-aodbc)/$(clc-repos)/clsql/interfaces/aodbc
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-source)/clsql/interfaces/mysql
+       $(INSTALL) $(INSTALLEXECFLAGS) $(srcs-mysql-so) $(prefix-mysql)/$(clc-source)/clsql/interfaces/mysql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(prefix-pg)/$(clc-source)/clsql/interfaces/postgresql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(prefix-pg-socket)/$(clc-source)/clsql/interfaces/postgresql-socket
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(prefix-aodbc)/$(clc-source)/clsql/interfaces/aodbc
 
        # CLC Systems
        $(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(clc-systems)/
@@ -131,19 +130,13 @@ binary-arch: build install
        dh_installdocs
 #      dh_installexamples 
        dh_installchangelogs ChangeLog
-       dh_link -p $(pkg-base) $(clc-repos)/clsql $(clc-source)/clsql
-       dh_link -p $(pkg-base) $(clc-repos)/clsql $(clc-source)/clsql-base
-       dh_link -p $(pkg-mysql) $(clc-repos)/clsql $(clc-source)/clsql-mysql
-       dh_link -p $(pkg-pg) $(clc-repos)/clsql $(clc-source)/clsql-postgresql
-       dh_link -p $(pkg-pg-socket) $(clc-repos)/clsql $(clc-source)/clsql-postgresql-socket
-       dh_link -p $(pkg-aodbc) $(clc-repos)/clsql $(clc-source)/clsql-aodbc
        dh_strip
        dh_compress
        dh_fixperms
 #      dh_makeshlibs
        dh_installdeb
 #      dh_perl
-#      dh_shlibdeps
+       dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb