From e1a3d9f2fb87f2000d0491742110d67d36fb0b24 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Wed, 3 Apr 2013 19:08:45 +0400
Subject: New upstream version (1.5.0~svn2797)

---
 debian/changelog |  6 ++++++
 debian/rules     | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3a3814..3a75674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+open-axiom (1.5.0~svn2797-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Wed, 03 Apr 2013 16:56:48 +0400
+
 open-axiom (1.4.1+svn~2626-2) unstable; urgency=low
 
   * Added libgmp-dev build-dep for GCL
diff --git a/debian/rules b/debian/rules
index f9b3481..dd7ee48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,27 +11,27 @@ DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 # 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)),)
+ifneq (,$(filter $(DEB_HOST_ARCH),$(HAVE_SBCL)))
 LISP := sbcl
 else
 LISP := gcl
 endif
 
 
-PACKAGE = open-axiom
-SVN_REPO = https://open-axiom.svn.sf.net/svnroot/open-axiom/trunk
-SRC_VERSION  := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
-SVN_REVISION := $(shell echo $(SRC_VERSION) | awk -F"+" '{ print $$2 }' | sed 's/svn~//' )
-TARBALL       = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
+PACKAGE      := open-axiom
+SVN_REPO     := svn://svn.code.sf.net/p/open-axiom/code/trunk
+SRC_VERSION  := $(shell dpkg-parsechangelog | awk '/^Version:/ {sub(/-[^-]*/, "", $$2); print $$2}')
+SVN_REVISION := $(shell echo $(SRC_VERSION) | sed -r 's,.+svn([0-9]+),\1,')
+TARBALL      := $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
 .PHONY: get-orig-source
 get-orig-source:
 	rm -rf get-orig-source $(TARBALL)
 	mkdir get-orig-source
 	svn export -r $(SVN_REVISION) $(SVN_REPO) \
-	get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
+	get-orig-source/$(PACKAGE)-$(SRC_VERSION)
 	GZIP='--best --no-name' \
 		 tar czf $(TARBALL) -C get-orig-source \
-		 $(PACKAGE)-$(SRC_VERSION).orig
+		 $(PACKAGE)-$(SRC_VERSION)
 	@rm -rf get-orig-source
 	@echo "  "$(TARBALL)" created; move it to the right destination to build the package"
 
-- 
cgit v1.2.3