r2015: *** empty log message ***

diff --git a/debian/cl-sql-base.dirs b/debian/cl-sql-base.dirs
index 0a661a733a87b6abe5acbe189326fd829b35e8f1..7133f9e01946f9622c9fd5ac305fa0e7988512bb 100644 (file)
--- a/debian/cl-sql-base.dirs
+++ b/debian/cl-sql-base.dirs
@@ -5,6 +5,7 @@ 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/interfaces
 usr/share/common-lisp/repositories/clsql/interfaces/clsql-uffi
 

diff --git a/debian/cl-sql.dirs b/debian/cl-sql.dirs
index 3ecf5f11ca34d9b04cbecb122c0a2137dd65e365..2007d97bf43102ff641625694e08af3b0613808f 100644 (file)
--- a/debian/cl-sql.dirs
+++ b/debian/cl-sql.dirs
@@ -5,6 +5,7 @@ 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/doc
 usr/share/doc/cl-sql

diff --git a/debian/rules b/debian/rules
index 76b0c68804ceb344e51a73adc00089f04b356105..c97f8cfcf46e694529d56d31ea963f6c9e850b9e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -74,11 +74,11 @@ install: build
        dh_installdirs
 
        # Main package
-       $(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql/sql
        $(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat
 
        # Base
-       $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql/sql
        $(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi
 
        $(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
@@ -86,12 +86,6 @@ install: build
        $(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
 
-       dh_link ../repositories/clsql $(prefix)/$(clc-source)/clsql
-       dh_link ../repositories/clsql $(prefix-base)/$(clc-source)/clsql-base
-       dh_link ../repositories/clsql $(prefix-mysql)/$(clc-source)/clsql-mysql
-       dh_link ../repositories/clsql $(prefix-pg)/$(clc-source)/clsql-postgresql
-       dh_link ../repositories/clsql $(prefix-pg-socket)/$(clc-source)/clsql-postgresql-socket
-       dh_link ../repositories/clsql $(prefix-aodbc)/$(clc-source)/clsql-aodbc
 
        # CLC Systems
        $(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(clc-systems)/
@@ -134,18 +128,13 @@ binary-arch: build install
 #      dh_installdebconf       
        dh_installdocs
 #      dh_installexamples 
-#      dh_installmenu
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installman
-#      dh_installinfo
-#      dh_undocumented
        dh_installchangelogs ChangeLog
-       dh_link
+       dh_link ../repositories/clsql $(prefix)/$(clc-source)/clsql
+       dh_link ../repositories/clsql $(prefix-base)/$(clc-source)/clsql-base
+       dh_link ../repositories/clsql $(prefix-mysql)/$(clc-source)/clsql-mysql
+       dh_link ../repositories/clsql $(prefix-pg)/$(clc-source)/clsql-postgresql
+       dh_link ../repositories/clsql $(prefix-pg-socket)/$(clc-source)/clsql-postgresql-socket
+       dh_link ../repositories/clsql $(prefix-aodbc)/$(clc-source)/clsql-aodbc
        dh_strip
        dh_compress
        dh_fixperms