[osrm] 07/12: 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 0daef52d53efdd4073e0dfce349125e9b3015d98
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 19 22:17:30 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 1fb62d5..76e453a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 osrm (4.8.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Repack upstream tarballs to exclude embedded copy of libosmium.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 19 Oct 2015 21:40:06 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 2d73bf9..9f1bc34 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,32 +2,15 @@ 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.
+Files-Excluded: third_party/libosmium/*
 
 Files: *
 Copyright: 2013-2015, Project OSRM, Dennis Luxen, others
            2013-2015, Project OSRM contributors
 License: BSD-2-clause
 
-Files: third_party/libosmium/*
-Copyright: 2013-2015, Jochen Topf <jochen at topf.org> and others
-                2012, Two Blue Cubes Ltd.
-                2004, John Maddoc
-Comment: Osmium was mainly written and is maintained by
- Jochen Topf <jochen at topf.org>.
- .
- Other authors:
- * Frederik Ramm <frederik at remote.org> (Multipolygon code, ...)
- * Christian Vetter <veaac.fdirct at gmail.com> (PBF parser)
- * Scott A. Crosby <scott at sacrosby.com> (PBF format)
- * Peter Körner <github at mazdermind.de> (XML and PBF writer, ...)
- * Johannes Kolb <johannes.kolb at gmx.net> (Tests, ...)
-License: BSL-1.0
-
-Files: third_party/libosmium/examples/osmium_convert.cpp
-Copyright: disclaimed
-License: public-domain
- The code in this example file is released into the Public Domain.
-
 Files: third_party/variant/*
 Copyright: MapBox
 License: BSD-3-clause
@@ -81,28 +64,3 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSL-1.0
- Boost Software License - Version 1.0 - August 17th, 2003
- .
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
diff --git a/debian/watch b/debian/watch
index 5ecba2d..772cc41 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,6 +2,7 @@ version=3
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
-filenamemangle=s/(?:.*?)?(?:rel|v|osrm-backend)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osrm-backend-$1.$2/ \
+filenamemangle=s/(?:.*?)?(?:rel|v|osrm-backend)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osrm-backend-$1.$2/,\
+repacksuffix=+ds \
 https://github.com/Project-OSRM/osrm-backend/releases \
 (?:.*?/)?(?:rel|v|osrm\-backend)?[\-\_]?(\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/osrm.git