[sumo] 03/05: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Fri Jun 20 22:24:12 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 655607d01b3e7ad53c0474b290d10ce8f00228d8
Author: Anton Gladky <gladk at debian.org>
Date: Fri Jun 20 22:49:38 2014 +0200
Refresh patches.
---
debian/patches/add_missing_link.patch | 14 +++--
debian/patches/fix_scripts_headers.patch | 86 +++++++++++++++---------------
debian/patches/remove_embedded_gl2ps.patch | 42 +++++++++------
3 files changed, 78 insertions(+), 64 deletions(-)
diff --git a/debian/patches/add_missing_link.patch b/debian/patches/add_missing_link.patch
index 21f2a92..c06bd44 100644
--- a/debian/patches/add_missing_link.patch
+++ b/debian/patches/add_missing_link.patch
@@ -5,17 +5,21 @@ Bug-Debian: http://bugs.debian.org/710373
Reviewed-By: Anton Gladky <gladk at debian.org>
Last-Update: 2013-08-30
---- a/src/Makefile.am
-+++ b/src/Makefile.am
+Index: sumo/src/Makefile.am
+===================================================================
+--- sumo.orig/src/Makefile.am
++++ sumo/src/Makefile.am
@@ -1,4 +1,4 @@
-XERCES_LIBS = -l$(LIB_XERCES)
+XERCES_LIBS = -l$(LIB_XERCES) -lpthread -lGLU -lGL
if INTERNAL
MESO_LIBS = ./mesosim/libmesosim.a
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -351,7 +351,7 @@
+Index: sumo/src/Makefile.in
+===================================================================
+--- sumo.orig/src/Makefile.in
++++ sumo/src/Makefile.in
+@@ -351,7 +351,7 @@ STRIP = @STRIP@
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 c82a369..783a2e9 100644
--- a/debian/patches/fix_scripts_headers.patch
+++ b/debian/patches/fix_scripts_headers.patch
@@ -2,81 +2,73 @@ Description: fixes headers of scripts
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-12-04
---- a/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+Index: sumo/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
---- /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/util/Path.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+Index: sumo/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
---- a/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+Index: sumo/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
---- a/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+Index: sumo/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
---- a/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+Index: sumo/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
---- /dev/null
-+++ b/tools/projects/TaxiFCD_Krieg/src/util/__init__.py
-@@ -0,0 +1,2 @@
-+#!/usr/bin/env python
-+
---- a/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+Index: sumo/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
---- /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/GenerateTaxiRoutes.py
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+Index: sumo/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/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
+===================================================================
--- /dev/null
-+++ b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py
-@@ -0,0 +1,2 @@
-+#!/usr/bin/env python
-+
---- /dev/null
-+++ b/tools/projects/TaxiFCD_Krieg/src/backup/__init__.py
-@@ -0,0 +1,2 @@
-+#!/usr/bin/env python
-+
---- /dev/null
-+++ b/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"?>
+
@@ -191,8 +183,10 @@ Last-Update: 2012-12-04
+ <interval begin="450.00" end="451.00" id="dump_25">
+ </interval>
+</netstats>
+Index: sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
+===================================================================
--- /dev/null
-+++ b/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"?>
+
@@ -664,8 +658,10 @@ Last-Update: 2012-12-04
+ <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/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
+===================================================================
--- /dev/null
-+++ b/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"?>
+
@@ -745,8 +741,10 @@ Last-Update: 2012-12-04
+ <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/docs/examples/sumo/busses/vehroutes.xml
+===================================================================
--- /dev/null
-+++ b/docs/examples/sumo/busses/vehroutes.xml
++++ sumo/docs/examples/sumo/busses/vehroutes.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
@@ -786,8 +784,10 @@ Last-Update: 2012-12-04
+ </vehicle>
+
+</routes>
+Index: sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
+===================================================================
--- /dev/null
-+++ b/docs/examples/sumo/vehicle_stops/vehroutes.xml
++++ sumo/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 188340c..fd3d37a 100644
--- a/debian/patches/remove_embedded_gl2ps.patch
+++ b/debian/patches/remove_embedded_gl2ps.patch
@@ -2,9 +2,11 @@ Description: Remove from compilation embedded copy of gl2ps, use packaged versio
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-12-04
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -85,7 +85,6 @@
+Index: sumo/src/Makefile.am
+===================================================================
+--- sumo.orig/src/Makefile.am
++++ sumo/src/Makefile.am
+@@ -85,7 +85,6 @@ sumo_gui_LDADD = ./gui/libgui.a \
./utils/foxtools/libfoxtools.a \
$(MESOGUI_LIBS) \
$(sumo_LDADD) \
@@ -12,9 +14,11 @@ Last-Update: 2012-12-04
./foreign/polyfonts/libpolyfonts.a \
./gui/GUIManipulator.o \
./gui/GUITLLogicPhasesTrackerWindow.o \
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -155,7 +155,6 @@
+Index: sumo/src/Makefile.in
+===================================================================
+--- sumo.orig/src/Makefile.in
++++ sumo/src/Makefile.in
+@@ -155,7 +155,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
@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 +26,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 \
-@@ -474,7 +473,6 @@
+@@ -474,7 +473,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
@WITH_GUI_TRUE at ./utils/foxtools/libfoxtools.a \
@WITH_GUI_TRUE@$(MESOGUI_LIBS) \
@WITH_GUI_TRUE@$(sumo_LDADD) \
@@ -30,9 +34,11 @@ Last-Update: 2012-12-04
@WITH_GUI_TRUE at ./foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE at ./gui/GUIManipulator.o \
@WITH_GUI_TRUE at ./gui/GUITLLogicPhasesTrackerWindow.o \
---- a/src/foreign/Makefile.am
-+++ b/src/foreign/Makefile.am
-@@ -3,7 +3,7 @@
+Index: sumo/src/foreign/Makefile.am
+===================================================================
+--- sumo.orig/src/foreign/Makefile.am
++++ sumo/src/foreign/Makefile.am
+@@ -3,7 +3,7 @@ MEMDIRS = nvwa
endif
if WITH_GUI
@@ -41,9 +47,11 @@ Last-Update: 2012-12-04
endif
---- a/src/foreign/Makefile.in
-+++ b/src/foreign/Makefile.in
-@@ -142,7 +142,7 @@
+Index: sumo/src/foreign/Makefile.in
+===================================================================
+--- sumo.orig/src/foreign/Makefile.in
++++ sumo/src/foreign/Makefile.in
+@@ -142,7 +142,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
@@ -52,7 +60,7 @@ Last-Update: 2012-12-04
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
-@@ -311,7 +311,7 @@
+@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@CHECK_MEMORY_LEAKS_TRUE at MEMDIRS = nvwa
@@ -61,8 +69,10 @@ Last-Update: 2012-12-04
EXTRA_DIST = additional.txt
SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS)
all: all-recursive
---- a/src/utils/gui/windows/GUISUMOAbstractView.cpp
-+++ b/src/utils/gui/windows/GUISUMOAbstractView.cpp
+Index: sumo/src/utils/gui/windows/GUISUMOAbstractView.cpp
+===================================================================
+--- sumo.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
++++ sumo/src/utils/gui/windows/GUISUMOAbstractView.cpp
@@ -39,7 +39,7 @@
#include <limits>
#include <fxkeys.h>
--
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