r1816: debian updates

diff --git a/debian/control b/debian/control
index 7822ce96ec563419533fb72bbeea822b0a3a7e6d..2f8481090c0c3b0309ff26a49ff56271deaf1f75 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cl-uffi
 Section: devel
 Priority: optional
 Maintainer: Kevin Rosenberg <kevin@rosenberg.net>
-Build-Depends: debhelper (>> 3.0.0)
+Build-Depends-Indep: debhelper (>> 3.0.0)
 Standards-Version: 3.5.2
 
 Package: cl-uffi

diff --git a/debian/postinst b/debian/postinst
index eceeca2690e626b647ce17279db08bb11146e534..b3dd8b6d5cf496d4ffa9f0c2832dc1ca5eafcc18 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,7 +6,7 @@
 set -e
 
 # package name according to lisp
-LISP_PKG=%%
+LISP_PKG=uffi
 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
@@ -28,6 +28,7 @@ LISP_PKG=%%
 
 case "$1" in
     configure)
+       ln -sf ../repositories/uffi /usr/share/common-lisp/source/uffi
        /usr/sbin/register-common-lisp-source ${LISP_PKG}
 
     ;;

diff --git a/debian/prerm b/debian/prerm
index ef7d09fdedd961fbcc25016bd761c64646f193cf..86f8f665aeaa7868187eca291a69c4363944f2ff 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -6,7 +6,7 @@
 set -e
 
 # package name according to lisp
-LISP_PKG=%%
+LISP_PKG=uffi
 
 # summary of how this script can be called:
 #        * <prerm> `remove'
@@ -23,6 +23,7 @@ LISP_PKG=%%
 case "$1" in
     remove|upgrade|deconfigure)
        /usr/sbin/unregister-common-lisp-source ${LISP_PKG}
+       rm -rf /usr/share/common-lisp/source/uffi /usr/share/common-lisp/repositories/uffi
         ;;
     failed-upgrade)
         ;;

diff --git a/debian/rules b/debian/rules
index 8a02b4198880b4b3fd9ac94d5b4f682d0b5a1922..84910cc08a2b479b68b5251bdf1656ff536943c8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,8 @@ INSTALL       := install
 INSTALLFLAGS   := -g root -o root -m 0644
 INSTALLDIRFLAGS        := -d -g root -o root -m 0755
 
-SOURCESDEST    := $(prefix)/usr/share/common-lisp/repositories/uffi
+SOURCEDIR      := $(prefix)/usr/share/common-lisp/source
+REPOSITORYDIR  := $(prefix)/usr/share/common-lisp/repositories/uffi
 SYSDIR         := $(prefix)/usr/share/common-lisp/systems
 DOCDIR         := $(prefix)/usr/share/doc/cl-uffi
 
@@ -56,11 +57,11 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/uffi.
-       $(INSTALL) $(INSTALLDIRFLAGS) $(SOURCESDEST) $(SOURCESDEST)/mcl $(SYSDIR) $(DOCDIR) $(DOCDIR)/html
+       $(INSTALL) $(INSTALLDIRFLAGS) $(REPOSITORYDIR) $(REPOSITORYDIR)/mcl $(SYSDIR) $(DOCDIR) $(DOCDIR)/html $(SOURCEDIR)
        $(INSTALL) $(INSTALLFLAGS) uffi.system.debian $(SYSDIR)
        mv $(SYSDIR)/uffi.system.debian $(SYSDIR)/uffi.system
-       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl) $(SOURCESDEST)
-       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(SOURCESDEST)/mcl
+       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl) $(REPOSITORYDIR)
+       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(REPOSITORYDIR)/mcl
        $(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html
        cp doc/uffi.ps doc/cl-uffi.ps
        rm -f doc/cl-uffi.ps.gz
@@ -70,7 +71,8 @@ install: build
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+
+
 
 # Build architecture-dependent files here.
 binary-arch: build install

diff --git a/doc/Makefile b/doc/Makefile
index 8f18094b85a96f2f06e9f66ea3e3b6a5bdd90968..6b377ebba8c3068320025ecbcb9fab306a472c5e 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.17 2002/04/28 04:08:22 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.18 2002/04/28 06:03:13 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -103,11 +103,11 @@ ${PSFILE}: ${DVIFILE}
 clean: 
        @rm -rf html
        @rm -f *~ *.bak *.orig "#*"
-       @rm -f ${PSFILE} ${PDFFILE} ${DVIFILE} ${TEXFILE}
        @rm -f ${TMPFILES}
 
 .PHONY: distclean
 distclean: clean
+       @rm -f ${PSFILE} ${PDFFILE} ${DVIFILE} ${TEXFILE}
 
 
 

diff --git a/src/primitives.cl b/src/primitives.cl
index c61f6dd21680d7dc67ed3a25539726c47662af2d..009c1fcf8b974ebbf37b025edea42041154dc764 100644 (file)
--- a/src/primitives.cl
+++ b/src/primitives.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.cl,v 1.16 2002/04/06 19:53:08 kevin Exp $
+;;;; $Id: primitives.cl,v 1.17 2002/04/28 06:03:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -68,9 +68,10 @@ supports takes advantage of this optimization."
       )
   "Conversions in CMUCL or def-foreign-type are different thatn in def-function")
 
+(defparameter +type-conversion-list+ nil)
 
 #+cmu
-(defconstant +type-conversion-list+
+(setq +type-conversion-list+
     '((* . *) (:void . c-call:void) 
       (:short . c-call:short)
       (:pointer-void . (* t))
@@ -85,7 +86,7 @@ supports takes advantage of this optimization."
       (:float . c-call:float) (:double . c-call:double)
       (:array . alien:array)))
 #+allegro
-(defconstant +type-conversion-list+
+(setq +type-conversion-list+
     '((* . *) (:void . :void)
       (:short . :short)
       (:pointer-void . (* :void))
@@ -98,7 +99,7 @@ supports takes advantage of this optimization."
       (:float . :float) (:double . :double)
       (:array . :array)))
 #+lispworks
-(defconstant +type-conversion-list+
+(setq +type-conversion-list+
     '((* . :pointer) (:void . :void) 
       (:short . :short)
       (:pointer-void . (:pointer :void))

diff --git a/src/strings.cl b/src/strings.cl
index 8bd95bd243e54bd1143cc8e4cef3a559a537f5ad..06ffa5226edcc5e166b4291bc3416ef39bb674d5 100644 (file)
--- a/src/strings.cl
+++ b/src/strings.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.cl,v 1.17 2002/04/06 19:53:08 kevin Exp $
+;;;; $Id: strings.cl,v 1.18 2002/04/28 06:03:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,9 @@
 (def-constant +null-cstring-pointer+
     #+cmu nil
     #+allegro 0
-    #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char)))
+    #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char))
+    #-(or cmu allegro lispworks) nil
+)
 
 (defmacro convert-from-cstring (obj)
   "Converts a string from a c-call. Same as convert-from-foreign-string, except

diff --git a/uffi.system.debian b/uffi.system.debian
index 42ba5664c3ff8b6ce97e059e0e4ad674862d09c0..16f7d8c8fe6c27ea71209653a19943de4f76b808 100644 (file)
--- a/uffi.system.debian
+++ b/uffi.system.debian
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: uffi.system.debian,v 1.1 2002/04/28 03:52:01 kevin Exp $
+;;;; $Id: uffi.system.debian,v 1.2 2002/04/28 06:03:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,14 +20,11 @@
 (in-package :mk)
 
 
-
 ;;; UFFI system definition
 
 (mk:defsystem :uffi
-    :source-pathname 
-    #+(or cmu allegro lispworks) "cl-library:"
-    #+mcl "cl-library:mcl;"
-    #-(or cmu allegro lispworks) nil    
+    :source-pathname #-mcl "cl-library:uffi;"
+                     #+mcl "cl-library:uffi;mcl;"
     :source-extension "cl"
     :components 
     ((:file "package")