From f5e6a5198989a460c4787041830d66fa76ebcdab Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Fri, 25 Jul 2008 09:35:12 -0600 Subject: [PATCH] * tests/foreign-loader.lisp: Commit patch from Luis Oliveira to use directory of *compile-file-truename* --- ChangeLog | 6 +++++- debian/changelog | 6 ++++++ debian/cl-uffi.doc-base | 4 +--- debian/control | 4 ++-- debian/rules | 23 +---------------------- tests/foreign-loader.lisp | 4 ++-- 6 files changed, 17 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94e7d47..72125bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ +2008-07-25 Kevin Rosenberg (kevin@rosenberg.net) + * tests/foreign-loader.lisp: Commit patch from Luis Oliveira + to use directory of *compile-file-truename* + 2007-09-17 Kevin Rosenberg (kevin@rosenberg.net) * doc/Makefile, doc/html.xsl: Change output encoding from ISO-8859-1 to UTF-8 - + 2007-07-22 Kevin Rosenberg (kevin@rosenberg.net) * Version 1.6.0 (SPECIFICATION CHANGE) * doc/ref_func_libr.xml: Change the specification of diff --git a/debian/changelog b/debian/changelog index 3aa3f9a..cf03688 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-uffi (1.6.1-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Fri, 25 Jul 2008 08:29:58 -0600 + cl-uffi (1.6.0-1) unstable; urgency=low * New upstream (closes: 433814) diff --git a/debian/cl-uffi.doc-base b/debian/cl-uffi.doc-base index 1f1fdea..575bd3c 100644 --- a/debian/cl-uffi.doc-base +++ b/debian/cl-uffi.doc-base @@ -5,7 +5,7 @@ Abstract: This manual describes the use the UFFI (Universal Foreign Function Interface) Common Lisp library. This library supports CMUCL, SBCL, AllegroCL, Lispworks, SCL, OpenMCL, and MCL. -Section: programming +Section: Help Format: PDF Files: /usr/share/doc/cl-uffi/cl-uffi.pdf.gz @@ -13,5 +13,3 @@ Files: /usr/share/doc/cl-uffi/cl-uffi.pdf.gz Format: HTML Index: /usr/share/doc/cl-uffi/html/index.html Files: /usr/share/doc/cl-uffi/html/*.html - - diff --git a/debian/control b/debian/control index 166d89e..e1dfee6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Kevin M. Rosenberg Build-Depends: zlib1g-dev,debhelper (>= 4.0.0) -Standards-Version: 3.7.2.2 +Standards-Version: 3.8.0 Package: cl-uffi Architecture: all @@ -17,7 +17,7 @@ Description: Universal Foreign Function Library for Common Lisp Package: cl-uffi-tests Architecture: any -Depends: common-lisp-controller (>= 3.37), cl-uffi, zlib1g-dev +Depends: ${shlibs:Depends}, common-lisp-controller (>= 3.37), cl-uffi, zlib1g-dev Description: Regression tests for UFFI Common Lisp Library This is a test of regression tests for UFFI. Besides providing testing for UFFI, the tests serve as an example of UFFI usage. diff --git a/debian/rules b/debian/rules index 07fc4a2..92347b9 100755 --- a/debian/rules +++ b/debian/rules @@ -70,25 +70,16 @@ install: build binary-indep: build install dh_testdir -i dh_testroot -i -# dh_installdebconf -i dh_installdocs -i dh_installexamples -i examples/*.lisp dh_installmenu -i -# dh_installlogrotate -i -# dh_installemacsen -i -# dh_installpam -i -# dh_installmime -i -# dh_installinit -i dh_installcron -i -# dh_installman -i dh_installinfo -i -# dh_undocumented -i dh_installchangelogs ChangeLog -i dh_link -i dh_compress -i dh_fixperms -i dh_installdeb -i -# dh_perl -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i @@ -97,19 +88,7 @@ binary-indep: build install binary-arch: build install dh_testdir -a dh_testroot -a -# dh_installdebconf -a dh_installdocs -a -# dh_installlogrotate -a -# dh_installemacsen -a -# dh_installpam -a -# dh_installmime -a -# dh_installinit -a -# dh_installcron -a -# dh_installman -a -# dh_installinfo -a -# dh_undocumented -a -# dh_makeshlibs -a -# dh_perl -a dh_installchangelogs ChangeLog -a dh_strip -a dh_link -a @@ -117,8 +96,8 @@ binary-arch: build install dh_fixperms -a dh_installmenu -a dh_installdeb -a - dh_gencontrol -a dh_shlibdeps -a + dh_gencontrol -a dh_md5sums -a dh_builddeb -a diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp index 0fa9cf4..f684681 100644 --- a/tests/foreign-loader.lisp +++ b/tests/foreign-loader.lisp @@ -26,7 +26,7 @@ "libz" #+(or macosx darwin) "z" - (list (pathname-directory *load-pathname*) + (list (pathname-directory #.(or *compile-file-truename* *load-pathname*)) "/usr/local/lib/" #+(or 64bit x86-64) "/usr/lib64/" "/usr/lib/" "/zlib/")) :module "zlib" @@ -38,7 +38,7 @@ (unless (uffi:load-foreign-library (uffi:find-foreign-library '(#+(or 64bit x86-64) "uffi-c-test64" "uffi-c-test") - (list (pathname-directory *load-truename*) + (list (pathname-directory #.(or *compile-file-truename* *load-truename*)) "/usr/lib/uffi/" "/home/kevin/debian/src/uffi/tests/")) :supporting-libraries '("c") -- 2.34.1