[osmctools] 01/09: Update upstream URLs for Gitorious to Gitlab move.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmctools.

commit 5f088bcb18b9b5e9dc345698019dbcb3bbcfba17
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Apr 14 22:06:24 2015 +0200

    Update upstream URLs for Gitorious to Gitlab move.
---
 debian/changelog         |  6 ++++++
 debian/control           |  2 +-
 debian/copyright         |  2 +-
 debian/rules             | 24 ------------------------
 debian/upstream/metadata |  4 ++--
 debian/watch             |  6 +++---
 6 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6539092..1606f4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmctools (0.4-1~exp2) UNRELEASED; urgency=medium
+
+  * Update upstream URLs for Gitorious to Gitlab move.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 14 Apr 2015 22:01:22 +0200
+
 osmctools (0.4-1~exp1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index ec1e3d6..d152acf 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9.0.0),
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osmctools.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/osmctools.git
-Homepage: http://gitorious.org/osm-c-tools/
+Homepage: https://gitlab.com/osm-c-tools/osmctools
 
 Package: osmctools
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 132f9b5..63059b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: osmtools
 Upstream-Contact: Markus Weber <marqqs at gmx.eu>
-Source: http://gitorious.org/osm-c-tools/ 
+Source: https://gitlab.com/osm-c-tools/osmctools
 
 Files: *
 Copyright: 2011-2013, Markus Weber <marqqs at gmx.eu>
diff --git a/debian/rules b/debian/rules
index 5d281f0..e341f4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,27 +16,3 @@ PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
 %:
 	dh $@ --with autoreconf
 
-## http://wiki.debian.org/onlyjob/get-orig-source
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
-.PHONY: get-orig-source
-get-orig-source: $(PKG)_$(VER).orig.tar.xz
-	@
-
-UURL = git://gitorious.org/osm-c-tools/osmctools.git
-$(PKG)_$(VER).orig.tar.xz:
-	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
-	@echo "# Downloading..."
-	git clone $(UURL) $(PKG)-$(VER) \
-        || $(RM) -r $(PKG)-$(VER)
-	cd $(PKG)-$(VER) \
-        && git checkout v$(VER) \
-        && echo "# Setting times..." \
-        && for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
-        && [ -s ChangeLog ] || ( echo "# Generating ChangeLog..." \
-           ; git log --pretty="format:%ad  %aN  <%aE>%n%n%x09* %s%n" --date=short > ChangeLog \
-           ; touch -d "$$(git log -1 --format='%ci')" ChangeLog) \
-        && $(RM) -r .git .git*
-	@echo "# Packing..."
-	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
-        | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
-        && $(RM) -r "$(PKG)-$(VER)"
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 3184fc4..4042e25 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,5 +1,5 @@
 ---
 Contact: Markus Weber <markus.weber at gmx.com>
 Name: osmctools
-Repository: git://gitorious.org/osm-c-tools/osmctools.git
-Repository-Browse: https://gitorious.org/osm-c-tools/osmctools
+Repository: https://gitlab.com/osm-c-tools/osmctools.git
+Repository-Browse: https://gitlab.com/osm-c-tools/osmctools
diff --git a/debian/watch b/debian/watch
index 9e20395..a37a269 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=filenamemangle=s/\S*download=//g \
-http://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=gitorious/osm-c-tools/osmctools \
-.*=osmctools(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+opts=filenamemangle=s/.*\.tar\.gz\?ref=v?(\d\S*)/osmctools-$1\.tar\.gz/g \
+https://gitlab.com/osm-c-tools/osmctools/tags \
+.*archive\.tar\.gz\?ref=v?(\d\S*)

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