[sumo] 02/04: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Fri Aug 12 18:44:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit e550facfb9fe44acaa29501a577e6ff025d389a2
Author: Anton Gladky <gladk at debian.org>
Date: Fri Aug 12 20:33:41 2016 +0200
Refresh patches.
---
debian/patches/10_remove_embedded_gl2ps.patch | 56 ++++++++++++------------
debian/patches/20_fix_scripts_headers.patch | 62 +++++++++++++--------------
debian/patches/30_add_missing_link.patch | 12 +++---
debian/patches/40_drop_some_buildflags.patch | 8 ++--
debian/patches/50_use_system_openlayers.patch | 6 +--
5 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/debian/patches/10_remove_embedded_gl2ps.patch b/debian/patches/10_remove_embedded_gl2ps.patch
index c5b38d0..8f98306 100644
--- a/debian/patches/10_remove_embedded_gl2ps.patch
+++ b/debian/patches/10_remove_embedded_gl2ps.patch
@@ -2,10 +2,10 @@ 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.26.0/src/Makefile.am
+Index: sumo-0.27.1/src/Makefile.am
===================================================================
---- sumo-0.26.0.orig/src/Makefile.am
-+++ sumo-0.26.0/src/Makefile.am
+--- sumo-0.27.1.orig/src/Makefile.am
++++ sumo-0.27.1/src/Makefile.am
@@ -94,7 +94,6 @@ sumo_gui_LDADD = ./gui/libgui.a \
./mesogui/libmesogui.a \
./osgview/libosgview.a \
@@ -14,10 +14,10 @@ Index: sumo-0.26.0/src/Makefile.am
./foreign/polyfonts/libpolyfonts.a \
./gui/GUIManipulator.o \
./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo-0.26.0/src/Makefile.in
+Index: sumo-0.27.1/src/Makefile.in
===================================================================
---- sumo-0.26.0.orig/src/Makefile.in
-+++ sumo-0.26.0/src/Makefile.in
+--- sumo-0.27.1.orig/src/Makefile.in
++++ sumo-0.27.1/src/Makefile.in
@@ -173,7 +173,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
@WITH_GUI_TRUE@ ./utils/foxtools/libfoxtools.a \
@WITH_GUI_TRUE@ ./mesogui/libmesogui.a ./osgview/libosgview.a \
@@ -34,10 +34,10 @@ Index: sumo-0.26.0/src/Makefile.in
@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.26.0/src/foreign/Makefile.am
+Index: sumo-0.27.1/src/foreign/Makefile.am
===================================================================
---- sumo-0.26.0.orig/src/foreign/Makefile.am
-+++ sumo-0.26.0/src/foreign/Makefile.am
+--- sumo-0.27.1.orig/src/foreign/Makefile.am
++++ sumo-0.27.1/src/foreign/Makefile.am
@@ -3,7 +3,7 @@ MEMDIRS = nvwa
endif
@@ -47,10 +47,10 @@ Index: sumo-0.26.0/src/foreign/Makefile.am
endif
SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(MEMDIRS) $(GUIDIRS)
-Index: sumo-0.26.0/src/foreign/Makefile.in
+Index: sumo-0.27.1/src/foreign/Makefile.in
===================================================================
---- sumo-0.26.0.orig/src/foreign/Makefile.in
-+++ sumo-0.26.0/src/foreign/Makefile.in
+--- sumo-0.27.1.orig/src/foreign/Makefile.in
++++ sumo-0.27.1/src/foreign/Makefile.in
@@ -142,7 +142,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
@@ -69,10 +69,10 @@ Index: sumo-0.26.0/src/foreign/Makefile.in
SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(MEMDIRS) $(GUIDIRS)
all: all-recursive
-Index: sumo-0.26.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
+Index: sumo-0.27.1/src/utils/gui/windows/GUISUMOAbstractView.cpp
===================================================================
---- sumo-0.26.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
-+++ sumo-0.26.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
+--- sumo-0.27.1.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
++++ sumo-0.27.1/src/utils/gui/windows/GUISUMOAbstractView.cpp
@@ -39,7 +39,7 @@
#include <limits>
#include <fxkeys.h>
@@ -82,11 +82,11 @@ Index: sumo-0.26.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
#include <utils/foxtools/FXSingleEventThread.h>
#include <utils/foxtools/MFXCheckableButton.h>
#include <utils/foxtools/MFXImageHelper.h>
-Index: sumo-0.26.0/configure.ac
+Index: sumo-0.27.1/configure.ac
===================================================================
---- sumo-0.26.0.orig/configure.ac
-+++ sumo-0.26.0/configure.ac
-@@ -459,7 +459,6 @@ src/activitygen/activities/Makefile
+--- sumo-0.27.1.orig/configure.ac
++++ sumo-0.27.1/configure.ac
+@@ -467,7 +467,6 @@ src/activitygen/activities/Makefile
src/activitygen/city/Makefile
src/foreign/Makefile
src/foreign/eulerspiral/Makefile
@@ -94,11 +94,11 @@ Index: sumo-0.26.0/configure.ac
src/foreign/mersenne/Makefile
src/foreign/nvwa/Makefile
src/foreign/PHEMlight/Makefile
-Index: sumo-0.26.0/src/netedit/Makefile.am
+Index: sumo-0.27.1/src/netedit/Makefile.am
===================================================================
---- sumo-0.26.0.orig/src/netedit/Makefile.am
-+++ sumo-0.26.0/src/netedit/Makefile.am
-@@ -66,7 +66,6 @@ netedit_LDADD = ../netimport/libnetimpor
+--- sumo-0.27.1.orig/src/netedit/Makefile.am
++++ sumo-0.27.1/src/netedit/Makefile.am
+@@ -94,7 +94,6 @@ netedit_LDADD = ../netimport/libnetimpor
../utils/gui/tracker/libguiutilstracker.a \
../utils/foxtools/libfoxtools.a \
../utils/distribution/libdistribution.a \
@@ -106,11 +106,11 @@ Index: sumo-0.26.0/src/netedit/Makefile.am
../foreign/polyfonts/libpolyfonts.a \
../foreign/eulerspiral/libeulerspiral.a \
../utils/geom/libgeom.a \
-Index: sumo-0.26.0/src/netedit/Makefile.in
+Index: sumo-0.27.1/src/netedit/Makefile.in
===================================================================
---- sumo-0.26.0.orig/src/netedit/Makefile.in
-+++ sumo-0.26.0/src/netedit/Makefile.in
-@@ -152,7 +152,6 @@ am__DEPENDENCIES_1 =
+--- sumo-0.27.1.orig/src/netedit/Makefile.in
++++ sumo-0.27.1/src/netedit/Makefile.in
+@@ -196,7 +196,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 \
@@ -118,7 +118,7 @@ Index: sumo-0.26.0/src/netedit/Makefile.in
@WITH_GUI_TRUE@ ../foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE@ ../foreign/eulerspiral/libeulerspiral.a \
@WITH_GUI_TRUE@ ../utils/geom/libgeom.a \
-@@ -445,7 +444,6 @@ EXTRA_DIST = netedit64.ico tlslogo.cpp
+@@ -517,7 +516,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 \
diff --git a/debian/patches/20_fix_scripts_headers.patch b/debian/patches/20_fix_scripts_headers.patch
index 19dcaff..698012a 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-0.26.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+Index: sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
===================================================================
---- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
-+++ sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+--- sumo-0.27.1.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
++++ sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
-Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+Index: sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/Path.py
===================================================================
---- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
-+++ sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+--- sumo-0.27.1.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
++++ sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/Path.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Path.py
-Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+Index: sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
===================================================================
---- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
-+++ sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+--- sumo-0.27.1.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
++++ sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file ProgressBar.py
-Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+Index: sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
===================================================================
---- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
-+++ sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+--- sumo-0.27.1.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
++++ sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
-Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+Index: sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
===================================================================
---- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
-+++ sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+--- sumo-0.27.1.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
++++ sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Reader.py
-Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+Index: sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
===================================================================
---- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
-+++ sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+--- sumo-0.27.1.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
++++ sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file BinarySearch.py
-Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+Index: sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
===================================================================
---- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
-+++ sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+--- sumo-0.27.1.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
++++ sumo-0.27.1/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateTaxiRoutes.py
-Index: sumo-0.26.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
+Index: sumo-0.27.1/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
===================================================================
--- /dev/null
-+++ sumo-0.26.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
++++ sumo-0.27.1/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+
@@ -183,10 +183,10 @@ Index: sumo-0.26.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
+ <interval begin="450.00" end="451.00" id="dump_25">
+ </interval>
+</netstats>
-Index: sumo-0.26.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
+Index: sumo-0.27.1/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
===================================================================
--- /dev/null
-+++ sumo-0.26.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
++++ sumo-0.27.1/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0"?>
+
@@ -658,10 +658,10 @@ Index: sumo-0.26.0/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-0.26.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
+Index: sumo-0.27.1/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
===================================================================
--- /dev/null
-+++ sumo-0.26.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
++++ sumo-0.27.1/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
@@ -741,10 +741,10 @@ Index: sumo-0.26.0/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-0.26.0/docs/examples/sumo/busses/vehroutes.xml
+Index: sumo-0.27.1/docs/examples/sumo/busses/vehroutes.xml
===================================================================
--- /dev/null
-+++ sumo-0.26.0/docs/examples/sumo/busses/vehroutes.xml
++++ sumo-0.27.1/docs/examples/sumo/busses/vehroutes.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
@@ -784,10 +784,10 @@ Index: sumo-0.26.0/docs/examples/sumo/busses/vehroutes.xml
+ </vehicle>
+
+</routes>
-Index: sumo-0.26.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
+Index: sumo-0.27.1/docs/examples/sumo/vehicle_stops/vehroutes.xml
===================================================================
--- /dev/null
-+++ sumo-0.26.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
++++ sumo-0.27.1/docs/examples/sumo/vehicle_stops/vehroutes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
diff --git a/debian/patches/30_add_missing_link.patch b/debian/patches/30_add_missing_link.patch
index 3206ef3..3cb268f 100644
--- a/debian/patches/30_add_missing_link.patch
+++ b/debian/patches/30_add_missing_link.patch
@@ -5,20 +5,20 @@ Bug-Debian: http://bugs.debian.org/710373
Reviewed-By: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo-0.26.0/src/Makefile.am
+Index: sumo-0.27.1/src/Makefile.am
===================================================================
---- sumo-0.26.0.orig/src/Makefile.am
-+++ sumo-0.26.0/src/Makefile.am
+--- sumo-0.27.1.orig/src/Makefile.am
++++ sumo-0.27.1/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.26.0/src/Makefile.in
+Index: sumo-0.27.1/src/Makefile.in
===================================================================
---- sumo-0.26.0.orig/src/Makefile.in
-+++ sumo-0.26.0/src/Makefile.in
+--- sumo-0.27.1.orig/src/Makefile.in
++++ sumo-0.27.1/src/Makefile.in
@@ -372,7 +372,7 @@ STRIP = @STRIP@
VERSION = @VERSION@
XERCES_CFLAGS = @XERCES_CFLAGS@
diff --git a/debian/patches/40_drop_some_buildflags.patch b/debian/patches/40_drop_some_buildflags.patch
index 856c551..1fa87a1 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.26.0/configure.ac
+Index: sumo-0.27.1/configure.ac
===================================================================
---- sumo-0.26.0.orig/configure.ac
-+++ sumo-0.26.0/configure.ac
-@@ -109,11 +109,6 @@ dnl - - - - - - - - - - - - - - - - - -
+--- sumo-0.27.1.orig/configure.ac
++++ sumo-0.27.1/configure.ac
+@@ -117,11 +117,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 178214e..439c0db 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.26.0/tools/webWizard/index.html
+Index: sumo-0.27.1/tools/webWizard/index.html
===================================================================
---- sumo-0.26.0.orig/tools/webWizard/index.html
-+++ sumo-0.26.0/tools/webWizard/index.html
+--- sumo-0.27.1.orig/tools/webWizard/index.html
++++ sumo-0.27.1/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