[pyosmium] 01/05: Use watch file instead of custom get-orig-source.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu May 21 07:46:10 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pyosmium.

commit 3504a334f3fd13307a0c8a234b48bf9f876a1886
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed May 20 21:57:15 2015 +0200

    Use watch file instead of custom get-orig-source.
---
 debian/get-orig-source | 19 -------------------
 debian/rules           |  3 ---
 debian/watch           |  6 ++++++
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index 2e49d50..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-REMOTE=upstream
-BRANCH=${REMOTE}/master
-
-if [ $(git remote show ${REMOTE} | wc -l) -eq 0 ]; then
-	git remote add ${REMOTE} https://github.com/osmcode/pyosmium.git
-fi
-
-git fetch ${REMOTE} --no-tags
-
-PACKAGE=$(dpkg-parsechangelog | grep ^Source: | awk '{print $2}')
-
-COMMIT=$(git log -n1 --format=format:%h ${BRANCH})
-DATE=$(date +%Y%m%d --date="@$(git log -n1 --format=format:%ct ${BRANCH})")
-
-VERSION="0.0~${DATE}-${COMMIT}"
-
-git archive --format=tar.gz --prefix=${PACKAGE}-${VERSION}/ -o ../${PACKAGE}_${VERSION}.orig.tar.gz ${BRANCH}
diff --git a/debian/rules b/debian/rules
index f29ede8..feeae97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,3 @@ override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="cd test && {interpreter} run_tests.py" dh_auto_test
 
-get-orig-source:
-	. debian/get-orig-source
-
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..c6a405a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,6 @@
+version=3
+opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+filenamemangle=s/(?:.*)?v(\d[\d\.]*)\.tar\.gz/pyosmium-$1.tar.gz/" \
+https://github.com/osmcode/pyosmium/releases \
+(?:.*/)?(?:rel|v|pyosmium)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyosmium.git



More information about the Pkg-grass-devel mailing list