From 354ef3c074c430b89748142e8bb5941ee0f2f71a Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 26 Oct 2022 15:13:41 +0200 Subject: Switch to the latest from Github --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/rules | 20 +++++++++----------- debian/watch | 4 ---- 4 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index de313a2..a820832 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +open-axiom (1.5.0+2022.09.17.git.be9640c+ds-0pin1) UNRELEASED; urgency=low + + * New upstream version. + + -- Igor Pashev Wed, 26 Oct 2022 15:10:58 +0200 + open-axiom (1.5.0~svn3056+ds-1) unstable; urgency=low * New upstream version. diff --git a/debian/control b/debian/control index fce544b..6b50863 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dh-buildinfo, autotools-dev, Standards-Version: 3.9.4 -Vcs-Git: http://anonscm.debian.org/git/pkg-open-axiom/pkg-open-axiom.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-open-axiom/pkg-open-axiom.git +Vcs-Git: https://git.pashev.ru/debian/open-axiom-debian +Vcs-Browser: https://git.pashev.ru/debian/open-axiom-debian Homepage: http://www.open-axiom.org/ Package: open-axiom diff --git a/debian/rules b/debian/rules index 1bd18cc..e5597c2 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,6 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk - include /usr/share/dpkg/architecture.mk export DH_VERBOSE = 1 @@ -15,22 +14,21 @@ LISP := sbcl oa_libdir := /usr/lib/open-axiom + PACKAGE := open-axiom -SVN_REPO := svn://svn.code.sf.net/p/open-axiom/code/trunk +GIT_REPO := https://github.com/GabrielDosReis/open-axiom.git DEBIAN_PATH := $(abspath $(dir $(firstword $(MAKEFILE_LIST)))) SRC_VERSION := $(shell dpkg-parsechangelog -l$(DEBIAN_PATH)/changelog | awk '/^Version:/ {sub(/-[^-]*/, "", $$2); print $$2}') -SVN_REVISION := $(shell echo $(SRC_VERSION) | sed -r 's,.+svn([0-9]+).*,\1,') +GIT_REVISION := $(shell echo $(SRC_VERSION) | sed -r 's,.+git\.(\w+).*,\1,') TARBALL := $(PACKAGE)_$(SRC_VERSION).orig.tar.xz .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) - tar cJf $(TARBALL) -C get-orig-source \ - --exclude=contrib \ - $(PACKAGE)-$(SRC_VERSION) - @rm -rf get-orig-source + rm -rf get-orig-source $(TARBALL) && mkdir get-orig-source + git clone $(GIT_REPO) get-orig-source/$(PACKAGE)-$(SRC_VERSION) + git -C get-orig-source/$(PACKAGE)-$(SRC_VERSION) checkout $(GIT_REVISION) + find get-orig-source/$(PACKAGE)-$(SRC_VERSION) -name '.*' -print0 | xargs -0 --no-run-if-empty rm -rfv + tar cJf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION) + rm -rf get-orig-source @echo " "$(TARBALL)" created; move it to the right destination to build the package" debian/open-axiom.1: build-stamp diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 1e267a9..0000000 --- a/debian/watch +++ /dev/null @@ -1,4 +0,0 @@ -version=3 -opts=dversionmangle=s/.*svn(\d+)(.ds.*)?/$1/ \ - http://sourceforge.net/p/open-axiom/code/HEAD/tree/trunk/ \ - /p/open-axiom/code/(\d+)/ -- cgit v1.2.3