[osm2pgsql] 09/18: Repack upstream tarball to exclude embedded copy of libosmium.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit f1b6546b99dc89eaa234b5da6fe006c9b566ee20
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 27 15:08:42 2016 +0100

    Repack upstream tarball to exclude embedded copy of libosmium.
---
 debian/changelog | 1 +
 debian/copyright | 3 +++
 debian/watch     | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c3ce33a..3572da4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ osm2pgsql (0.90.0~rc1-1) UNRELEASED; urgency=medium
   * Update build dependencies:
     - Drop libboost-thread-dev, libxml2-dev & protobuf dependencies
     - Add libexpat1-dev & libosmium2-dev
+  * Repack upstream tarball to exclude embedded copy of libosmium.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Feb 2016 14:42:05 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 72e93a7..131c50c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: osm2pgsql
 Upstream-Contact: OpenStreetMap Developers <dev at openstreetmap.org>
 Source: https://github.com/openstreetmap/osm2pgsql/releases
+ The upstream tarballs are repacked to exclude embedded copies of
+ dependencies.
+Files-Excluded: contrib/libosmium/*
 
 Files: *
 Copyright: © 2007-2008, Artem Pavlenko <artem at mapnik.org>
diff --git a/debian/watch b/debian/watch
index 9314202..26d7808 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,6 +2,7 @@ version=3
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/;s/RC/rc/,\
-filenamemangle=s/(?:.*?\/)?(?:rel|v|osm2psql)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osm2psql-$1.$2/ \
+filenamemangle=s/(?:.*?\/)?(?:rel|v|osm2psql)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osm2psql-$1.$2/,\
+repacksuffix=+ds \
 https://github.com/openstreetmap/osm2pgsql/releases \
 (?:.*?/)?(?:rel|v|osm2pqsql)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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