Merge branch 'master' of http://git.kpe.io/clsql

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index de42b71c529f37c4c0eddf1e8b0082c6e4b8f4db..cf7c71d45acca342dbf693856d55e08d8d2a55a4 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -71,7 +71,7 @@ else
            -gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) $(LDFLAGS32) -o $(shared_lib)
           else
            gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
-           gcc -m32 $(LDFLAGS) -fPIC  -shared -Wl,-soname=$(base) -lc $(object) $(LDFLAGS) -o $(shared_lib)
+           gcc -fPIC -shared -Wl,-soname=$(base)  $(object) $(LDFLAGS) -o $(shared_lib)
           endif
         endif
       endif

diff --git a/debian/changelog b/debian/changelog
index 4d133fb30a50839631d8d8b557592f13ff8b071c..62869f7c342db361adaba0c771701ab4d3c823c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+cl-sql (6.6.3-3) unstable; urgency=medium
+
+  * debian/rules: Separate install target to install-indep and
+    install-arch (closes:806609)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 10 Dec 2015 12:35:59 -0700
+
+cl-sql (6.6.3-2) unstable; urgency=medium
+
+  * Improve building/linking on non-AMD64 architectures, thanks to
+  Edmund Grimley Evans and Dejan Latinovic (closes:798017)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 10 Dec 2015 12:10:32 -0700
+
 cl-sql (6.6.3-1) unstable; urgency=medium
 
   * New upstream

diff --git a/debian/control b/debian/control
index 8a681c1b911147044c8b1912322596b2656b96cc..ca4c4df79ae7ab4df6e954c6c337433877e34f2c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: lisp
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: dh-lisp, debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.5.0
 Homepage: http://clsql.kpe.io/
 Vcs-Git: git://git.kpe.io/clsql.git
 Vcs-Browser: http://git.kpe.io/?p=clsql.git

diff --git a/debian/rules b/debian/rules
index 74d450051afb07ddc0116befc80c58b0294b4efa..58529cb9cafaf587d6dde30f4a2d6b476e0001e8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -85,19 +85,17 @@ clean:
        rm -rf doc/html
        dh_clean
 
-install: DH_OPTIONS=
-install: build
+install: DH_OPTIONS= install-indep install-arch
+
+install-indep: 
        dh_testdir
        dh_testroot
        dh_prep
        dh_installdirs
-
        dh_installdirs --all $(clc-source)
        dh_installdirs -p $(pkg) $(lispdir-sql) etc
-       dh_installdirs -p $(pkg-uffi) $(lispdir-uffi) $(sodir-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)
        dh_installdirs -p $(pkg-aodbc) $(lispdir-aodbc)
        dh_installdirs -p $(pkg-odbc) $(lispdir-odbc)
        dh_installdirs -p $(pkg-sqlite) $(lispdir-sqlite)
@@ -110,15 +108,6 @@ install: build
        dh_install -p $(pkg) clsql.asd $(clc-clsql)
        dh_install -p $(pkg) debian/clsql-init.lisp etc
 
-       # UFFI
-       dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
-       dh_install -p $(pkg-uffi) $(srcs-uffi-so) $(sodir-uffi)
-       dh_install -p $(pkg-uffi) clsql-uffi.asd $(clc-uffi)
-
-       # Backends
-       dh_install -p $(pkg-mysql) $(srcs-mysql) $(lispdir-mysql)
-       dh_install -p $(pkg-mysql) clsql-mysql.asd $(clc-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) clsql-postgresql.asd $(clc-pg)
        dh_install -p $(pkg-pg-socket) $(srcs-pg-socket) $(lispdir-pg-socket)
@@ -141,7 +130,26 @@ install: build
        rm -rf doc/html
        (cd doc; tar xzf html.tar.gz; cd ..)
 
-binary-indep: install
+install-arch: 
+       dh_testdir
+       dh_testroot
+       dh_prep
+       dh_installdirs
+
+       dh_installdirs -p $(pkg-uffi) $(lispdir-uffi) $(sodir-uffi)
+       dh_installdirs -p $(pkg-mysql) $(lispdir-mysql) $(sodir-mysql)
+
+       # UFFI
+       dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
+       dh_install -p $(pkg-uffi) $(srcs-uffi-so) $(sodir-uffi)
+       dh_install -p $(pkg-uffi) clsql-uffi.asd $(clc-uffi)
+
+       # Backends
+       dh_install -p $(pkg-mysql) $(srcs-mysql) $(lispdir-mysql)
+       dh_install -p $(pkg-mysql) clsql-mysql.asd $(clc-mysql)
+       dh_install -p $(pkg-mysql) $(srcs-mysql-so) $(sodir-mysql)
+
+binary-indep: install-indep
        dh_testdir -i
        dh_testroot -i
        dh_installdocs -i -p $(pkg) doc/html doc/clsql.pdf
@@ -155,7 +163,7 @@ binary-indep: install
        dh_md5sums -i
        dh_builddeb -i
 
-binary-arch: install
+binary-arch: install-arch
        dh_testdir -a
        dh_testroot -a
        dh_installdocs -a