[libkml] 01/18: Switch upstream source from code.google.com to GitHub.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository libkml.

commit 1c77e8942a906a139f179519c3300b1b37a00174
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 12 23:07:49 2015 +0100

    Switch upstream source from code.google.com to GitHub.
---
 debian/changelog       |  6 ++++++
 debian/control         |  4 ++--
 debian/copyright       |  5 ++---
 debian/get-orig-source | 28 +++++++++++++---------------
 debian/watch           | 14 ++++++++++----
 5 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc66c3f..e88ba55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libkml (1.3.0~r864+dfsg-2) UNRELEASED; urgency=medium
+
+  * Switch upstream source from code.google.com to GitHub.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 Mar 2015 23:07:25 +0100
+
 libkml (1.3.0~r864+dfsg-1) unstable; urgency=medium
 
   * Bump Standards-Version to 3.9.5, no changes required.
diff --git a/debian/control b/debian/control
index e1c88db..7c5dc1d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libkml
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
-           Bas Couwenberg <sebastic at xs4all.nl>
+           Bas Couwenberg <sebastic at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9),
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/libkml.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/libkml.git
-Homepage: http://code.google.com/p/libkml/
+Homepage: https://github.com/google/libkml
 X-Python-Version: 2.7
 
 Package: libkml0
diff --git a/debian/copyright b/debian/copyright
index d9d5235..1f64e5c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: libxml
+Upstream-Name: libkml
 Upstream-Contact: Google Inc. <opensource at google.com>
-Source: https://code.google.com/p/libkml/
-License: BSD-3-Clause
+Source: https://github.com/google/libkm
 Comment: The IETF RFCs are removed due to non-free restrictions.
 Files-Excluded: third_party/uriparser-*/doc/rfc*
 
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 9e06428..4cbed04 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -1,24 +1,22 @@
-#!/bin/sh -x
+#!/bin/bash
 # Repack tarball because the IETF RFC license has non-free restrictions.
 
-set -e
+REMOTE=upstream
+BRANCH=${REMOTE}/master
 
-# Remark: A new uscan that enables easier handling of removing files can be
-#         obtained via
-#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
-#         and then copy scripts/uscan.pl as uscan at the beginning of your PATH
-if uscan --help | grep -q -- --repack-compression ; then
-    echo "Use new enhanced uscan"
-    uscan --verbose --force-download
-    exit
+if [ $(git remote show ${REMOTE} | wc -l) -eq 0 ]; then
+	git remote add ${REMOTE} https://github.com/google/libkml.git
 fi
 
-# Falling back to manually removing files
+git fetch ${REMOTE} --no-tags
 
-PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//'`
+PACKAGE=$(dpkg-parsechangelog | grep ^Source: | awk '{print $2}')
 
-uscan --verbose --force-download --no-symlink
+COMMIT=$(git log -n1 --format=format:%h ${BRANCH})
+DATE=$(date +%Y%m%d --date="@$(git log -n1 --format=format:%ct ${BRANCH})")
 
-gunzip -c ../${PACKAGE}_${VERSION}.orig.tar.gz | tar --delete --wildcards -vf - ${PACKAGE}-${VERSION}/third_party/uriparser-\*/doc/rfc\* | GZIP="--best --no-name" gzip -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.gz
+VERSION="1.3.0~r864+git${DATE}-${COMMIT}"
+
+git archive --format=tar.gz --prefix=${PACKAGE}-${VERSION}/ -o ../${PACKAGE}_${VERSION}.orig.tar.gz ${BRANCH}
 
+gunzip -c ../${PACKAGE}_${VERSION}.orig.tar.gz | tar --delete --wildcards -vf - ${PACKAGE}-${VERSION}/third_party/uriparser-\*/doc/rfc\* | GZIP="--best --no-name" gzip -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.gz
diff --git a/debian/watch b/debian/watch
index e62ad8c..ca1fdb5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -9,7 +9,13 @@ version=3
 
 # subversion revisions
 #
-opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/^\d+$/1.3.0~r$&/" \
-https://code.google.com/p/libkml/source/list \
-(?:.*/)?detail\?r=(\d+) \
-debian get-orig-source
+#opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/^\d+$/1.3.0~r$&/" \
+#https://code.google.com/p/libkml/source/list \
+#(?:.*/)?detail\?r=(\d+) \
+#debian get-orig-source
+
+opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+filenamemangle=s/(?:.*)?(?:rel|release|v)[\-\_]?(\d[\d\.]*)\.tar\.gz/libkml-$1.tar.gz/" \
+https://github.com/google/libkml/releases \
+(?:.*/)?(?:rel|release|v|libkml)[\-\_]?(\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/libkml.git