diff -Nru ignition-math2-2.2.3+dfsg1/debian/changelog ignition-math2-2.2.3/debian/changelog --- ignition-math2-2.2.3+dfsg1/debian/changelog 2015-12-07 07:16:14.000000000 +0000 +++ ignition-math2-2.2.3/debian/changelog 2015-12-07 07:47:11.000000000 +0000 @@ -1,26 +1,113 @@ -ignition-math2 (2.2.3+dfsg1-1~201512071) trusty; urgency=medium +ignition-math2 (2.2.3-1~trusty~201512071) trusty; urgency=medium - * upload to trusty + * upload to deb-rob - -- Jochen Sprickerhof Mon, 07 Dec 2015 08:16:14 +0100 + -- Jochen Sprickerhof Mon, 07 Dec 2015 08:47:11 +0100 -ignition-math2 (2.2.3+dfsg1-1) unstable; urgency=medium +ignition-math2 (2.2.3-1~trusty) trusty; urgency=medium - * Imported Upstream version 2.2.3 - * Missing files from bad merge of upstream branch + * ignition-math2 2.2.3-1 release - -- Jose Luis Rivero Fri, 18 Sep 2015 00:55:39 +0200 + -- Jose Luis Rivero Fri, 18 Sep 2015 00:00:48 +0200 -ignition-math2 (2.2.2+dfsg1-1) unstable; urgency=medium +ignition-math2 (2.2.2-1~trusty) trusty; urgency=medium - * Imported Upstream version 2.2.2 - * Relax the error margin expected in Line test (Closes: #789826) - Patch by Mathieu Trudel-Lapierre. + * ignition-math2 2.2.2-1 release - -- Jose Luis Rivero Tue, 25 Aug 2015 11:32:42 +0000 + -- Nate Koenig Mon, 03 Aug 2015 17:20:37 -0700 -ignition-math2 (2.1.1+dfsg1-1) unstable; urgency=medium +ignition-math2 (2.2.1-1~trusty) trusty; urgency=medium - * Imported Upstream version 2.1.1 (Closes: #783522) + * ignition-math2 2.2.1-1 release - -- Jose Luis Rivero Fri, 19 Jun 2015 15:43:04 +0000 + -- Nate Koenig Tue, 28 Jul 2015 07:43:29 -0700 + +ignition-math2 (2.2.0-1~trusty) trusty; urgency=medium + + * ignition-math2 2.2.0-1 release + + -- Nate Koenig Mon, 27 Jul 2015 14:51:27 -0700 + +ignition-math2 (2.1.1-1~trusty) trusty; urgency=medium + + * ignition-math2 2.1.1-1 release + + -- Nate Koenig Fri, 22 May 2015 07:42:17 -0700 + +ignition-math2 (2.1.0-1~trusty) trusty; urgency=medium + + * ignition-math2 2.1.0-1 release + + -- Nate Koenig Thu, 21 May 2015 18:07:24 -0700 + +ignition-math2 (2.0.4-1~trusty) trusty; urgency=medium + + * ignition-math2 2.0.4-1 release + + -- Nate Koenig Thu, 21 May 2015 18:04:31 -0700 + +ignition-math2 (2.0.3-1~trusty) trusty; urgency=medium + + * ignition-math2 2.0.3-1 release + + -- Nate Koenig Thu, 21 May 2015 10:45:17 -0700 + +ignition-math2 (2.0.2-2~trusty) trusty; urgency=medium + + * ignition-math2 2.0.2-2 release + + -- Jose Luis Rivero Mon, 04 May 2015 16:51:25 +0200 + +ignition-math2 (2.0.2-1~trusty) trusty; urgency=medium + + * ignition-math2 2.0.2-1 release + + -- Jose Luis Rivero Mon, 04 May 2015 14:16:27 +0200 + +ignition-math2 (2.0.1-3~trusty) trusty; urgency=medium + + * ignition-math2 2.0.1-3 release + + -- Nate Koenig Fri, 17 Apr 2015 11:59:35 -0700 + +ignition-math2 (2.0.1-2~trusty) trusty; urgency=medium + + * ignition-math2 2.0.1-2 release + + -- Nate Koenig Fri, 17 Apr 2015 10:44:32 -0700 + +ignition-math2 (2.0.1-1~trusty) trusty; urgency=medium + + * ignition-math2 2.0.1-1 release + + -- Nate Koenig Fri, 17 Apr 2015 09:58:02 -0700 + +ignition-math2 (2.0.0-1~trusty) trusty; urgency=medium + + * ignition-math2 2.0.0-1 release + + -- Nate Koenig Fri, 17 Apr 2015 08:23:49 -0700 + +ignition-math (1.0.0-1~trusty) trusty; urgency=medium + + * ignition-math 1.0.0-1 release + + -- Nate Koenig Fri, 06 Mar 2015 10:46:32 -0800 + +ignition-math (1.0.0-1~trusty) trusty; urgency=medium + + * ignition-math 1.0.0-1 release + + -- Nate Koenig Fri, 06 Mar 2015 10:46:08 -0800 + +ignition-math (0.2.0-1~trusty) trusty; urgency=medium + + * ignition-math 0.2.0-1 release + + -- jrivero Wed, 29 Oct 2014 17:11:54 -0700 + +ignition-math (0.1.0-1~trusty) trusty; urgency=low + + * ignition-math 0.1.0-1 release + + -- Jose Luis Rivero Mon, 16 Jun 2014 17:35:41 +0200 diff -Nru ignition-math2-2.2.3+dfsg1/debian/compat ignition-math2-2.2.3/debian/compat --- ignition-math2-2.2.3+dfsg1/debian/compat 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/compat 2015-09-17 22:10:49.000000000 +0000 @@ -1 +1 @@ -9 +7 diff -Nru ignition-math2-2.2.3+dfsg1/debian/control ignition-math2-2.2.3/debian/control --- ignition-math2-2.2.3+dfsg1/debian/control 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/control 2015-09-17 22:10:49.000000000 +0000 @@ -1,18 +1,15 @@ Source: ignition-math2 -Standards-Version: 3.9.6 -Maintainer: Debian Science Maintainers -Uploaders: Jose Luis Rivero +Standards-Version: 3.9.4 +Maintainer: Jose Luis Rivero Section: science Priority: extra -Testsuite: autopkgtest Build-Depends: cmake, - debhelper (>= 9), - libgtest-dev, + debhelper (>= 7.0.50~), python, ruby-ronn -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ign-math.git -Vcs-Git: git://anonscm.debian.org/debian-science/packages/ign-math.git -Homepage: http://ignitionrobotics.org/libraries/math +Vcs-Browser: https://bitbucket.org/ignitionrobotics/ign_math-release +Vcs-Hg: https://bitbucket.org/ignitionrobotics/ign_math-release +Homepage: https://bitbucket.org/ignitionrobotics/ign_math Package: libignition-math2 Architecture: any @@ -21,13 +18,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Description: Ignition Robotics Math Library - Shared library - A small, fast, and high performance math library. This library is a - self-contained set of classes and functions suitable for robot applications. - . - Ignition Robtics is a set of simple libraries that provide useful - functionality to bootstrap robot applications. The included libraries - encapsulate all the essentials, such as common math data types, console - logging, 3D mesh management, and asynchronous message passing. Package: libignition-math2-dev Architecture: any @@ -36,15 +26,7 @@ ${misc:Depends} Multi-Arch: same Description: Ignition Robotics Math Library - Development files - A small, fast, and high performance math library. This library is a - self-contained set of classes and functions suitable for robot applications. - . - Ignition Robtics is a set of simple libraries that provide useful - functionality to bootstrap robot applications. The included libraries - encapsulate all the essentials, such as common math data types, console - logging, 3D mesh management, and asynchronous message passing. - - + Package: libignition-math2-dbg Architecture: any Section: debug @@ -54,10 +36,3 @@ ${misc:Depends} Multi-Arch: same Description: Ignition Robotics Math Library - Debugging symbols - A small, fast, and high performance math library. This library is a - self-contained set of classes and functions suitable for robot applications. - . - Ignition Robtics is a set of simple libraries that provide useful - functionality to bootstrap robot applications. The included libraries - encapsulate all the essentials, such as common math data types, console - logging, 3D mesh management, and asynchronous message passing. diff -Nru ignition-math2-2.2.3+dfsg1/debian/copyright ignition-math2-2.2.3/debian/copyright --- ignition-math2-2.2.3+dfsg1/debian/copyright 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/copyright 2015-09-17 22:10:49.000000000 +0000 @@ -2,19 +2,23 @@ Upstream-Name: ignmath Upstream-Contact: gazebo-list@gazebosim.org Source: https://bitbucket.org/ignitionrobotics/ign_math -Files-Excluded: test/gtest Files: * Copyright: 2014-2015 Open Source Robotics Foundation License: Apache See '/usr/share/common-licenses/Apache-2.0'. -Files: tools/check_test_ran.py -Copyright: 2008, Willow Garage, Inc. +Files: test/gtest/* +Copyright: 2003, Google Inc. + 2005, Google Inc. + 2006, Google Inc. + 2007, Google Inc. + 2008, Google Inc. + 2009, Google Inc. License: BSD-3-clause -Files: tools/cpplint.py -Copyright: 2009 Google Inc. +Files: tools/check_test_ran.py +Copyright: 2008, Willow Garage, Inc. License: BSD-3-clause License: BSD-3-clause diff -Nru ignition-math2-2.2.3+dfsg1/debian/libignition-math2.lintian-overrides ignition-math2-2.2.3/debian/libignition-math2.lintian-overrides --- ignition-math2-2.2.3+dfsg1/debian/libignition-math2.lintian-overrides 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/libignition-math2.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# Upstream names library as libignition-math -package-name-doesnt-match-sonames libignition-math2-2 diff -Nru ignition-math2-2.2.3+dfsg1/debian/patches/0001-c++11-unconditional.patch ignition-math2-2.2.3/debian/patches/0001-c++11-unconditional.patch --- ignition-math2-2.2.3+dfsg1/debian/patches/0001-c++11-unconditional.patch 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/patches/0001-c++11-unconditional.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -Description: Declare c++11 flag unconditional -Author: Jose Luis Rivero -Forwarded: No - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ce5d4cb..e740563 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -175,11 +175,13 @@ else() - set(WARN_LEVEL "-Wall") - endif() - -+set (UNFILTERED_FLAGS -std=c++11) -+ - filter_valid_compiler_warnings(${WARN_LEVEL} -Wextra -Wno-long-long - -Wno-unused-value -Wno-unused-value -Wno-unused-value -Wno-unused-value - -Wfloat-equal -Wshadow -Winit-self -Wswitch-default - -Wmissing-include-dirs -pedantic) --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WARNING_CXX_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WARNING_CXX_FLAGS} ${UNFILTERED_FLAGS}") - - ################################################# - # OS Specific initialization -diff --git a/cmake/DefaultCFlags.cmake b/cmake/DefaultCFlags.cmake -index 247a56a..a2717c8 100644 ---- a/cmake/DefaultCFlags.cmake -+++ b/cmake/DefaultCFlags.cmake -@@ -30,7 +30,7 @@ set (CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_C_FLAGS_COVERAGE} -fno-elide-constructors - # Set all the global build flags - if (UNIX) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}} -std=c++11") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") - set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") - set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") - set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}") diff -Nru ignition-math2-2.2.3+dfsg1/debian/patches/0002_use_system_gtest.patch ignition-math2-2.2.3/debian/patches/0002_use_system_gtest.patch --- ignition-math2-2.2.3+dfsg1/debian/patches/0002_use_system_gtest.patch 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/patches/0002_use_system_gtest.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Description: Use system packaged gtest -Author: Anton Gladky -Last-Update: 2015-06-01 - -Index: ignition-math2-2.1.1/test/CMakeLists.txt -=================================================================== ---- ignition-math2-2.1.1.orig/test/CMakeLists.txt -+++ ignition-math2-2.1.1/test/CMakeLists.txt -@@ -1,14 +1,14 @@ - include_directories ( -- ${PROJECT_SOURCE_DIR}/test/gtest/include -- ${PROJECT_SOURCE_DIR}/test/gtest -+ /usr/include -+ /usr/src/gtest - ${PROJECT_SOURCE_DIR}/test - ) - - configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/test_config.h) - - # Build gtest --add_library(gtest STATIC gtest/src/gtest-all.cc) --add_library(gtest_main STATIC gtest/src/gtest_main.cc) -+add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc) -+add_library(gtest_main STATIC /usr/src/gtest/src/gtest_main.cc) - target_link_libraries(gtest_main gtest) - set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a") - set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a") diff -Nru ignition-math2-2.2.3+dfsg1/debian/patches/0003_fix_collinear_boundary.patch ignition-math2-2.2.3/debian/patches/0003_fix_collinear_boundary.patch --- ignition-math2-2.2.3+dfsg1/debian/patches/0003_fix_collinear_boundary.patch 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/patches/0003_fix_collinear_boundary.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Mathieu Trudel-Lapierre -Subject: Allow for a bit more rounding when verifying collinearity -Submitted: No - ---- - src/Line2_TEST.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: b/src/Line2_TEST.cc -=================================================================== ---- a/src/Line2_TEST.cc -+++ b/src/Line2_TEST.cc -@@ -147,7 +147,7 @@ TEST(Line2Test, CollinearPoint) - - pt.Set(0, 0.00001); - EXPECT_FALSE(lineA.Collinear(pt)); -- EXPECT_TRUE(lineA.Collinear(pt, 1e-4)); -+ EXPECT_TRUE(lineA.Collinear(pt, 1e-3)); - { - math::Line2d ptLine(pt, pt); - EXPECT_FALSE(lineA.Collinear(ptLine)); -@@ -159,7 +159,7 @@ TEST(Line2Test, CollinearPoint) - - pt.Set(0, -0.00001); - EXPECT_FALSE(lineA.Collinear(pt)); -- EXPECT_TRUE(lineA.Collinear(pt, 1e-4)); -+ EXPECT_TRUE(lineA.Collinear(pt, 1e-3)); - { - math::Line2d ptLine(pt, pt); - EXPECT_FALSE(lineA.Collinear(ptLine)); diff -Nru ignition-math2-2.2.3+dfsg1/debian/patches/series ignition-math2-2.2.3/debian/patches/series --- ignition-math2-2.2.3+dfsg1/debian/patches/series 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -0001-c++11-unconditional.patch -0002_use_system_gtest.patch -0003_fix_collinear_boundary.patch diff -Nru ignition-math2-2.2.3+dfsg1/debian/rules ignition-math2-2.2.3/debian/rules --- ignition-math2-2.2.3+dfsg1/debian/rules 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/rules 2015-09-17 22:10:49.000000000 +0000 @@ -8,14 +8,12 @@ .PHONY: override_dh_auto_configure \ override_dh_strip +%: + dh $@ --parallel + override_dh_auto_configure: dh_auto_configure -- \ - -DUSE_HOST_CFLAGS:BOOL=False \ - -DUSE_UPSTREAM_CFLAGS:BOOL=False \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DCMAKE_BUILD_TYPE=RelWithDebInfo override_dh_strip: dh_strip -a --dbg-package=libignition-math2-dbg - -%: - dh $@ --parallel --buildsystem=cmake diff -Nru ignition-math2-2.2.3+dfsg1/debian/tests/build ignition-math2-2.2.3/debian/tests/build --- ignition-math2-2.2.3+dfsg1/debian/tests/build 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/tests/build 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -#!/bin/sh -# autopkgtest check: Build and run a program against ign-math, to verify that the -# headers and pkg-config file are installed correctly -# (C) 2012 Jose Luis Rivero -# Author: Jose Luis Rivero - -set -e - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -cat < igntest.c - -#include -#include - -int main(int argc, char **argv) -{ - // Create a triangle with the following vertices: - // 1: x = -1, y = 0 - // 2: x = 0, y = 1 - // 3: x = 1, y = 0 - ignition::math::Triangled tri( - ignition::math::Vector2d(-1, 0), - ignition::math::Vector2d(0, 1), - ignition::math::Vector2d(1, 0)); - - // The individual vertices are accessible through the [] operator - std::cout << "Vertex 1: " << tri[0] << "\n" - << "Vertex 2: " << tri[1] << "\n" - << "Vertex 3: " << tri[2] << "\n"; - - // Each side of the triangle is also accessible via the Side function - std::cout << "Side 1: " << tri.Side(0) << "\n" - << "Side 2: " << tri.Side(1) << "\n" - << "Side 3: " << tri.Side(2) << "\n"; - - // It's also possible to set each vertex individually. - tri.Set(0, ignition::math::Vector2d(-10, 0)); - tri.Set(1, ignition::math::Vector2d(0, 20)); - tri.Set(2, ignition::math::Vector2d(10, 2)); - - // Or set all the vertices at once. - tri.Set(ignition::math::Vector2d(-1, 0), - ignition::math::Vector2d(0, 1), - ignition::math::Vector2d(1, 0)); - - // You can get the perimeter length and area of the triangle - std::cout << "Perimeter=" << tri.Perimeter() - << " Area=" << tri.Area() << "\n"; - - // The Contains functions check if a line or point is inside the triangle - if (tri.Contains(ignition::math::Vector2d(0, 0.5))) - std::cout << "Triangle contains the point 0, 0.5\n"; - else - std::cout << "Triangle does not contain the point 0, 0.5\n"; - - // The Intersect function check if a line segment intersects the triangle. - // It also returns the points of intersection - ignition::math::Vector2d pt1, pt2; - if (tri.Intersects(ignition::math::Line2d(-2, 0.5, 2, 0.5), pt1, pt2)) - { - std::cout << "A line from (-2, 0.5) to (2, 0.5) intersects " - << "the triangle at the\nfollowing points:\n" - << "\t Pt1=" << pt1 << "\n" - << "\t Pt2=" << pt2 << "\n"; - } - else - { - std::cout << "A line from (-2, 0.5) to (2, 0.5) does not intersect " - << "the triangle\n"; - } - - // There are more functions in Triangle. Take a look at the API; - // http://ignitionrobotics.org/libraries/ign_mat/api -} -EOF - -g++ -o igntest igntest.c `pkg-config --cflags --libs ignition-math2` -echo "build: OK" -[ -x igntest ] -./igntest -echo "run: OK" diff -Nru ignition-math2-2.2.3+dfsg1/debian/tests/control ignition-math2-2.2.3/debian/tests/control --- ignition-math2-2.2.3+dfsg1/debian/tests/control 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Tests: build -Depends: libignition-math2-dev, build-essential diff -Nru ignition-math2-2.2.3+dfsg1/debian/watch ignition-math2-2.2.3/debian/watch --- ignition-math2-2.2.3+dfsg1/debian/watch 2015-09-17 23:14:38.000000000 +0000 +++ ignition-math2-2.2.3/debian/watch 2015-09-17 22:10:49.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \ -http://gazebosim.org/distributions/ign-math/releases/ .*ignition-math2-(\d\.\d\.\d)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +http://gazebosim.org/assets/distributions/ignmath-(\d\.\d\.\d)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -Nru ignition-math2-2.2.3+dfsg1/.hgignore ignition-math2-2.2.3/.hgignore --- ignition-math2-2.2.3+dfsg1/.hgignore 2015-09-17 22:54:02.000000000 +0000 +++ ignition-math2-2.2.3/.hgignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -syntax: glob - -build -build_* -.DS_Store -*.swp