[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. debian/0.15.0_dfsg-1-1-g5813a09
Anton Gladky
gladky.anton at gmail.com
Tue May 22 18:44:20 UTC 2012
The following commit has been merged in the master branch:
commit 5813a0929925c9c5e8d01e20436924b86f7340f7
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue May 22 20:44:10 2012 +0200
Update fix_headers_of_scripts.patch.
diff --git a/debian/patches/fix_headers_of_scripts.patch b/debian/patches/fix_headers_of_scripts.patch
index e80555a..b07bf28 100644
--- a/debian/patches/fix_headers_of_scripts.patch
+++ b/debian/patches/fix_headers_of_scripts.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-04-24
--- a/tools/shapes/CSV2polyconvertXML.py
+++ b/tools/shapes/CSV2polyconvertXML.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
"""
@file CSV2polyconvertXML.py
@author Daniel Krajzewicz
@@ -20,7 +20,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TLS-Evaluationsszenarien/plotter.py
+++ b/tools/projects/TLS-Evaluationsszenarien/plotter.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
from pylab import *
from ConfigParser import *
@@ -34,7 +34,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TLS-Evaluationsszenarien/changeNet.py
+++ b/tools/projects/TLS-Evaluationsszenarien/changeNet.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
import xml.dom.minidom as dom
def changePhaseDurations(file, greenWE, yellowWE, greenNS, yellowNS):
@@ -48,14 +48,14 @@ Last-Update: 2012-04-24
--- a/tools/projects/TLS-Evaluationsszenarien/main.py
+++ b/tools/projects/TLS-Evaluationsszenarien/main.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
import subprocess, sys, os, re, shutil
from genRoutes import *
from evaluator import *
--- a/tools/projects/TLS-Evaluationsszenarien/test.py
+++ b/tools/projects/TLS-Evaluationsszenarien/test.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
from evaluator import *
from plotter import *
@@ -69,7 +69,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TLS-Evaluationsszenarien/evaluator.py
+++ b/tools/projects/TLS-Evaluationsszenarien/evaluator.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
import xml.dom.minidom as dom
from genRoutes import *
import subprocess, sys
@@ -83,7 +83,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityCurve.py
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityCurve.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file VelocityCurve.py
@@ -97,7 +97,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverRoute.py
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverRoute.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file VelocityOverRoute.py
@@ -111,7 +111,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Traveltime.py
@@ -126,7 +126,7 @@ Last-Update: 2012-04-24
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime_DK.py
@@ -1,4 +1,4 @@
-
-+#!/usr/bin/python
++#!/usr/bin/env python
from pylab import *
@@ -140,11 +140,11 @@ Last-Update: 2012-04-24
--- /dev/null
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py
@@ -0,0 +1 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
--- a/tools/projects/TaxiFCD_Krieg/src/analysis/FetchData.py
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/FetchData.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file FetchData.py
@@ -158,7 +158,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverTime.py
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/VelocityOverTime.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file VelocityOverTime.py
@@ -172,7 +172,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime.py
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/Traveltime.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Traveltime.py
@@ -186,14 +186,14 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CalcTime.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/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CompareVelocitys.py
@@ -207,7 +207,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py
+++ b/tools/projects/TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateRawFCD.py
@@ -222,18 +222,18 @@ Last-Update: 2012-04-24
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlot.py
@@ -1,4 +1,4 @@
-
-+#!/usr/bin/python
++#!/usr/bin/env python
from pylab import *
from os import walk
from os.path import join
--- /dev/null
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/__init__.py
@@ -0,0 +1 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
--- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateRawFCD.py
@@ -247,14 +247,14 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
import sys
from pylab import *
--- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsProcessedFCD.py
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsProcessedFCD.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateRawFCD.py
@@ -268,7 +268,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutesMain.py
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutesMain.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateTaxiRoutesMain.py
@@ -282,11 +282,11 @@ Last-Update: 2012-04-24
--- /dev/null
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py
@@ -0,0 +1 @@
-+#!/usr/bin/python
++#!/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/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateTaxiRoutesMain.py
@@ -300,14 +300,14 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateTaxiRoutes.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/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file FCDvsCompleteRoute.py
@@ -321,7 +321,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+++ b/tools/projects/TaxiFCD_Krieg/src/util/Path.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Path.py
@@ -335,18 +335,18 @@ Last-Update: 2012-04-24
--- /dev/null
+++ b/tools/projects/TaxiFCD_Krieg/src/util/__init__.py
@@ -0,0 +1 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
--- a/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+++ b/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
def isElmInList(list,elm):
--- a/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+++ b/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file ProgressBar.py
@@ -360,14 +360,14 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+++ b/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file Reader.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/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file CalcTime.py
@@ -381,7 +381,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/SeparateVLSArea.py
+++ b/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/SeparateVLSArea.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file SeparateVLSArea.py
@@ -395,7 +395,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/QuantityOverDay.py
+++ b/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/QuantityOverDay.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file QuantityOverDay.py
@@ -409,7 +409,7 @@ Last-Update: 2012-04-24
--- a/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py
+++ b/tools/projects/TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file TaxisPerEdge.py
@@ -423,7 +423,7 @@ Last-Update: 2012-04-24
--- /dev/null
+++ b/tools/projects/TaxiFCD_Krieg/src/backup/__init__.py
@@ -0,0 +1 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
--- a/tools/projects/orinoko/buildConnections.pl
+++ b/tools/projects/orinoko/buildConnections.pl
@@ -1,3 +1,4 @@
@@ -434,28 +434,28 @@ Last-Update: 2012-04-24
--- a/tools/district/edgesInDistricts.py
+++ b/tools/district/edgesInDistricts.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
from xml.sax import saxutils, make_parser, handler
from optparse import OptionParser
import math
--- a/tools/district/countConnectionsInDistricts.py
+++ b/tools/district/countConnectionsInDistricts.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
from xml.sax import saxutils, make_parser, handler
from optparse import OptionParser
import math
--- a/tools/district/districtMapper.py
+++ b/tools/district/districtMapper.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
from xml.sax import saxutils, make_parser, handler
from optparse import OptionParser
import math
--- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsOLD.py
+++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/ParamEffectsOLD.py
@@ -1,3 +1,4 @@
-+#!/usr/bin/python
++#!/usr/bin/env python
# -*- coding: Latin-1 -*-
"""
@file GenerateRawFCD.py
--
SUMO packaging. Simulation of Urban MObility.
More information about the debian-science-commits
mailing list