[osrm] 11/22: Repack upstream tarballs 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 osrm.

commit 6b5d3298d1564643dd3a04d3304e83c376654be5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 23:51:41 2016 +0200

    Repack upstream tarballs to exclude embedded copy of libosmium.
---
 debian/changelog |  1 +
 debian/copyright | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 581f4c9..238933f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ osrm (5.0.2+ds-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop typo patches, applied upstream. Refresh remaining patches.
   * Update copyright years for Project OSRM contributors.
+  * Repack upstream tarballs to exclude embedded copy of libosmium.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Apr 2016 23:13:45 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 38fd113..9575fc9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Open Source Routing Machine (OSRM)
 Upstream-Contact: OSRM-talk <osrm-talk at openstreetmap.org>
 Source: https://github.com/Project-OSRM/osrm-backend
- The embedded copy of libosmium is excluded from upstream tarball,
- the libosmium2-dev Debian package is used instead.
+ The embedded copy of libosmium & variant are excluded from upstream
+ tarball, the libosmium2-dev & libmapbox-variant-dev Debian packages
+ are used instead.
 Files-Excluded: third_party/libosmium/*
+ third_party/variant/*
 
 Files: *
 Copyright: 2013-2015, Project OSRM, Dennis Luxen, others
@@ -39,10 +41,6 @@ License: fast-cpp-csv-parser
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: third_party/variant/*
-Copyright: MapBox
-License: BSD-3-clause
-
 Files: debian/*
 Copyright: 2015 Christopher Baines <mail at cbaines.net>
 License: BSD-2-clause

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