Require SBCL; use autotools-dev

3 files changed, 9 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 177a06a..22ff725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,12 +8,14 @@ open-axiom (1.5.0~svn3056-1) unstable; urgency=low
     requires aclocal 1.13
   * Do not patch configure.ac, but override variables in Makefiles (due to
     automake 1.13 too)
-  * Use Clisp if SBCL is not available (currently !i386 !amd64 !kfreebsd-amd64)
+  * Require SBCL
   * Enable hardening (include /usr/share/dpkg/buildflags.mk for build flags)
   * Use dh-buildinfo
   * Override hardening-no-relro on usr/lib/open-axiom/bin/AXIOMsys
+  * Build depends on autotools-dev to update config.*
+  * Bump standards version 3.9.3 → 3.9.4, no changes
 
- -- Igor Pashev <pashev.igor@gmail.com>  Mon, 02 Sep 2013 00:23:30 +0400
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 26 Oct 2013 16:47:53 +0400
 
 open-axiom (1.4.1+svn~2626-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 85b035a..8fea069 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
  debhelper ( >= 8 ),
- sbcl ( >= 1:1.0.30 ) [i386 amd64 kfreebsd-amd64],
- clisp ( >= 1:2.44 ) [!i386 !amd64 !kfreebsd-amd64],
+ sbcl ( >= 1:1.0.30 ),
  libxpm-dev,
  libxt-dev,
  g++ (>= 4.7),
  help2man,
  dh-buildinfo,
-Standards-Version: 3.9.3
+ autotools-dev,
+Standards-Version: 3.9.4
 Vcs-Git: http://git.debian.org/git/pkg-open-axiom/pkg-open-axiom.git
 Vcs-Browser: http://git.debian.org/?p=pkg-open-axiom/pkg-open-axiom.git
 Homepage: http://www.open-axiom.org/
diff --git a/debian/rules b/debian/rules
index 490b08e..c9c2648 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,16 +11,7 @@ export DH_VERBOSE = 1
 BUILD = $(CURDIR)/build-tree
 
 LDFLAGS += -Wl,--as-needed
-
-# List of archs currently having SBCL
-# Keep build-deb on sbcl in one line: sbcl (...) [...],
-HAVE_SBCL := $(shell grep sbcl debian/control | sed -r 's,.*\[(.+)\].*,\1,')
-
-ifneq (,$(filter $(DEB_HOST_ARCH),$(HAVE_SBCL)))
 LISP := sbcl
-else
-LISP := clisp
-endif
 
 oa_libdir := /usr/lib/open-axiom
 
@@ -50,6 +41,7 @@ debian/open-axiom.1: build-stamp
 # --disable-gcl is for included GCL:
 configure-stamp:
 	dh_testdir
+	dh_autotools-dev_updateconfig
 	# aclocal.m4 is older than configure; rebuilding aclocal.m4 requires aclocal-1.13
 	touch aclocal.m4 config/*.m4 -r configure.ac
 	$(LISP) --version </dev/null || true
@@ -132,7 +124,6 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf $(BUILD)
-	rm -f install-stamp build-stamp configure-stamp
-	rm -rf .pc
+	dh_autotools-dev_restoreconfig
 	dh_clean