Add minor upstream changes; conform new debian standards

diff --git a/ChangeLog b/ChangeLog
index 72125bd675c0b6797f45508093306582d56f2508..94e7d471f99895bd66e46072ef8db4e5884740cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,7 @@
-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-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
 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 cf03688bb4b060115932e17ac44a16d3068cd630..5ad852582a228ff30d6b2b0fa9a058fa02587d13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 cl-uffi (1.6.1-1) unstable; urgency=low
 
   * New upstream
 cl-uffi (1.6.1-1) unstable; urgency=low
 
   * New upstream

+  * debian/control: Require debhelper 7. Change to new lisp section.
+  Add Vcs-Git and Homepage fields.
+  * debian/rules: Update for DH7, architecture-independent build
+  * debian/{prerm,postrm}: Remove path from binary function

 
 

- -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 25 Jul 2008 08:29:58 -0600
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 01 Aug 2009 20:38:03 -0600

 
 cl-uffi (1.6.0-1) unstable; urgency=low
 
 
 cl-uffi (1.6.0-1) unstable; urgency=low
 

diff --git a/debian/cl-uffi.doc-base b/debian/cl-uffi.doc-base
index 575bd3c2399d8e8d06e6c9a3dc4ec093c1c33ea6..3e7cad5882f369500ff74003eed58cc59e192ce6 100644 (file)
--- 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.
  use the UFFI (Universal Foreign Function Interface)
  Common Lisp library. This library supports CMUCL, SBCL,
  AllegroCL, Lispworks, SCL, OpenMCL, and MCL.

-Section: Help
+Section: Programming

 
 Format: PDF
 Files: /usr/share/doc/cl-uffi/cl-uffi.pdf.gz
 
 Format: PDF
 Files: /usr/share/doc/cl-uffi/cl-uffi.pdf.gz

diff --git a/debian/compat b/debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index e1dfee6cac68c65bd0b63206936f213d2e34a0ec..77f9f97cfc06e68ac373e94f5eda7edf9a8bdde5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,11 @@
 Source: cl-uffi
 Source: cl-uffi

-Section: devel
+Section: lisp

 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>

-Build-Depends: zlib1g-dev,debhelper (>= 4.0.0)
-Standards-Version: 3.8.0
+Build-Depends: zlib1g-dev,debhelper (>= 7.0.0)
+Standards-Version: 3.8.2.0
+Homepage: http://uffi.b9.com/
+Vcs-Git: git://git.b9.com/uffi.git

 
 Package: cl-uffi
 Architecture: all
 
 Package: cl-uffi
 Architecture: all


@@ -17,7 +19,7 @@ Description: Universal Foreign Function Library for Common Lisp
 
 Package: cl-uffi-tests
 Architecture: any
 
 Package: cl-uffi-tests
 Architecture: any

-Depends:  ${shlibs: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.
 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/postinst b/debian/postinst
index 4c7b758dc9ad5a4806b3a5c71eab581c4eddf2bb..1ed24e5acdab18adce3c8569a570d9cf2dc95ef5 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,39 +1,14 @@
 #! /bin/sh
 #! /bin/sh

-# postinst script for uffi
-#
-# see: dh_installdeb(1)
-

 set -e
 
 set -e
 

-# package name according to lisp

 LISP_PKG=uffi
 
 LISP_PKG=uffi
 

-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-

 case "$1" in
     configure)
 case "$1" in
     configure)

-       #clc-only-compatible $LISP_PKG allegro cmucl lispworks openmcl sbcl scl
-       /usr/sbin/register-common-lisp-source $LISP_PKG
+       register-common-lisp-source $LISP_PKG

     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

-

     ;;
 
     *)
     ;;
 
     *)


@@ -42,9 +17,6 @@ case "$1" in
     ;;
 esac
 
     ;;
 esac
 

-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-

 #DEBHELPER#
 
 exit 0
 #DEBHELPER#
 
 exit 0

diff --git a/debian/preinst b/debian/preinst
deleted file mode 100755 (executable)
index b83d2ac..0000000
--- a/debian/preinst
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# This is part of uffi program: 
-#    http://uffi.med-info.com
-#
-# Copyright (c) 2002 Kevin M. Rosenberg <kmr@debian.org>
-
-pkg=uffi
-dir=/usr/share/common-lisp/source/$pkg
-
-case "$1" in
-    install|upgrade|abort-upgrade)
-       # Remove any old versions
-       test -h $dir && rm $dir 
-       rm -rf ${dir}-[0-9\.]*
-       ;;
-    *)
-        echo "preinst called with unknown argument '$1'" >&2
-       ;;
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/prerm b/debian/prerm
index 293612c949485f0c4e289025533a5f9925d86408..96cfd3f487b785bcec25e694476fae9d0b1203bc 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,28 +1,11 @@
 #! /bin/sh
 #! /bin/sh

-# prerm script for uffi
-#
-# see: dh_installdeb(1)
-

 set -e
 
 set -e
 

-# package name according to lisp

 LISP_PKG=uffi
 
 LISP_PKG=uffi
 

-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-

 case "$1" in
     remove|upgrade|deconfigure)
 case "$1" in
     remove|upgrade|deconfigure)

-       /usr/sbin/unregister-common-lisp-source $LISP_PKG
+       unregister-common-lisp-source $LISP_PKG

         ;;
     failed-upgrade)
         ;;
         ;;
     failed-upgrade)
         ;;


@@ -32,9 +15,6 @@ case "$1" in
     ;;
 esac
 
     ;;
 esac
 

-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-

 #DEBHELPER#
 
 exit 0
 #DEBHELPER#
 
 exit 0

diff --git a/debian/rules b/debian/rules
index 92347b96b3e49efa69bd06344c1bb8442dad109a..8f8867f7df476983e2f68951d0a9a325f145a1f3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ pkg-tests       := $(pkg)-tests
 debpkg         := cl-$(pkg)
 debpkg-tests   := $(debpkg)-tests
 
 debpkg         := cl-$(pkg)
 debpkg-tests   := $(debpkg)-tests
 

-

 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-files      := $(clc-source)/$(pkg)
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-files      := $(clc-source)/$(pkg)


@@ -16,7 +15,6 @@ lib-dir               := usr/lib/uffi
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 configure: configure-stamp
 configure-stamp:
        dh_testdir

-       # Add here commands to configure the package.

        touch configure-stamp
 
 
        touch configure-stamp
 
 


@@ -24,7 +22,6 @@ build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
 
 build-stamp: configure-stamp 
        dh_testdir

-       # Add here commands to compile the package.

        (cd tests; make)
        touch build-stamp
 
        (cd tests; make)
        touch build-stamp
 


@@ -32,7 +29,6 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp

-       # Add here commands to clean up after the build process.

        $(MAKE) clean
        (cd tests; make clean)
        rm -f debian/$(debpkg).postinst.* debian/$(debpkg).prerm.*
        $(MAKE) clean
        (cd tests; make clean)
        rm -f debian/$(debpkg).postinst.* debian/$(debpkg).prerm.*


@@ -42,10 +38,8 @@ clean:
 install: build
        dh_testdir
        dh_testroot
 install: build
        dh_testdir
        dh_testroot

-       dh_clean -k
+       dh_prep

        dh_installdirs --all $(clc-systems) $(clc-source) 
        dh_installdirs --all $(clc-systems) $(clc-source) 

-
-       # Add here commands to install the package into debian/uffi.

        dh_installdirs -p $(debpkg) $(doc-dir) $(clc-files)/src
        dh_install $(pkg).asd $(clc-files)
        dh_install "src/*.lisp" $(clc-files)/src
        dh_installdirs -p $(debpkg) $(doc-dir) $(clc-files)/src
        dh_install $(pkg).asd $(clc-files)
        dh_install "src/*.lisp" $(clc-files)/src


@@ -66,7 +60,6 @@ install: build
        dh_install -p $(debpkg-tests) tests/*.so $(lib-dir)
        dh_link -p $(debpkg-tests) $(clc-tests)/$(pkg-tests).asd $(clc-systems)/$(pkg-tests).asd
 
        dh_install -p $(debpkg-tests) tests/*.so $(lib-dir)
        dh_link -p $(debpkg-tests) $(clc-tests)/$(pkg-tests).asd $(clc-systems)/$(pkg-tests).asd
 

-# Build architecture-independent files here.

 binary-indep: build install
        dh_testdir -i
        dh_testroot -i
 binary-indep: build install
        dh_testdir -i
        dh_testroot -i


@@ -84,7 +77,6 @@ binary-indep: build install
        dh_md5sums -i
        dh_builddeb -i
 
        dh_md5sums -i
        dh_builddeb -i
 

-# Build architecture-dependent files here.

 binary-arch: build install
        dh_testdir -a
        dh_testroot -a
 binary-arch: build install
        dh_testdir -a
        dh_testroot -a

diff --git a/debian/watch b/debian/watch
index 6082bb3fcca39afbe300ea944a16951f966bc21e..0bd04660858df37f3e5a1ed4ae6679bddd048ffe 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
 version=3

-http://files.b9.com/uffi/uffi-([\d\.]*)\.tar\.gz       debian  uupdate
+http://files.b9.com/uffi/uffi-([\d\.]*)\.tar\.gz

diff --git a/examples/c-test-fns.c b/examples/c-test-fns.c
index ed2412b210c37b4df9bb94ee7bfe4ef7de2ebb4f..5f776b87954eb6397df13948a096158e98c8c095 100644 (file)
--- a/examples/c-test-fns.c
+++ b/examples/c-test-fns.c
@@ -14,7 +14,7 @@
  * you'll need to modify these for other compilers
  ***************************************************************************/
 
  * you'll need to modify these for other compilers
  ***************************************************************************/
 

-#ifdef WIN32
+#if defined(WIN32)||defined(WIN64)

 #include <windows.h>
 
 BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll,
 #include <windows.h>
 
 BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll,

diff --git a/src/functions.lisp b/src/functions.lisp
index e4a87de697234c0cce89b3903cb08c5c5e7ef7c4..e44bc7da087fa3135acb2c3cdf8d3c8927649722 100644 (file)
--- a/src/functions.lisp
+++ b/src/functions.lisp
@@ -212,7 +212,7 @@
        ,@(if module (list :module module) (values))
        :result-type ,result-type
       :language :ansi-c
        ,@(if module (list :module module) (values))
        :result-type ,result-type
       :language :ansi-c

-       #+:win32 :calling-convention #+:win32 :cdecl)
+       #+:mswindows :calling-convention #+:mswindows :cdecl)

     #+digitool
     `(eval-when (:compile-toplevel :load-toplevel :execute)
        (ccl:define-entry-point (,lisp-name ,foreign-name)
     #+digitool
     `(eval-when (:compile-toplevel :load-toplevel :execute)
        (ccl:define-entry-point (,lisp-name ,foreign-name)

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 886464e362663a65615115b62dcf21d4115cc643..426c01942f079831160d470b5ebf047cb41ae288 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -20,16 +20,16 @@
 
 (defun default-foreign-library-type ()
   "Returns string naming default library type for platform"
 
 (defun default-foreign-library-type ()
   "Returns string naming default library type for platform"

-  #+(or win32 cygwin mswindows) "dll"
+  #+(or win32 win64 cygwin mswindows windows) "dll"

   #+(or macosx darwin ccl-5.0) "dylib"
   #+(or macosx darwin ccl-5.0) "dylib"

-  #-(or win32 cygwin mswindows macosx darwin ccl-5.0) "so"
+  #-(or win32 win64 cygwin mswindows windows macosx darwin ccl-5.0) "so"

 )
 
 (defun foreign-library-types ()
   "Returns list of string naming possible library types for platform, sorted by preference"
 )
 
 (defun foreign-library-types ()
   "Returns list of string naming possible library types for platform, sorted by preference"

-  #+(or win32 mswindows) '("dll" "lib")
+  #+(or win32 win64 windows mswindows) '("dll" "lib")

   #+(or macosx darwin ccl-5.0) '("dylib" "bundle")
   #+(or macosx darwin ccl-5.0) '("dylib" "bundle")

-  #-(or win32 mswindows macosx darwin ccl-5.0) '("so" "a" "o")
+  #-(or win32 win64 windows mswindows macosx darwin ccl-5.0) '("so" "a" "o")

 )
 
 (defun find-foreign-library (names directories &key types drive-letters)
 )
 
 (defun find-foreign-library (names directories &key types drive-letters)


@@ -44,10 +44,10 @@ library type if type is not specified."
     (setq names (list names)))
   (unless (listp directories)
     (setq directories (list directories)))
     (setq names (list names)))
   (unless (listp directories)
     (setq directories (list directories)))

-  #+(or win32 mswindows)
+  #+(or win32 win64 windows mswindows)

   (unless (listp drive-letters)
     (setq drive-letters (list drive-letters)))
   (unless (listp drive-letters)
     (setq drive-letters (list drive-letters)))

-  #-(or win32 mswindows)
+  #-(or win32 win64 windows mswindows)

   (setq drive-letters '(nil))
   (dolist (drive-letter drive-letters)
     (dolist (name names)
   (setq drive-letters '(nil))
   (dolist (drive-letter drive-letters)
     (dolist (name names)


@@ -88,8 +88,8 @@ library type if type is not specified."
           (setq filename (namestring (if (null (pathname-directory filename))
                                          filename
                                          ;; lispworks treats as UNC, so use truename
           (setq filename (namestring (if (null (pathname-directory filename))
                                          filename
                                          ;; lispworks treats as UNC, so use truename

-                                         #+(and lispworks win32) (truename filename)
-                                         #-(and lispworks win32) filename))))
+                                         #+(and lispworks mswindows) (truename filename)
+                                         #-(and lispworks mswindows) filename))))

 
       (if (and (not force-load)
                (find filename *loaded-libraries* :test #'string-equal))
 
       (if (and (not force-load)
                (find filename *loaded-libraries* :test #'string-equal))

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index f684681e0345fa5226bbbdd52fd84a0b728d0a08..0fa9cf4ec29fb1c81432b8603d92d740ea8ba177 100644 (file)
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -26,7 +26,7 @@
           "libz"
           #+(or macosx darwin)
           "z"
           "libz"
           #+(or macosx darwin)
           "z"

-          (list (pathname-directory #.(or *compile-file-truename* *load-pathname*))
+          (list (pathname-directory *load-pathname*)

                 "/usr/local/lib/" #+(or 64bit x86-64) "/usr/lib64/"
                 "/usr/lib/" "/zlib/"))
          :module "zlib"
                 "/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")
 (unless (uffi:load-foreign-library
          (uffi:find-foreign-library
           '(#+(or 64bit x86-64) "uffi-c-test64" "uffi-c-test")

-          (list (pathname-directory #.(or *compile-file-truename* *load-truename*))
+          (list (pathname-directory *load-truename*)

                 "/usr/lib/uffi/"
                 "/home/kevin/debian/src/uffi/tests/"))
          :supporting-libraries '("c")
                 "/usr/lib/uffi/"
                 "/home/kevin/debian/src/uffi/tests/"))
          :supporting-libraries '("c")

diff --git a/tests/uffi-c-test.c b/tests/uffi-c-test.c
index a8e696bde30c642de48bc1705bbd3e1aa796a5fe..5fa6b412478e305cc05a9be9930cdd7b8621b669 100644 (file)
--- a/tests/uffi-c-test.c
+++ b/tests/uffi-c-test.c
@@ -14,7 +14,7 @@
  * you'll need to modify these for other compilers
  ***************************************************************************/
 
  * you'll need to modify these for other compilers
  ***************************************************************************/
 

-#ifdef WIN32
+#if defined(WIN32)||defined(WIN64)

 #include <windows.h>
 
 BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll,
 #include <windows.h>
 
 BOOL WINAPI DllEntryPoint(HINSTANCE hinstdll,

diff --git a/uffi-tests.asd b/uffi-tests.asd
index d2221f9246e09e60667441b200491ad9c3f4556f..06577e2f0175a5f66a755a6a476d7f5c4ee653ba 100644 (file)
--- a/uffi-tests.asd
+++ b/uffi-tests.asd
@@ -7,7 +7,6 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;

-;;;; $Id$

 ;;;; *************************************************************************
 
 (defpackage #:uffi-tests-system
 ;;;; *************************************************************************
 
 (defpackage #:uffi-tests-system


@@ -49,7 +48,7 @@
 
 (defmethod perform ((o compile-op) (c uffi-test-source-file))
   (unless (operation-done-p o c)
 
 (defmethod perform ((o compile-op) (c uffi-test-source-file))
   (unless (operation-done-p o c)

-    #-(or win32 mswindows)
+    #-(or win32 win64 windows mswindows)

     (unless (zerop (run-shell-command
                    #-freebsd "cd ~A; make"
                    #+freebsd "cd ~A; gmake"
     (unless (zerop (run-shell-command
                    #-freebsd "cd ~A; make"
                    #+freebsd "cd ~A; gmake"

diff --git a/uffi.asd b/uffi.asd
index ab174172024a5c567c425e6b151bed791fd74cc9..ddcf338210d3c8a2dfbffd095aff3323db577b17 100644 (file)
--- a/uffi.asd
+++ b/uffi.asd
@@ -7,9 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;

-;;;; $Id$
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2009 by Kevin M. Rosenberg

 ;;;;
 ;;;; *************************************************************************
 
 ;;;;
 ;;;; *************************************************************************