[sumo] 02/06: Refresh patches
Anton Gladky
gladk at moszumanska.debian.org
Sun Dec 24 21:05:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit e861a46785b14c7c837c42695cfd67635225e428
Author: Anton Gladky <gladk at debian.org>
Date: Sun Dec 24 18:01:38 2017 +0100
Refresh patches
---
debian/patches/10_remove_embedded_gl2ps.patch | 180 +++++++++++++-------------
debian/patches/20_fix_scripts_headers.patch | 100 +++++++-------
debian/patches/30_add_missing_link.patch | 14 +-
debian/patches/40_drop_some_buildflags.patch | 8 +-
debian/patches/50_use_system_openlayers.patch | 6 +-
5 files changed, 149 insertions(+), 159 deletions(-)
diff --git a/debian/patches/10_remove_embedded_gl2ps.patch b/debian/patches/10_remove_embedded_gl2ps.patch
index d0b450f..5be69f2 100644
--- a/debian/patches/10_remove_embedded_gl2ps.patch
+++ b/debian/patches/10_remove_embedded_gl2ps.patch
@@ -2,125 +2,125 @@ Description: Remove from compilation embedded copy of gl2ps, use packaged versio
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo-0.30.0/src/Makefile.am
+Index: sumo-0.32.0/src/foreign/Makefile.am
===================================================================
---- sumo-0.30.0.orig/src/Makefile.am
-+++ sumo-0.30.0/src/Makefile.am
-@@ -85,7 +85,6 @@ sumo_gui_LDADD = ./gui/libgui.a \
- ./mesogui/libmesogui.a \
- ./osgview/libosgview.a \
- $(sumo_LDADD) \
--./foreign/gl2ps/libgl2ps.a \
- ./foreign/polyfonts/libpolyfonts.a \
- ./gui/GUIManipulator.o \
- ./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo-0.30.0/src/Makefile.in
+--- sumo-0.32.0.orig/src/foreign/Makefile.am
++++ sumo-0.32.0/src/foreign/Makefile.am
+@@ -1,5 +1,5 @@
+ if WITH_GUI
+-GUIDIRS = gl2ps rtree fontstash
++GUIDIRS = rtree fontstash
+ endif
+
+ SUBDIRS = eulerspiral tcpip PHEMlight $(GUIDIRS)
+Index: sumo-0.32.0/src/foreign/Makefile.in
===================================================================
---- sumo-0.30.0.orig/src/Makefile.in
-+++ sumo-0.30.0/src/Makefile.in
-@@ -169,7 +169,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
- @WITH_GUI_TRUE@ ./utils/foxtools/libfoxtools.a \
- @WITH_GUI_TRUE@ ./mesogui/libmesogui.a ./osgview/libosgview.a \
- @WITH_GUI_TRUE@ $(am__DEPENDENCIES_3) \
-- at WITH_GUI_TRUE@ ./foreign/gl2ps/libgl2ps.a \
- @WITH_GUI_TRUE@ ./foreign/polyfonts/libpolyfonts.a \
- @WITH_GUI_TRUE@ ./gui/GUIManipulator.o \
- @WITH_GUI_TRUE@ ./gui/GUITLLogicPhasesTrackerWindow.o \
-@@ -495,7 +494,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
- @WITH_GUI_TRUE at ./mesogui/libmesogui.a \
- @WITH_GUI_TRUE at ./osgview/libosgview.a \
- @WITH_GUI_TRUE@$(sumo_LDADD) \
-- at WITH_GUI_TRUE@./foreign/gl2ps/libgl2ps.a \
- @WITH_GUI_TRUE at ./foreign/polyfonts/libpolyfonts.a \
- @WITH_GUI_TRUE at ./gui/GUIManipulator.o \
- @WITH_GUI_TRUE at ./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo-0.30.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
+--- sumo-0.32.0.orig/src/foreign/Makefile.in
++++ sumo-0.32.0/src/foreign/Makefile.in
+@@ -152,7 +152,7 @@ am__define_uniq_tagged_files = \
+ done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = eulerspiral tcpip PHEMlight gl2ps rtree fontstash
++DIST_SUBDIRS = eulerspiral tcpip PHEMlight rtree fontstash
+ am__DIST_COMMON = $(srcdir)/Makefile.in
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+@@ -327,7 +327,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+- at WITH_GUI_TRUE@GUIDIRS = gl2ps rtree fontstash
++ at WITH_GUI_TRUE@GUIDIRS = rtree fontstash
+ SUBDIRS = eulerspiral tcpip PHEMlight $(GUIDIRS)
+ all: all-recursive
+
+Index: sumo-0.32.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
===================================================================
---- sumo-0.30.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
-+++ sumo-0.30.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
-@@ -39,7 +39,7 @@
+--- sumo-0.32.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
++++ sumo-0.32.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
+@@ -37,7 +37,7 @@
+ #include <cassert>
#include <limits>
#include <fxkeys.h>
- #include <foreign/polyfonts/polyfonts.h>
-#include <foreign/gl2ps/gl2ps.h>
+#include <gl2ps.h>
#include <utils/foxtools/FXSingleEventThread.h>
#include <utils/foxtools/MFXCheckableButton.h>
#include <utils/foxtools/MFXImageHelper.h>
-Index: sumo-0.30.0/configure.ac
-===================================================================
---- sumo-0.30.0.orig/configure.ac
-+++ sumo-0.30.0/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/PHEMlight/Makefile
- src/foreign/PHEMlight/cpp/Makefile
-Index: sumo-0.30.0/src/netedit/Makefile.am
+Index: sumo-0.32.0/src/netedit/Makefile.am
===================================================================
---- sumo-0.30.0.orig/src/netedit/Makefile.am
-+++ sumo-0.30.0/src/netedit/Makefile.am
-@@ -107,7 +107,6 @@ netedit_LDADD = ../netimport/libnetimpor
+--- sumo-0.32.0.orig/src/netedit/Makefile.am
++++ sumo-0.32.0/src/netedit/Makefile.am
+@@ -112,7 +112,6 @@ netedit_LDADD = ../netimport/libnetimpor
../utils/gui/tracker/libguiutilstracker.a \
../utils/foxtools/libfoxtools.a \
../utils/distribution/libdistribution.a \
-../foreign/gl2ps/libgl2ps.a \
- ../foreign/polyfonts/libpolyfonts.a \
../foreign/eulerspiral/libeulerspiral.a \
../utils/geom/libgeom.a \
-Index: sumo-0.30.0/src/netedit/Makefile.in
+ ../utils/shapes/libshapes.a \
+Index: sumo-0.32.0/src/netedit/Makefile.in
===================================================================
---- sumo-0.30.0.orig/src/netedit/Makefile.in
-+++ sumo-0.30.0/src/netedit/Makefile.in
-@@ -232,7 +232,6 @@ am__DEPENDENCIES_1 =
+--- sumo-0.32.0.orig/src/netedit/Makefile.in
++++ sumo-0.32.0/src/netedit/Makefile.in
+@@ -251,7 +251,6 @@ am__DEPENDENCIES_1 =
@WITH_GUI_TRUE@ ../utils/gui/tracker/libguiutilstracker.a \
@WITH_GUI_TRUE@ ../utils/foxtools/libfoxtools.a \
@WITH_GUI_TRUE@ ../utils/distribution/libdistribution.a \
- at WITH_GUI_TRUE@ ../foreign/gl2ps/libgl2ps.a \
- @WITH_GUI_TRUE@ ../foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE@ ../foreign/eulerspiral/libeulerspiral.a \
@WITH_GUI_TRUE@ ../utils/geom/libgeom.a \
-@@ -570,7 +569,6 @@ EXTRA_DIST = netedit64.ico netedit.rc
+ @WITH_GUI_TRUE@ ../utils/shapes/libshapes.a \
+@@ -598,7 +597,6 @@ EXTRA_DIST = netedit64.ico netedit.rc
@WITH_GUI_TRUE at ../utils/gui/tracker/libguiutilstracker.a \
@WITH_GUI_TRUE at ../utils/foxtools/libfoxtools.a \
@WITH_GUI_TRUE at ../utils/distribution/libdistribution.a \
- at WITH_GUI_TRUE@../foreign/gl2ps/libgl2ps.a \
- @WITH_GUI_TRUE at ../foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE at ../foreign/eulerspiral/libeulerspiral.a \
@WITH_GUI_TRUE at ../utils/geom/libgeom.a \
-Index: sumo-0.30.0/src/foreign/Makefile.am
+ @WITH_GUI_TRUE at ../utils/shapes/libshapes.a \
+Index: sumo-0.32.0/src/Makefile.am
===================================================================
---- sumo-0.30.0.orig/src/foreign/Makefile.am
-+++ sumo-0.30.0/src/foreign/Makefile.am
-@@ -1,5 +1,5 @@
- if WITH_GUI
--GUIDIRS = gl2ps polyfonts rtree
-+GUIDIRS = polyfonts rtree
- endif
-
- SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(GUIDIRS)
-Index: sumo-0.30.0/src/foreign/Makefile.in
+--- sumo-0.32.0.orig/src/Makefile.am
++++ sumo-0.32.0/src/Makefile.am
+@@ -85,7 +85,6 @@ sumo_gui_LDADD = ./gui/libgui.a \
+ ./mesogui/libmesogui.a \
+ ./osgview/libosgview.a \
+ $(sumo_LDADD) \
+-./foreign/gl2ps/libgl2ps.a \
+ ./gui/GUIManipulator.o \
+ ./gui/GUITLLogicPhasesTrackerWindow.o \
+ $(OSG_LIBS) $(FFMPEG_LIBS) \
+Index: sumo-0.32.0/src/Makefile.in
===================================================================
---- sumo-0.30.0.orig/src/foreign/Makefile.in
-+++ sumo-0.30.0/src/foreign/Makefile.in
-@@ -142,7 +142,7 @@ am__define_uniq_tagged_files = \
- done | $(am__uniquify_input)`
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = eulerspiral mersenne tcpip PHEMlight gl2ps polyfonts \
-+DIST_SUBDIRS = eulerspiral mersenne tcpip PHEMlight polyfonts \
- rtree
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- am__relativize = \
-@@ -313,7 +313,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-- at WITH_GUI_TRUE@GUIDIRS = gl2ps polyfonts rtree
-+ at WITH_GUI_TRUE@GUIDIRS = polyfonts rtree
- SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(GUIDIRS)
- all: all-recursive
-
+--- sumo-0.32.0.orig/src/Makefile.in
++++ sumo-0.32.0/src/Makefile.in
+@@ -178,7 +178,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
+ @WITH_GUI_TRUE@ ./utils/foxtools/libfoxtools.a \
+ @WITH_GUI_TRUE@ ./mesogui/libmesogui.a ./osgview/libosgview.a \
+ @WITH_GUI_TRUE@ $(am__DEPENDENCIES_3) \
+- at WITH_GUI_TRUE@ ./foreign/gl2ps/libgl2ps.a \
+ @WITH_GUI_TRUE@ ./gui/GUIManipulator.o \
+ @WITH_GUI_TRUE@ ./gui/GUITLLogicPhasesTrackerWindow.o \
+ @WITH_GUI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -510,7 +509,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
+ @WITH_GUI_TRUE at ./mesogui/libmesogui.a \
+ @WITH_GUI_TRUE at ./osgview/libosgview.a \
+ @WITH_GUI_TRUE@$(sumo_LDADD) \
+- at WITH_GUI_TRUE@./foreign/gl2ps/libgl2ps.a \
+ @WITH_GUI_TRUE at ./gui/GUIManipulator.o \
+ @WITH_GUI_TRUE at ./gui/GUITLLogicPhasesTrackerWindow.o \
+ @WITH_GUI_TRUE@$(OSG_LIBS) $(FFMPEG_LIBS) \
+Index: sumo-0.32.0/configure.ac
+===================================================================
+--- sumo-0.32.0.orig/configure.ac
++++ sumo-0.32.0/configure.ac
+@@ -450,7 +450,6 @@ src/activitygen/city/Makefile
+ src/foreign/Makefile
+ src/foreign/eulerspiral/Makefile
+ src/foreign/fontstash/Makefile
+-src/foreign/gl2ps/Makefile
+ src/foreign/PHEMlight/Makefile
+ src/foreign/PHEMlight/cpp/Makefile
+ src/foreign/rtree/Makefile
diff --git a/debian/patches/20_fix_scripts_headers.patch b/debian/patches/20_fix_scripts_headers.patch
index 2138613..acf20b5 100644
--- a/debian/patches/20_fix_scripts_headers.patch
+++ b/debian/patches/20_fix_scripts_headers.patch
@@ -2,73 +2,73 @@ Description: fixes headers of scripts
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+Index: sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
===================================================================
---- sumo.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
-+++ sumo/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+--- sumo-0.32.0.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
++++ sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
- """
- @file CalcTime.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+ # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+ # Copyright (C) 2008-2017 German Aerospace Center (DLR) and others.
+Index: sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
===================================================================
---- sumo.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
-+++ sumo/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+--- sumo-0.32.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
++++ sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
- """
- @file Path.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+ # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+ # Copyright (C) 2008-2017 German Aerospace Center (DLR) and others.
+Index: sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
===================================================================
---- sumo.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
-+++ sumo/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+--- sumo-0.32.0.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
++++ sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
- """
- @file ProgressBar.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+ # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+ # Copyright (C) 2008-2017 German Aerospace Center (DLR) and others.
+Index: sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
===================================================================
---- sumo.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
-+++ sumo/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+--- sumo-0.32.0.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
++++ sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
- """
- @file CalcTime.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+ # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+ # Copyright (C) 2008-2017 German Aerospace Center (DLR) and others.
+Index: sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
===================================================================
---- sumo.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
-+++ sumo/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+--- sumo-0.32.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
++++ sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
- """
- @file Reader.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+ # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+ # Copyright (C) 2008-2017 German Aerospace Center (DLR) and others.
+Index: sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
===================================================================
---- sumo.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
-+++ sumo/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+--- sumo-0.32.0.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
++++ sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
- """
- @file BinarySearch.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+ # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+ # Copyright (C) 2008-2017 German Aerospace Center (DLR) and others.
+Index: sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
===================================================================
---- sumo.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
-+++ sumo/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+--- sumo-0.32.0.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
++++ sumo-0.32.0/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
- """
- @file GenerateTaxiRoutes.py
-Index: sumo/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
+ # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
+ # Copyright (C) 2008-2017 German Aerospace Center (DLR) and others.
+Index: sumo-0.32.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
===================================================================
--- /dev/null
-+++ sumo/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
++++ sumo-0.32.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+
@@ -183,10 +183,10 @@ Index: sumo/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
+ <interval begin="450.00" end="451.00" id="dump_25">
+ </interval>
+</netstats>
-Index: sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
+Index: sumo-0.32.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
===================================================================
--- /dev/null
-+++ sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
++++ sumo-0.32.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0"?>
+
@@ -658,10 +658,10 @@ Index: sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
+ <step time="437.00" loaded="134" emitted="132" running="115" waiting="2" ended="17" meanWaitingTime="3.61" meanTravelTime="232.88" />
+ <step time="438.00" loaded="135" emitted="133" running="116" waiting="2" ended="17" meanWaitingTime="3.71" meanTravelTime="232.88" />
+</summary>
-Index: sumo/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
+Index: sumo-0.32.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
===================================================================
--- /dev/null
-+++ sumo/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
++++ sumo-0.32.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
@@ -741,10 +741,10 @@ Index: sumo/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
+ <tripinfo id="horizontal.22" depart="320.00" departLane="2fi_0" departPos="3.10" departSpeed="0.00" departDelay="0.00" arrival="588.00" arrivalLane="2fi_0" arrivalPos="253.35" arrivalSpeed="10.84" duration="268.00" routeLength="2198.85" waitSteps="36" rerouteNo="0" devices="tripinfo_horizontal.22" vType="SUMO_DEFAULT_TYPE" vaporized=""/>
+ <tripinfo id="horizontal.23" depart="341.00" departLane="2fi_0" departPos="3.10" departSpeed="0.00" departDelay="11.00" arrival="590.00" arrivalLane="2fi_0" arrivalPos="257.97" arrivalSpeed="10.90" duration="249.00" routeLength="2203.47" waitSteps="16" rerouteNo="0" devices="tripinfo_horizontal.23" vType="SUMO_DEFAULT_TYPE" vaporized=""/>
+</tripinfos>
-Index: sumo/docs/examples/sumo/busses/vehroutes.xml
+Index: sumo-0.32.0/docs/examples/sumo/busses/vehroutes.xml
===================================================================
--- /dev/null
-+++ sumo/docs/examples/sumo/busses/vehroutes.xml
++++ sumo-0.32.0/docs/examples/sumo/busses/vehroutes.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
@@ -784,10 +784,10 @@ Index: sumo/docs/examples/sumo/busses/vehroutes.xml
+ </vehicle>
+
+</routes>
-Index: sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
+Index: sumo-0.32.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
===================================================================
--- /dev/null
-+++ sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
++++ sumo-0.32.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
@@ -815,13 +815,3 @@ Index: sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
+
+<routes>
+</routes>
-Index: sumo/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py
-===================================================================
---- sumo.orig/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py
-+++ sumo/tools/contributed/sumopy/agilepy/lib_wx/ogleditor.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python;
-+#!/usr/bin/env python
- """OpenGL editor"""
- if __name__ == '__main__':
- __version__ = "0.1a"
diff --git a/debian/patches/30_add_missing_link.patch b/debian/patches/30_add_missing_link.patch
index 9bca05c..a71aa97 100644
--- a/debian/patches/30_add_missing_link.patch
+++ b/debian/patches/30_add_missing_link.patch
@@ -4,21 +4,21 @@ Author: Daniel T Chen <crimsun at ubuntu.com>, Julian Taylor <jtaylor.debian at google
Origin: https://launchpadlibrarian.net/137511659/sumo_0.16.0~dfsg-1~exp1_0.16.0~dfsg-1~exp1ubuntu1.diff.gz
Reviewed-by: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo-0.30.0/src/Makefile.am
+Index: sumo-0.32.0/src/Makefile.am
===================================================================
---- sumo-0.30.0.orig/src/Makefile.am
-+++ sumo-0.30.0/src/Makefile.am
+--- sumo-0.32.0.orig/src/Makefile.am
++++ sumo-0.32.0/src/Makefile.am
@@ -1,4 +1,4 @@
-XERCES_LIBS = -l$(LIB_XERCES)
+XERCES_LIBS = -l$(LIB_XERCES) -lpthread -lGLU -lGL
if WITH_GUI
GUI_APPS = sumo-gui
-Index: sumo-0.30.0/src/Makefile.in
+Index: sumo-0.32.0/src/Makefile.in
===================================================================
---- sumo-0.30.0.orig/src/Makefile.in
-+++ sumo-0.30.0/src/Makefile.in
-@@ -368,7 +368,7 @@ STRIP = @STRIP@
+--- sumo-0.32.0.orig/src/Makefile.in
++++ sumo-0.32.0/src/Makefile.in
+@@ -383,7 +383,7 @@ STRIP = @STRIP@
VERSION = @VERSION@
XERCES_CFLAGS = @XERCES_CFLAGS@
XERCES_LDFLAGS = @XERCES_LDFLAGS@
diff --git a/debian/patches/40_drop_some_buildflags.patch b/debian/patches/40_drop_some_buildflags.patch
index 5b20512..5144029 100644
--- a/debian/patches/40_drop_some_buildflags.patch
+++ b/debian/patches/40_drop_some_buildflags.patch
@@ -2,11 +2,11 @@ Description: drop msse2 buildfpags, unsupported by some platforms
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-20
-Index: sumo-0.30.0/configure.ac
+Index: sumo-0.32.0/configure.ac
===================================================================
---- sumo-0.30.0.orig/configure.ac
-+++ sumo-0.30.0/configure.ac
-@@ -90,11 +90,6 @@ dnl - - - - - - - - - - - - - - - - - -
+--- sumo-0.32.0.orig/configure.ac
++++ sumo-0.32.0/configure.ac
+@@ -96,11 +96,6 @@ dnl - - - - - - - - - - - - - - - - - -
case "$host" in
x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux*)
dnl Make sure we are on architecture that supports SIMD
diff --git a/debian/patches/50_use_system_openlayers.patch b/debian/patches/50_use_system_openlayers.patch
index 28ab8b9..eda4c1b 100644
--- a/debian/patches/50_use_system_openlayers.patch
+++ b/debian/patches/50_use_system_openlayers.patch
@@ -2,10 +2,10 @@ Description: Use system packaged OpenLayers.js
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-01-12
-Index: sumo-0.30.0/tools/webWizard/index.html
+Index: sumo-0.32.0/tools/webWizard/index.html
===================================================================
---- sumo-0.30.0.orig/tools/webWizard/index.html
-+++ sumo-0.30.0/tools/webWizard/index.html
+--- sumo-0.32.0.orig/tools/webWizard/index.html
++++ sumo-0.32.0/tools/webWizard/index.html
@@ -5,7 +5,7 @@
<meta charset="utf-8" />
<link rel="stylesheet" href="style.css" />
--
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