[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. debian/0.16.0_dfsg-1_exp1-7-g9c021ce
Anton Gladky
gladky.anton at gmail.com
Wed May 8 21:55:55 UTC 2013
The following commit has been merged in the master branch:
commit d29e6e2f5674f1a63b1f18472eeab89d040b0148
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Wed May 8 23:32:16 2013 +0200
Refresh patches.
diff --git a/debian/patches/drop_eulerspiral.patch b/debian/patches/drop_eulerspiral.patch
index 9897daf..45a6f11 100644
--- a/debian/patches/drop_eulerspiral.patch
+++ b/debian/patches/drop_eulerspiral.patch
@@ -12,7 +12,7 @@ Last-Update: 2012-12-04
#include <utils/options/OptionsCont.h>
#include <utils/common/FileHelpers.h>
#include <utils/xml/XMLSubSys.h>
-@@ -705,9 +704,6 @@
+@@ -718,9 +717,6 @@
case OPENDRIVE_GT_LINE:
geom = geomFromLine(e, g);
break;
@@ -22,7 +22,7 @@ Last-Update: 2012-12-04
case OPENDRIVE_GT_ARC:
geom = geomFromArc(e, g);
break;
-@@ -738,23 +734,6 @@
+@@ -758,23 +754,6 @@
return ret;
}
@@ -48,7 +48,7 @@ Last-Update: 2012-12-04
NIImporter_OpenDrive::geomFromArc(const OpenDriveEdge& e, const OpenDriveGeometry& g) {
--- a/configure
+++ b/configure
-@@ -17421,7 +17421,7 @@
+@@ -17427,7 +17427,7 @@
@@ -57,7 +57,7 @@ Last-Update: 2012-12-04
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -18577,7 +18577,6 @@
+@@ -18583,7 +18583,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" ;;
@@ -67,7 +67,7 @@ Last-Update: 2012-12-04
"src/foreign/nvwa/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/nvwa/Makefile" ;;
--- a/configure.ac
+++ b/configure.ac
-@@ -444,7 +444,6 @@
+@@ -448,7 +448,6 @@
src/activitygen/activities/Makefile
src/activitygen/city/Makefile
src/foreign/Makefile
@@ -126,7 +126,7 @@ Last-Update: 2012-12-04
$(GDAL_LIBS) \
--- a/src/netimport/NIImporter_OpenDrive.h
+++ b/src/netimport/NIImporter_OpenDrive.h
-@@ -360,7 +360,6 @@
+@@ -453,7 +453,6 @@
static std::vector<Position> geomFromLine(const OpenDriveEdge& e, const OpenDriveGeometry& g);
diff --git a/debian/patches/fix_scripts_headers.patch b/debian/patches/fix_scripts_headers.patch
index fcbb903..e6535d2 100644
--- a/debian/patches/fix_scripts_headers.patch
+++ b/debian/patches/fix_scripts_headers.patch
@@ -2,402 +2,402 @@ Description: fixes headers of scripts
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-12-04
---- sumo-0.16.0~dfsg.orig/tools/projects/TLS-Evaluationsszenarien/test.py
-+++ sumo-0.16.0~dfsg/tools/projects/TLS-Evaluationsszenarien/test.py
+--- 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 @@ ylim(0,60)
+@@ -67,4 +68,4 @@
xlabel("Flow")
ylabel("Average Delay NS")
legend(("FC", "VA"),loc='upper left')
-show()
\ No newline at end of file
+show()
---- sumo-0.16.0~dfsg.orig/tools/projects/TLS-Evaluationsszenarien/main.py
-+++ sumo-0.16.0~dfsg/tools/projects/TLS-Evaluationsszenarien/main.py
+--- 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 *
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverTime.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverTime.py
+--- 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
-@@ -180,4 +181,4 @@ def plotIt(taxiId):
+@@ -180,4 +181,4 @@
#start the program
#profile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+--- a/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
++++ b/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/TraveltimeMulti.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
-@@ -303,4 +304,4 @@ def drawBarChart():
+@@ -303,4 +304,4 @@
#start the program
#profile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityCurve.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityCurve.py
+--- 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
-@@ -155,4 +156,4 @@ def getAveragedValues(interval):
+@@ -155,4 +156,4 @@
#start the program
#profile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/FetchData.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/FetchData.py
+--- 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
-@@ -192,4 +193,4 @@ def testFCDUniqueness():
+@@ -192,4 +193,4 @@
#start the program
#profile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverRoute.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverRoute.py
+--- 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
-@@ -147,4 +148,4 @@ def plotIt(taxiId):
+@@ -147,4 +148,4 @@
#start the program
#profile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime_DK.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime_DK.py
+--- 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 @@ def plotBarChart(mode="relDiff"):
+@@ -306,4 +307,4 @@
#start the program
#cProfile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/CompareVelocitys.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/CompareVelocitys.py
+--- 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
-@@ -118,4 +119,4 @@ def writeOutput():
+@@ -118,4 +119,4 @@
outputFile.close()
#start the program
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py
+--- /dev/null
++++ b/tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime.py
+--- 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
-@@ -240,4 +241,4 @@ def drawBarChart():
+@@ -240,4 +241,4 @@
#start the program
#profile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+--- a/tools/projects/TaxiFCD_Krieg/src/util/Path.py
++++ b/tools/projects/TaxiFCD_Krieg/src/util/Path.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Path.py
-@@ -70,4 +71,4 @@ FQprocessedFCD=newPath(main,"fcdQualitae
+@@ -70,4 +71,4 @@
-
\ No newline at end of file
+
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+--- a/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
++++ b/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file ProgressBar.py
-@@ -31,4 +32,4 @@ def startTask(list, fct):
+@@ -31,4 +32,4 @@
print "**",
lastProz=actProz
#call the function
- fct(list[i])
\ No newline at end of file
+ fct(list[i])
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+--- a/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
++++ b/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
-@@ -51,4 +52,4 @@ def getNiceTimeLabel(label='200707180000
+@@ -51,4 +52,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()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+--- a/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
++++ b/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Reader.py
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/util/__init__.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/util/__init__.py
+--- /dev/null
++++ b/tools/projects/TaxiFCD_Krieg/src/util/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+--- a/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
++++ b/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
def isElmInList(list,elm):
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlot.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlot.py
+--- 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
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py
+--- 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 *
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsOLD.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsOLD.py
+--- 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
-@@ -185,4 +186,4 @@ def createOutput(edgeDumpDict, vtypeDict
+@@ -185,4 +186,4 @@
#start the program
#profile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py
+--- 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
-@@ -224,4 +225,4 @@ def reduceVtype(vtypeDict,taxis,period):
+@@ -224,4 +225,4 @@
#start the program
#profile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsProcessedFCD.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsProcessedFCD.py
+--- 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
-@@ -361,4 +362,4 @@ def getMean(list):
+@@ -361,4 +362,4 @@
#start the program
#cProfile.run('main()')
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdQuality/__init__.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdQuality/__init__.py
+--- /dev/null
++++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/FCDvsCompleteRoute.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/FCDvsCompleteRoute.py
+--- 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
-@@ -146,4 +147,4 @@ def writeOutput():
+@@ -146,4 +147,4 @@
#start the program
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutesMain.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutesMain.py
+--- 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
-@@ -22,4 +23,4 @@ def main():
+@@ -22,4 +23,4 @@
print "end"
#start the program
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+--- a/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
++++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateTaxiRoutes.py
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py
+--- /dev/null
++++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/differentDepartRoutes.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/differentDepartRoutes.py
+--- 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
-@@ -63,4 +64,4 @@ def writeRoutes():
+@@ -63,4 +64,4 @@
#start the program
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/backup/__init__.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/backup/__init__.py
+--- /dev/null
++++ b/tools/projects/TaxiFCD_Krieg/src/backup/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py
+--- 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
-@@ -55,4 +56,4 @@ def writeOutput():
+@@ -55,4 +56,4 @@
#start the program
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/SeparateVLSArea.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/SeparateVLSArea.py
+--- 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
-@@ -39,4 +40,4 @@ def generateVLS_FCD_File():
+@@ -39,4 +40,4 @@
#start the program
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/QuantityOverDay.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/QuantityOverDay.py
+--- 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
-@@ -78,4 +79,4 @@ def countTaxis():
+@@ -78,4 +79,4 @@
#start the program
-main()
\ No newline at end of file
+main()
---- sumo-0.16.0~dfsg.orig/tools/projects/TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py
-+++ sumo-0.16.0~dfsg/tools/projects/TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py
+--- 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
-@@ -68,4 +69,4 @@ main()
+@@ -68,4 +69,4 @@
-
\ No newline at end of file
+
---- sumo-0.16.0~dfsg.orig/tools/projects/orinoko/buildConnections.pl
-+++ sumo-0.16.0~dfsg/tools/projects/orinoko/buildConnections.pl
+--- 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];
---- sumo-0.16.0~dfsg.orig/tools/shapes/CSV2polyconvertXML.py
-+++ sumo-0.16.0~dfsg/tools/shapes/CSV2polyconvertXML.py
+--- a/tools/shapes/CSV2polyconvertXML.py
++++ b/tools/shapes/CSV2polyconvertXML.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
"""
@file CSV2polyconvertXML.py
@author Daniel Krajzewicz
-@@ -38,4 +39,4 @@ outf.write("</pois>\n")
+@@ -38,4 +39,4 @@
inpf.close()
outf.close()
@@ -405,7 +405,7 @@ Last-Update: 2012-12-04
\ No newline at end of file
+
--- /dev/null
-+++ sumo-0.16.0~dfsg/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
++++ b/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+
@@ -521,7 +521,7 @@ Last-Update: 2012-12-04
+ </interval>
+</netstats>
--- /dev/null
-+++ sumo-0.16.0~dfsg/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
++++ b/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0"?>
+
@@ -994,7 +994,7 @@ Last-Update: 2012-12-04
+ <step time="438.00" loaded="135" emitted="133" running="116" waiting="2" ended="17" meanWaitingTime="3.71" meanTravelTime="232.88" />
+</summary>
--- /dev/null
-+++ sumo-0.16.0~dfsg/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
++++ b/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
@@ -1075,7 +1075,7 @@ Last-Update: 2012-12-04
+ <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>
--- /dev/null
-+++ sumo-0.16.0~dfsg/docs/examples/sumo/busses/vehroutes.xml
++++ b/docs/examples/sumo/busses/vehroutes.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
@@ -1116,7 +1116,7 @@ Last-Update: 2012-12-04
+
+</routes>
--- /dev/null
-+++ sumo-0.16.0~dfsg/docs/examples/sumo/vehicle_stops/vehroutes.xml
++++ b/docs/examples/sumo/vehicle_stops/vehroutes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
diff --git a/debian/patches/remove_embedded_gl2ps.patch b/debian/patches/remove_embedded_gl2ps.patch
index a8c4f4a..a062764 100644
--- a/debian/patches/remove_embedded_gl2ps.patch
+++ b/debian/patches/remove_embedded_gl2ps.patch
@@ -43,7 +43,7 @@ Last-Update: 2012-12-04
--- a/configure
+++ b/configure
-@@ -17421,7 +17421,7 @@
+@@ -17427,7 +17427,7 @@
@@ -52,7 +52,7 @@ Last-Update: 2012-12-04
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -18577,7 +18577,6 @@
+@@ -18583,7 +18583,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" ;;
diff --git a/debian/sumo-doc.doc-base b/debian/sumo-doc.doc-base
deleted file mode 100644
index b418208..0000000
--- a/debian/sumo-doc.doc-base
+++ /dev/null
@@ -1,28 +0,0 @@
-Document: sumo-doxygen
-Title: Sumo (doxygen documentation)
-Author: Sumo's authors
-Section: Science/Engineering
-
-Format: HTML
-Index: /usr/share/doc/sumo/doxygen/index.html
-Files: /usr/share/doc/sumo/doxygen/*
-
-Document: sumo-pydoc
-Title: Sumo (python documentation)
-Author: Sumo's authors
-Section: Science/Engineering
-
-Format: HTML
-Index: /usr/share/doc/sumo/pydoc/index.html
-Files: /usr/share/doc/sumo/pydoc/*
-
-
-Document: sumo-userdoc
-Title: Sumo (user documentation)
-Author: Sumo's authors
-Section: Science/Engineering
-
-Format: HTML
-Index: /usr/share/doc/sumo/userdoc/index.html
-Files: /usr/share/doc/sumo/userdoc/*
-
--
SUMO packaging. Simulation of Urban MObility.
More information about the debian-science-commits
mailing list