Fix location of source files in debian

diff --git a/debian/control b/debian/control
index e06e309cc408fb4e251878f994ff1ab0971e031f..34fb937746184c573dafdd1fdd755a41fd43740a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends-Indep: dh-lisp
 Build-Depends: debhelper (>= 7.0.0)
-Depends: cl-kmrcl
 Standards-Version: 3.9.2.0
 Homepage: http://files.b9.com/memstore/
 Vcs-Git: git://git.b9.com/memstore.git
@@ -12,8 +11,8 @@ Vcs-Browser: http://git.b9.com/?p=memstore.git
 
 Package: cl-memstore
 Architecture: all
-Depends: ${misc:Depends}, cl-rt
+Depends: ${misc:Depends}, cl-rt, cl-kmrcl
 Description: Memstore library for Common Lisp Programs
  This package contains the Common Lisp memstore library.
  This library provides high-level object serialization, including
- optional compression as well as an interface to the memcached protcol.
+ optional compression as well as an interface to the memcached protocol.

diff --git a/debian/rules b/debian/rules
index bd47a3df8e98d37ab264e26cf27884521316bed2..ee21ed1343c3af248784b524382740a5b058128a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,11 @@
 #!/usr/bin/make -f
 
 pkg            := memstore
-pkg-tests      := $(pkg)-tests
 debpkg         := cl-$(pkg)
 
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-files      := $(clc-source)/$(pkg)
-clc-tests      := $(clc-source)/$(pkg-tests)
-
-tests-files    := tests.lisp
-source-files   := $(filter-out $(tests-files),$(wildcard *.lisp))
 
 
 build: build-arch build-indep
@@ -29,8 +24,9 @@ install: build
        dh_testroot
        dh_prep
        dh_installdirs
-       dh_install $(pkg).asd $(source-files) $(clc-files)
-       dh_install $(pkg-tests).asd $(tests-files) $(clc-tests)
+       dh_install $(pkg).asd $(pkg)-tests.asd memcache.asd $(clc-systems)
+       dh_install src/*.lisp $(clc-source)/$(pkg)/src
+       dh_install memcache/*.lisp $(clc-source)/$(pkg)/memcache
 
 binary-indep: install
        dh_testdir