[sumo] 03/04: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Sat Mar 15 18:48:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit 0c91c6349f3680a0cc2e5dd8c1986c8ade9f0649
Author: Anton Gladky <gladk at debian.org>
Date: Sat Mar 15 16:49:40 2014 +0100
Refresh patches.
---
debian/patches/add_missing_link.patch | 2 +-
debian/patches/fix_scripts_headers.patch | 339 +----------------------------
debian/patches/remove_embedded_gl2ps.patch | 12 +-
3 files changed, 8 insertions(+), 345 deletions(-)
diff --git a/debian/patches/add_missing_link.patch b/debian/patches/add_missing_link.patch
index d6e536d..21f2a92 100644
--- a/debian/patches/add_missing_link.patch
+++ b/debian/patches/add_missing_link.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-08-30
MESO_LIBS = ./mesosim/libmesosim.a
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -252,7 +252,7 @@
+@@ -351,7 +351,7 @@
VERSION = @VERSION@
XERCES_CFLAGS = @XERCES_CFLAGS@
XERCES_LDFLAGS = @XERCES_LDFLAGS@
diff --git a/debian/patches/fix_scripts_headers.patch b/debian/patches/fix_scripts_headers.patch
index 4ddbd88..c82a369 100644
--- a/debian/patches/fix_scripts_headers.patch
+++ b/debian/patches/fix_scripts_headers.patch
@@ -2,41 +2,6 @@ Description: fixes headers of scripts
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-12-04
---- a/tools/projects/TLS-Evaluationsszenarien/test.py
-+++ b/tools/projects/TLS-Evaluationsszenarien/test.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from evaluator import *
- from plotter import *
-
-@@ -67,4 +68,4 @@
- xlabel("Flow")
- ylabel("Average Delay NS")
- legend(("FC", "VA"),loc='upper left')
--show()
-\ No newline at end of file
-+show()
---- a/tools/projects/TLS-Evaluationsszenarien/main.py
-+++ b/tools/projects/TLS-Evaluationsszenarien/main.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import subprocess, sys, os, re, shutil
- from genRoutes import *
- from evaluator import *
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverTime.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverTime.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file VelocityOverTime.py
-@@ -185,4 +186,4 @@
-
- #start the program
- #profile.run('main()')
--main()
-\ No newline at end of file
-+main()
--- a/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
@@ -1,3 +1,4 @@
@@ -44,109 +9,11 @@ Last-Update: 2012-12-04
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file Traveltime.py
-@@ -308,4 +309,4 @@
-
- #start the program
- #profile.run('main()')
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityCurve.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityCurve.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file VelocityCurve.py
-@@ -160,4 +161,4 @@
-
- #start the program
- #profile.run('main()')
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/FetchData.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/FetchData.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file FetchData.py
-@@ -197,4 +198,4 @@
-
- #start the program
- #profile.run('main()')
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverRoute.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverRoute.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file VelocityOverRoute.py
-@@ -152,4 +153,4 @@
-
- #start the program
- #profile.run('main()')
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime_DK.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime_DK.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
-
- from pylab import *
-@@ -306,4 +307,4 @@
-
- #start the program
- #cProfile.run('main()')
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/CompareVelocitys.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/CompareVelocitys.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file CompareVelocitys.py
-@@ -123,4 +124,4 @@
- outputFile.close()
-
- #start the program
--main()
-\ No newline at end of file
-+main()
--- /dev/null
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file Traveltime.py
-@@ -245,4 +246,4 @@
-
- #start the program
- #profile.run('main()')
--main()
-\ No newline at end of file
-+main()
--- a/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+++ b/tools/projects/TaxiFCD_Krieg/src/util/Path.py
@@ -1,3 +1,4 @@
@@ -154,13 +21,6 @@ Last-Update: 2012-12-04
# -*- coding: Latin-1 -*-
"""
@file Path.py
-@@ -75,4 +76,4 @@
-
-
-
--
-\ No newline at end of file
-+
--- a/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+++ b/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
@@ -1,3 +1,4 @@
@@ -168,13 +28,6 @@ Last-Update: 2012-12-04
# -*- coding: Latin-1 -*-
"""
@file ProgressBar.py
-@@ -36,4 +37,4 @@
- print "**",
- lastProz=actProz
- #call the function
-- fct(list[i])
-\ No newline at end of file
-+ fct(list[i])
--- a/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+++ b/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
@@ -1,3 +1,4 @@
@@ -182,13 +35,6 @@ Last-Update: 2012-12-04
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
-@@ -56,4 +57,4 @@
- return label[:4]+"-"+label[4:6]+"-"+label[6:8]+" "+label[8:10]+":"+label[10:12]+":"+label[12:]
-
- #start the program
--#main()
-\ No newline at end of file
-+#main()
--- a/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+++ b/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
@@ -1,3 +1,4 @@
@@ -206,96 +52,12 @@ Last-Update: 2012-12-04
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
-
- def isElmInList(list,elm):
---- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlot.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlot.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- from pylab import *
- from os import walk
---- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import sys
- from pylab import *
-
---- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsOLD.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsOLD.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
"""
- @file GenerateRawFCD.py
-@@ -190,4 +191,4 @@
-
- #start the program
- #profile.run('main()')
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file GenerateRawFCD.py
-@@ -229,4 +230,4 @@
-
- #start the program
- #profile.run('main()')
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsProcessedFCD.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsProcessedFCD.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file GenerateRawFCD.py
-@@ -366,4 +367,4 @@
-
- #start the program
- #cProfile.run('main()')
--main()
-\ No newline at end of file
-+main()
+ @file BinarySearch.py
--- /dev/null
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python
---- a/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/FCDvsCompleteRoute.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/FCDvsCompleteRoute.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file FCDvsCompleteRoute.py
-@@ -151,4 +152,4 @@
-
-
- #start the program
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutesMain.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutesMain.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file GenerateTaxiRoutesMain.py
-@@ -27,4 +28,4 @@
- print "end"
-
- #start the program
--main()
-\ No newline at end of file
-+main()
--- a/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
@@ -1,3 +1,4 @@
@@ -308,102 +70,11 @@ Last-Update: 2012-12-04
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+
---- a/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/differentDepartRoutes.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/differentDepartRoutes.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file GenerateTaxiRoutesMain.py
-@@ -68,4 +69,4 @@
-
-
- #start the program
--main()
-\ No newline at end of file
-+main()
--- /dev/null
+++ b/tools/projects/TaxiFCD_Krieg/src/backup/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+
---- a/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file TaxisPerEdge.py
-@@ -60,4 +61,4 @@
-
-
- #start the program
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/SeparateVLSArea.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/SeparateVLSArea.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file SeparateVLSArea.py
-@@ -44,4 +45,4 @@
-
-
- #start the program
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/QuantityOverDay.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/QuantityOverDay.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file QuantityOverDay.py
-@@ -83,4 +84,4 @@
-
-
- #start the program
--main()
-\ No newline at end of file
-+main()
---- a/tools/projects/TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # -*- coding: Latin-1 -*-
- """
- @file GenerateRawFCD.py
-@@ -73,4 +74,4 @@
-
-
-
--
-\ No newline at end of file
-+
---- a/tools/projects/orinoko/buildConnections.pl
-+++ b/tools/projects/orinoko/buildConnections.pl
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env perl
- sub getAttr($$) {
- my $text = $_[0];
- my $attrname = $_[1];
---- a/tools/shapes/CSV2polyconvertXML.py
-+++ b/tools/shapes/CSV2polyconvertXML.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- @file CSV2polyconvertXML.py
- @author Daniel Krajzewicz
-@@ -43,4 +44,4 @@
- inpf.close()
- outf.close()
-
--
-\ No newline at end of file
-+
--- /dev/null
+++ b/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
@@ -0,0 +1,113 @@
@@ -1144,11 +815,3 @@ Last-Update: 2012-12-04
+
+<routes>
+</routes>
---- a/tools/import/osm/osmPopulationExtractor.py
-+++ b/tools/import/osm/osmPopulationExtractor.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python
- """
- @file osmPopulationExactor.py
- @author Yun-Pang Floetteroed
diff --git a/debian/patches/remove_embedded_gl2ps.patch b/debian/patches/remove_embedded_gl2ps.patch
index 7a7d375..188340c 100644
--- a/debian/patches/remove_embedded_gl2ps.patch
+++ b/debian/patches/remove_embedded_gl2ps.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-12-04
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -99,7 +99,6 @@
+@@ -85,7 +85,6 @@
./utils/foxtools/libfoxtools.a \
$(MESOGUI_LIBS) \
$(sumo_LDADD) \
@@ -14,7 +14,7 @@ Last-Update: 2012-12-04
./gui/GUITLLogicPhasesTrackerWindow.o \
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -110,7 +110,6 @@
+@@ -155,7 +155,6 @@
@WITH_GUI_TRUE@ ./utils/gui/tracker/libguiutilstracker.a \
@WITH_GUI_TRUE@ ./utils/foxtools/libfoxtools.a $(MESOGUI_LIBS) \
@WITH_GUI_TRUE@ $(am__DEPENDENCIES_3) \
@@ -22,7 +22,7 @@ Last-Update: 2012-12-04
@WITH_GUI_TRUE@ ./foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE@ ./gui/GUIManipulator.o \
@WITH_GUI_TRUE@ ./gui/GUITLLogicPhasesTrackerWindow.o \
-@@ -388,7 +387,6 @@
+@@ -474,7 +473,6 @@
@WITH_GUI_TRUE at ./utils/foxtools/libfoxtools.a \
@WITH_GUI_TRUE@$(MESOGUI_LIBS) \
@WITH_GUI_TRUE@$(sumo_LDADD) \
@@ -43,8 +43,8 @@ Last-Update: 2012-12-04
--- a/src/foreign/Makefile.in
+++ b/src/foreign/Makefile.in
-@@ -60,7 +60,7 @@
- distdir
+@@ -142,7 +142,7 @@
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = eulerspiral mersenne tcpip nvwa gl2ps polyfonts rtree
@@ -52,7 +52,7 @@ Last-Update: 2012-12-04
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
-@@ -229,7 +229,7 @@
+@@ -311,7 +311,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@CHECK_MEMORY_LEAKS_TRUE at MEMDIRS = nvwa
--
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