[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. 8a90cdfbcaf52bf8b0ae2012c9af3194a3923719

Anton Gladky gladky.anton at gmail.com
Tue Apr 24 17:24:27 UTC 2012


The following commit has been merged in the master branch:
commit 8a90cdfbcaf52bf8b0ae2012c9af3194a3923719
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Apr 24 19:24:17 2012 +0200

    Add sumo-tools binary.

diff --git a/debian/control b/debian/control
index 16e2882..bc2bf37 100644
--- a/debian/control
+++ b/debian/control
@@ -16,12 +16,24 @@ Build-Depends-Indep: doxygen, python
 Package: sumo
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: sumo-tools
 Description: Simulation of Urban MObility (SUMO)
  SUMO is an open source,
  highly portable, microscopic road traffic simulation package
  designed to handle large road networks.
  Main binary.
 
+Package: sumo-tools
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, python, jarwrapper
+Recommends: sumo
+Description: Simulation of Urban MObility (SUMO), tools and scripts
+ SUMO is an open source,
+ highly portable, microscopic road traffic simulation package
+ designed to handle large road networks.
+ The binary contatins different tools and scripts.
+
 Package: sumo-doc
 Architecture: all
 Section: doc
diff --git a/debian/patches/fix_headers_of_scripts.patch b/debian/patches/fix_headers_of_scripts.patch
new file mode 100644
index 0000000..e80555a
--- /dev/null
+++ b/debian/patches/fix_headers_of_scripts.patch
@@ -0,0 +1,468 @@
+Description: fix headers of executables scripts
+Author: Anton Gladky <gladky.anton at gmail.com>
+Bug-Debian: http://bugs.debian.org/669160
+Last-Update: 2012-04-24
+
+--- a/tools/shapes/CSV2polyconvertXML.py
++++ b/tools/shapes/CSV2polyconvertXML.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ """
+ @file    CSV2polyconvertXML.py
+ @author  Daniel Krajzewicz
+@@ -38,4 +39,4 @@
+ inpf.close()
+ outf.close()
+ 
+-        
+\ No newline at end of file
++        
+--- a/tools/projects/TLS-Evaluationsszenarien/plotter.py
++++ b/tools/projects/TLS-Evaluationsszenarien/plotter.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ from pylab import *
+ from ConfigParser import *
+ 
+@@ -305,4 +306,4 @@
+     plot(q[0:15], avgDelayWECut[0:15],q[0:15], avgDelayNSCut[0:15], q[0:15], avgDelayCut[0:15],q[0:15], greenWECut[0:15], q[0:15], greenNSCut[0:15])
+     legend(('avgDelayWE', 'avgDelayNS', 'avgDelay','greenWE', 'greenNS'),loc='upper left')
+     savefig(name + "CUT.png")
+-    close()  
+\ No newline at end of file
++    close()  
+--- a/tools/projects/TLS-Evaluationsszenarien/changeNet.py
++++ b/tools/projects/TLS-Evaluationsszenarien/changeNet.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ import xml.dom.minidom as dom
+ 
+ def changePhaseDurations(file, greenWE, yellowWE, greenNS, yellowNS):
+@@ -53,4 +54,4 @@
+         det.setAttribute('freq',str(N))
+         
+     writer = open(file, 'w')
+-    tree.writexml(writer)
+\ No newline at end of file
++    tree.writexml(writer)
+--- a/tools/projects/TLS-Evaluationsszenarien/main.py
++++ b/tools/projects/TLS-Evaluationsszenarien/main.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/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
+ 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/evaluator.py
++++ b/tools/projects/TLS-Evaluationsszenarien/evaluator.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ import xml.dom.minidom as dom
+ from genRoutes import *
+ import subprocess, sys
+@@ -173,4 +174,4 @@
+     det = Sxx * N - Sx * Sx
+     a, b = (Sxy * N - Sy * Sx)/det, (Sxx * Sy - Sx * Sxy)/det
+     return a, b
+-    
+\ No newline at end of file
++    
+--- 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    VelocityCurve.py
+@@ -155,4 +156,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/python
+ # -*- coding: Latin-1 -*-
+ """
+ @file    VelocityOverRoute.py
+@@ -147,4 +148,4 @@
+     
+ #start the program
+ #profile.run('main()')
+-main()
+\ No newline at end of file
++main()
+--- 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    Traveltime.py
+@@ -303,4 +304,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,4 +1,4 @@
+-
++#!/usr/bin/python
+ 
+ from pylab import *
+ 
+@@ -306,4 +306,4 @@
+ 
+ #start the program
+ #cProfile.run('main()')
+-main()     		
+\ No newline at end of file
++main()     		
+--- /dev/null
++++ b/tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py
+@@ -0,0 +1 @@
++#!/usr/bin/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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    FetchData.py
+@@ -192,4 +193,4 @@
+     
+ #start the program
+ #profile.run('main()')
+-main()
+\ No newline at end of file
++main()
+--- 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    VelocityOverTime.py
+@@ -180,4 +181,4 @@
+     
+ #start the program
+ #profile.run('main()')
+-main()
+\ No newline at end of file
++main()
+--- 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    Traveltime.py
+@@ -240,4 +241,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 @@
++#!/usr/bin/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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    CompareVelocitys.py
+@@ -118,4 +119,4 @@
+     outputFile.close()
+     
+ #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/python
+ # -*- coding: Latin-1 -*-
+ """
+ @file    GenerateRawFCD.py
+@@ -68,4 +69,4 @@
+     
+     
+     
+-    
+\ No newline at end of file
++    
+--- a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlot.py
++++ b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/readPlot.py
+@@ -1,4 +1,4 @@
+-
++#!/usr/bin/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
+--- 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    GenerateRawFCD.py
+@@ -224,4 +225,4 @@
+ 
+ #start the program
+ #profile.run('main()')
+-main()     
+\ No newline at end of file
++main()     
+--- 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
+ 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    GenerateRawFCD.py
+@@ -361,4 +362,4 @@
+ 
+ #start the program
+ #cProfile.run('main()')
+-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/python
+ # -*- coding: Latin-1 -*-
+ """
+ @file    GenerateTaxiRoutesMain.py
+@@ -22,4 +23,4 @@
+     print "end"
+ 
+ #start the program
+-main()
+\ No newline at end of file
++main()
+--- /dev/null
++++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py
+@@ -0,0 +1 @@
++#!/usr/bin/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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    GenerateTaxiRoutesMain.py
+@@ -63,4 +64,4 @@
+ 
+ 
+ #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 @@
++#!/usr/bin/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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    FCDvsCompleteRoute.py
+@@ -146,4 +147,4 @@
+ 
+     
+ #start the program
+-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 @@
++#!/usr/bin/python
+ # -*- coding: Latin-1 -*-
+ """
+ @file    Path.py
+@@ -70,4 +71,4 @@
+ 
+ 
+ 
+-   
+\ No newline at end of file
++   
+--- /dev/null
++++ b/tools/projects/TaxiFCD_Krieg/src/util/__init__.py
+@@ -0,0 +1 @@
++#!/usr/bin/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
+ # -*- 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    ProgressBar.py
+@@ -31,4 +32,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/Reader.py
++++ b/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    CalcTime.py
+@@ -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()
+--- 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    SeparateVLSArea.py
+@@ -39,4 +40,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/python
+ # -*- coding: Latin-1 -*-
+ """
+ @file    QuantityOverDay.py
+@@ -78,4 +79,4 @@
+     
+     
+ #start the program
+-main()
+\ No newline at end of file
++main()
+--- 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    TaxisPerEdge.py
+@@ -55,4 +56,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 @@
++#!/usr/bin/python
+--- a/tools/projects/orinoko/buildConnections.pl
++++ b/tools/projects/orinoko/buildConnections.pl
+@@ -1,3 +1,4 @@
++#!/usr/bin/perl
+ sub getAttr($$) {
+ 	my $text = $_[0];
+ 	my $attrname = $_[1];
+--- a/tools/district/edgesInDistricts.py
++++ b/tools/district/edgesInDistricts.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/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
+ 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
+ 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
+ # -*- coding: Latin-1 -*-
+ """
+ @file    GenerateRawFCD.py
+@@ -185,4 +186,4 @@
+ 
+ #start the program
+ #profile.run('main()')
+-main()     
+\ No newline at end of file
++main()     
diff --git a/debian/patches/series b/debian/patches/series
index 058120a..3d2446d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_manpage_output.patch
 fix_format_not_a_string.patch
 drop_eulerspiral.patch
+fix_headers_of_scripts.patch
diff --git a/debian/rules b/debian/rules
index 2175fcb..e224495 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,17 @@ override_dh_auto_configure:
 override_dh_auto_build-indep:
 	$(MAKE) doxygen
 	$(MAKE) pydoc
+	#Clean some unneeded files and fix permissions
+	find ./tools -name '*.pyc' -print0 | xargs -0 rm -f
+	rm ./tools/contributed/smallmaps/COPYING
+	rm ./tools/contributed/sumoplayer/LICENSE
+	rm ./tools/contributed/traci4j/COPYING
+	rm ./tools/contributed/trafficmodeler/src/resources/icons/Thumbs.db
+	find ./tools -name '*.java' -print0 | xargs -0 chmod -x
+	find ./tools -name '*.jar' -print0 | xargs -0 chmod -x
+	find ./tools/contributed/traci4j -type f -print0 | xargs -0 chmod -x
+	chmod -x ./tools/projects/TaxiFCD_Krieg/src/backup/BackupFolder.pyw
+	chmod -x ./tools/build/dailyBuildMSVC8.bat
 
 override_dh_auto_build-arch:
 	dh_auto_build -a
diff --git a/debian/sumo-tools.install b/debian/sumo-tools.install
new file mode 100644
index 0000000..f152e4e
--- /dev/null
+++ b/debian/sumo-tools.install
@@ -0,0 +1 @@
+tools/ usr/share/sumo

-- 
SUMO packaging. Simulation of Urban MObility.



More information about the debian-science-commits mailing list