[sumo] 03/05: Enable eulerspiral, as it was relicensed under LGPL.
Anton Gladky
gladk at moszumanska.debian.org
Wed Nov 20 15:26:19 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit 401d4514109fbe0f6b663d751a8d9d41640685d5
Author: Anton Gladky <gladk at debian.org>
Date: Mon Nov 18 19:37:37 2013 +0100
Enable eulerspiral, as it was relicensed under LGPL.
---
debian/copyright | 11 +++
debian/patches/drop_eulerspiral.patch | 144 ---------------------------------
debian/patches/series | 2 -
3 files changed, 11 insertions(+), 146 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index a629da8..8c69f33 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -193,3 +193,14 @@ Copyright: texttest.org (LGPL according to google cache)
License: LGPL
On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: ./src/foreign/eulerspiral/*
+Copyright: 2004, Brown University, Providence, RI
+License: LGPL
+ Originally these files were released under non-free license.
+ After that authors permitted yo use the code under LGPL-license.
+ http://sourceforge.net/mailarchive/message.php?msg_id=31648968
+ "You may feel free to re-release your code to sourceforge under the
+ LGPL in this case."
+ On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
+ LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL'.
diff --git a/debian/patches/drop_eulerspiral.patch b/debian/patches/drop_eulerspiral.patch
deleted file mode 100644
index b0db0ce..0000000
--- a/debian/patches/drop_eulerspiral.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Description: Remove eulerspiral source code due to license issues.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-06-12
-
---- a/src/netimport/NIImporter_OpenDrive.cpp
-+++ b/src/netimport/NIImporter_OpenDrive.cpp
-@@ -46,7 +46,6 @@
- #include <utils/xml/SUMOXMLDefinitions.h>
- #include <utils/geom/GeoConvHelper.h>
- #include <utils/geom/GeomConvHelper.h>
--#include <foreign/eulerspiral/euler.h>
- #include <utils/options/OptionsCont.h>
- #include <utils/common/FileHelpers.h>
- #include <utils/xml/XMLSubSys.h>
-@@ -716,9 +715,6 @@
- case OPENDRIVE_GT_LINE:
- geom = geomFromLine(e, g);
- break;
-- case OPENDRIVE_GT_SPIRAL:
-- geom = geomFromSpiral(e, g);
-- break;
- case OPENDRIVE_GT_ARC:
- geom = geomFromArc(e, g);
- break;
-@@ -756,23 +752,6 @@
- return ret;
- }
-
--
--std::vector<Position>
--NIImporter_OpenDrive::geomFromSpiral(const OpenDriveEdge& e, const OpenDriveGeometry& g) {
-- UNUSED_PARAMETER(e);
-- std::vector<Position> ret;
-- SUMOReal curveStart = g.params[0];
-- SUMOReal curveEnd = g.params[1];
-- Point2D<double> end;
-- EulerSpiral s(Point2D<double>(g.x, g.y), g.hdg, curveStart, (curveEnd - curveStart) / g.length, g.length);
-- std::vector<Point2D<double> > into;
-- s.computeSpiral(into, 1.);
-- for (std::vector<Point2D<double> >::iterator i = into.begin(); i != into.end(); ++i) {
-- ret.push_back(Position((*i).getX(), (*i).getY()));
-- }
-- return ret;
--}
--
-
- std::vector<Position>
- NIImporter_OpenDrive::geomFromArc(const OpenDriveEdge& e, const OpenDriveGeometry& g) {
---- a/configure
-+++ b/configure
-@@ -17410,7 +17410,7 @@
-
-
-
--ac_config_files="$ac_config_files src/Makefile src/activitygen/Makefile src/activitygen/activities/Makefile src/activitygen/city/Makefile src/foreign/Makefile src/foreign/eulerspiral/Makefile src/foreign/gl2ps/Makefile src/foreign/mersenne/Makefile src/foreign/nvwa/Makefile src/foreign/polyfonts/Makefile src/foreign/rtree/Makefile src/foreign/tcpip/Makefile src/gui/Makefile src/gui/dialogs/Makefile src/guinetload/Makefile src/guisim/Makefile src/microsim/Makefile src/microsim/actions/Ma [...]
-+ac_config_files="$ac_config_files src/Makefile src/activitygen/Makefile src/activitygen/activities/Makefile src/activitygen/city/Makefile src/foreign/Makefile src/foreign/gl2ps/Makefile src/foreign/mersenne/Makefile src/foreign/nvwa/Makefile src/foreign/polyfonts/Makefile src/foreign/rtree/Makefile src/foreign/tcpip/Makefile src/gui/Makefile src/gui/dialogs/Makefile src/guinetload/Makefile src/guisim/Makefile src/microsim/Makefile src/microsim/actions/Makefile src/microsim/cfmodels/Make [...]
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -18566,7 +18566,6 @@
- "src/activitygen/activities/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/activities/Makefile" ;;
- "src/activitygen/city/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/city/Makefile" ;;
- "src/foreign/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/Makefile" ;;
-- "src/foreign/eulerspiral/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/eulerspiral/Makefile" ;;
- "src/foreign/gl2ps/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/gl2ps/Makefile" ;;
- "src/foreign/mersenne/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/mersenne/Makefile" ;;
- "src/foreign/nvwa/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/nvwa/Makefile" ;;
---- a/configure.ac
-+++ b/configure.ac
-@@ -440,7 +440,6 @@
- src/activitygen/activities/Makefile
- src/activitygen/city/Makefile
- src/foreign/Makefile
--src/foreign/eulerspiral/Makefile
- src/foreign/gl2ps/Makefile
- src/foreign/mersenne/Makefile
- src/foreign/nvwa/Makefile
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -63,7 +63,7 @@
- ./netimport/vissim/tempstructs/libvissimtmpstr.a \
- ./netbuild/libnetbuild.a ./netwrite/libnetwrite.a \
- ./utils/distribution/libdistribution.a ./utils/geom/libgeom.a \
-- ./foreign/eulerspiral/libeulerspiral.a $(am__DEPENDENCIES_2) \
-+ $(am__DEPENDENCIES_2) \
- $(INTERNAL_LIBS) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- netconvert_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-@@ -367,7 +367,6 @@
- ./netwrite/libnetwrite.a \
- ./utils/distribution/libdistribution.a \
- ./utils/geom/libgeom.a \
--./foreign/eulerspiral/libeulerspiral.a \
- $(COMMON_LIBS) \
- $(INTERNAL_LIBS) \
- $(GDAL_LIBS) \
---- a/src/foreign/Makefile.in
-+++ b/src/foreign/Makefile.in
-@@ -60,7 +60,7 @@
- distdir
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = eulerspiral mersenne tcpip nvwa gl2ps polyfonts rtree
-+DIST_SUBDIRS = mersenne tcpip nvwa gl2ps polyfonts rtree
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- am__relativize = \
- dir0=`pwd`; \
-@@ -231,7 +231,7 @@
- @CHECK_MEMORY_LEAKS_TRUE at MEMDIRS = nvwa
- @WITH_GUI_TRUE at GUIDIRS = gl2ps polyfonts rtree
- EXTRA_DIST = additional.txt
--SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS)
-+SUBDIRS = mersenne tcpip $(MEMDIRS) $(GUIDIRS)
- all: all-recursive
-
- .SUFFIXES:
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -74,7 +74,6 @@
- ./netwrite/libnetwrite.a \
- ./utils/distribution/libdistribution.a \
- ./utils/geom/libgeom.a \
--./foreign/eulerspiral/libeulerspiral.a \
- $(COMMON_LIBS) \
- $(INTERNAL_LIBS) \
- $(GDAL_LIBS) \
---- a/src/netimport/NIImporter_OpenDrive.h
-+++ b/src/netimport/NIImporter_OpenDrive.h
-@@ -453,7 +453,6 @@
-
-
- static std::vector<Position> geomFromLine(const OpenDriveEdge& e, const OpenDriveGeometry& g);
-- static std::vector<Position> geomFromSpiral(const OpenDriveEdge& e, const OpenDriveGeometry& g);
- static std::vector<Position> geomFromArc(const OpenDriveEdge& e, const OpenDriveGeometry& g);
- static std::vector<Position> geomFromPoly(const OpenDriveEdge& e, const OpenDriveGeometry& g);
- static Position calculateStraightEndPoint(double hdg, double length, const Position& start);
---- a/src/foreign/Makefile.am
-+++ b/src/foreign/Makefile.am
-@@ -9,4 +9,4 @@
-
- EXTRA_DIST = additional.txt
-
--SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS)
-+SUBDIRS = mersenne tcpip $(MEMDIRS) $(GUIDIRS)
diff --git a/debian/patches/series b/debian/patches/series
index 82a03bd..39b0fc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-drop_eulerspiral.patch
remove_embedded_gl2ps.patch
fix_scripts_headers.patch
-#add_missing_link.patch
add_missing_link.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git
More information about the debian-science-commits
mailing list