[sumo] 04/06: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Tue Nov 8 21:51:29 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 34dd7fe8651c827d62b3e0f1e06dd780a56a71b9
Author: Anton Gladky <gladk at debian.org>
Date: Tue Nov 8 22:43:48 2016 +0100
Refresh patches.
---
debian/patches/20_fix_scripts_headers.patch | 62 ++++++++++++++---------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/debian/patches/20_fix_scripts_headers.patch b/debian/patches/20_fix_scripts_headers.patch
index dc84246..162953e 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.28.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+Index: sumo/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
===================================================================
---- sumo-0.28.0.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
-+++ sumo-0.28.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
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
-Index: sumo-0.28.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/Path.py
===================================================================
---- sumo-0.28.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
-+++ sumo-0.28.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
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Path.py
-Index: sumo-0.28.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
===================================================================
---- sumo-0.28.0.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
-+++ sumo-0.28.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
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file ProgressBar.py
-Index: sumo-0.28.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
===================================================================
---- sumo-0.28.0.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
-+++ sumo-0.28.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
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
-Index: sumo-0.28.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
===================================================================
---- sumo-0.28.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
-+++ sumo-0.28.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
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Reader.py
-Index: sumo-0.28.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
===================================================================
---- sumo-0.28.0.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
-+++ sumo-0.28.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
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file BinarySearch.py
-Index: sumo-0.28.0/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+Index: sumo/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
===================================================================
---- sumo-0.28.0.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
-+++ sumo-0.28.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
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateTaxiRoutes.py
-Index: sumo-0.28.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
+Index: sumo/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
===================================================================
--- /dev/null
-+++ sumo-0.28.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
++++ sumo/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+
@@ -183,10 +183,10 @@ Index: sumo-0.28.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.28.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
+Index: sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
===================================================================
--- /dev/null
-+++ sumo-0.28.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
++++ sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0"?>
+
@@ -658,10 +658,10 @@ Index: sumo-0.28.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.28.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
+Index: sumo/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
===================================================================
--- /dev/null
-+++ sumo-0.28.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
++++ sumo/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
@@ -741,10 +741,10 @@ Index: sumo-0.28.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.28.0/docs/examples/sumo/busses/vehroutes.xml
+Index: sumo/docs/examples/sumo/busses/vehroutes.xml
===================================================================
--- /dev/null
-+++ sumo-0.28.0/docs/examples/sumo/busses/vehroutes.xml
++++ sumo/docs/examples/sumo/busses/vehroutes.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
@@ -784,10 +784,10 @@ Index: sumo-0.28.0/docs/examples/sumo/busses/vehroutes.xml
+ </vehicle>
+
+</routes>
-Index: sumo-0.28.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
+Index: sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
===================================================================
--- /dev/null
-+++ sumo-0.28.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
++++ sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
--
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