[sumo] 03/03: Refresh patches.

Anton Gladky gladk at moszumanska.debian.org
Thu Apr 16 21:59:39 UTC 2015 

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch experimental
in repository sumo.

commit 006ec0eb163bd7efeee2dd07c75534ba60af8499
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Apr 16 23:33:56 2015 +0200

    Refresh patches.
---
 ..._gl2ps.patch => 10_remove_embedded_gl2ps.patch} | 46 ++++++++--------
 ..._headers.patch => 20_fix_scripts_headers.patch} | 64 +++++++++++-----------
 ...issing_link.patch => 30_add_missing_link.patch} | 16 +++---
 debian/patches/series                              |  6 +-
 4 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/debian/patches/remove_embedded_gl2ps.patch b/debian/patches/10_remove_embedded_gl2ps.patch
similarity index 73%
rename from debian/patches/remove_embedded_gl2ps.patch
rename to debian/patches/10_remove_embedded_gl2ps.patch
index a432022..6d25a84 100644
--- a/debian/patches/remove_embedded_gl2ps.patch
+++ b/debian/patches/10_remove_embedded_gl2ps.patch
@@ -1,12 +1,12 @@
 Description: Remove from compilation embedded copy of gl2ps, use packaged version instead.
 Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-12-04
+Last-Update: 2015-04-16
 
-Index: sumo-0.22.0/src/Makefile.am
+Index: sumo-0.23.0/src/Makefile.am
 ===================================================================
---- sumo-0.22.0.orig/src/Makefile.am
-+++ sumo-0.22.0/src/Makefile.am
-@@ -84,7 +84,6 @@ sumo_gui_LDADD =  ./gui/libgui.a \
+--- sumo-0.23.0.orig/src/Makefile.am
++++ sumo-0.23.0/src/Makefile.am
+@@ -97,7 +97,6 @@ sumo_gui_LDADD =  ./gui/libgui.a \
  ./utils/foxtools/libfoxtools.a \
  $(MESOGUI_LIBS) \
  $(sumo_LDADD) \
@@ -14,11 +14,11 @@ Index: sumo-0.22.0/src/Makefile.am
  ./foreign/polyfonts/libpolyfonts.a \
  ./gui/GUIManipulator.o \
  ./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo-0.22.0/src/Makefile.in
+Index: sumo-0.23.0/src/Makefile.in
 ===================================================================
---- sumo-0.22.0.orig/src/Makefile.in
-+++ sumo-0.22.0/src/Makefile.in
-@@ -157,7 +157,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
+--- sumo-0.23.0.orig/src/Makefile.in
++++ sumo-0.23.0/src/Makefile.in
+@@ -169,7 +169,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) \
@@ -26,7 +26,7 @@ Index: sumo-0.22.0/src/Makefile.in
  @WITH_GUI_TRUE@	./foreign/polyfonts/libpolyfonts.a \
  @WITH_GUI_TRUE@	./gui/GUIManipulator.o \
  @WITH_GUI_TRUE@	./gui/GUITLLogicPhasesTrackerWindow.o \
-@@ -475,7 +474,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
+@@ -499,7 +498,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
  @WITH_GUI_TRUE at ./utils/foxtools/libfoxtools.a \
  @WITH_GUI_TRUE@$(MESOGUI_LIBS) \
  @WITH_GUI_TRUE@$(sumo_LDADD) \
@@ -34,10 +34,10 @@ Index: sumo-0.22.0/src/Makefile.in
  @WITH_GUI_TRUE at ./foreign/polyfonts/libpolyfonts.a \
  @WITH_GUI_TRUE at ./gui/GUIManipulator.o \
  @WITH_GUI_TRUE at ./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo-0.22.0/src/foreign/Makefile.am
+Index: sumo-0.23.0/src/foreign/Makefile.am
 ===================================================================
---- sumo-0.22.0.orig/src/foreign/Makefile.am
-+++ sumo-0.22.0/src/foreign/Makefile.am
+--- sumo-0.23.0.orig/src/foreign/Makefile.am
++++ sumo-0.23.0/src/foreign/Makefile.am
 @@ -3,7 +3,7 @@ MEMDIRS = nvwa
  endif
  
@@ -47,10 +47,10 @@ Index: sumo-0.22.0/src/foreign/Makefile.am
  endif
  
  
-Index: sumo-0.22.0/src/foreign/Makefile.in
+Index: sumo-0.23.0/src/foreign/Makefile.in
 ===================================================================
---- sumo-0.22.0.orig/src/foreign/Makefile.in
-+++ sumo-0.22.0/src/foreign/Makefile.in
+--- sumo-0.23.0.orig/src/foreign/Makefile.in
++++ sumo-0.23.0/src/foreign/Makefile.in
 @@ -142,7 +142,7 @@ am__define_uniq_tagged_files = \
    done | $(am__uniquify_input)`
  ETAGS = etags
@@ -69,10 +69,10 @@ Index: sumo-0.22.0/src/foreign/Makefile.in
  EXTRA_DIST = additional.txt
  SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS) 
  all: all-recursive
-Index: sumo-0.22.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
+Index: sumo-0.23.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
 ===================================================================
---- sumo-0.22.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
-+++ sumo-0.22.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
+--- sumo-0.23.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
++++ sumo-0.23.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
 @@ -39,7 +39,7 @@
  #include <limits>
  #include <fxkeys.h>
@@ -82,11 +82,11 @@ Index: sumo-0.22.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
  #include <utils/foxtools/FXSingleEventThread.h>
  #include <utils/foxtools/MFXCheckableButton.h>
  #include <utils/foxtools/MFXImageHelper.h>
-Index: sumo-0.22.0/configure.ac
+Index: sumo-0.23.0/configure.ac
 ===================================================================
---- sumo-0.22.0.orig/configure.ac
-+++ sumo-0.22.0/configure.ac
-@@ -437,7 +437,6 @@ src/activitygen/activities/Makefile
+--- sumo-0.23.0.orig/configure.ac
++++ sumo-0.23.0/configure.ac
+@@ -442,7 +442,6 @@ src/activitygen/activities/Makefile
  src/activitygen/city/Makefile
  src/foreign/Makefile
  src/foreign/eulerspiral/Makefile
diff --git a/debian/patches/fix_scripts_headers.patch b/debian/patches/20_fix_scripts_headers.patch
similarity index 97%
rename from debian/patches/fix_scripts_headers.patch
rename to debian/patches/20_fix_scripts_headers.patch
index 783a2e9..65b62e0 100644
--- a/debian/patches/fix_scripts_headers.patch
+++ b/debian/patches/20_fix_scripts_headers.patch
@@ -1,74 +1,74 @@
 Description: fixes headers of scripts
 Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-12-04
+Last-Update: 2015-04-16
 
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+Index: sumo-0.23.0/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
+--- sumo-0.23.0.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
++++ sumo-0.23.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  # -*- coding: Latin-1 -*-
  """
  @file    CalcTime.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+Index: sumo-0.23.0/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
+--- sumo-0.23.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
++++ sumo-0.23.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  # -*- coding: Latin-1 -*-
  """
  @file    Path.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+Index: sumo-0.23.0/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
+--- sumo-0.23.0.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
++++ sumo-0.23.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  # -*- coding: Latin-1 -*-
  """
  @file    ProgressBar.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+Index: sumo-0.23.0/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
+--- sumo-0.23.0.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
++++ sumo-0.23.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  # -*- coding: Latin-1 -*-
  """
  @file    CalcTime.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+Index: sumo-0.23.0/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
+--- sumo-0.23.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
++++ sumo-0.23.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  # -*- coding: Latin-1 -*-
  """
  @file    Reader.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+Index: sumo-0.23.0/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
+--- sumo-0.23.0.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
++++ sumo-0.23.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  # -*- coding: Latin-1 -*-
  """
  @file    BinarySearch.py
-Index: sumo/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+Index: sumo-0.23.0/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
+--- sumo-0.23.0.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
++++ sumo-0.23.0/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
+Index: sumo-0.23.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
 ===================================================================
 --- /dev/null
-+++ sumo/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
++++ sumo-0.23.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
 @@ -0,0 +1,113 @@
 +<?xml version="1.0"?>
 +
@@ -183,10 +183,10 @@ Index: sumo/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
 +    <interval begin="450.00" end="451.00" id="dump_25">
 +    </interval>
 +</netstats>
-Index: sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
+Index: sumo-0.23.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
 ===================================================================
 --- /dev/null
-+++ sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
++++ sumo-0.23.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
 @@ -0,0 +1,470 @@
 +<?xml version="1.0"?>
 +
@@ -658,10 +658,10 @@ Index: sumo/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
 +    <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
+Index: sumo-0.23.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
 ===================================================================
 --- /dev/null
-+++ sumo/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
++++ sumo-0.23.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
 @@ -0,0 +1,78 @@
 +<?xml version="1.0"?>
 +
@@ -741,10 +741,10 @@ Index: sumo/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
 +    <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
+Index: sumo-0.23.0/docs/examples/sumo/busses/vehroutes.xml
 ===================================================================
 --- /dev/null
-+++ sumo/docs/examples/sumo/busses/vehroutes.xml
++++ sumo-0.23.0/docs/examples/sumo/busses/vehroutes.xml
 @@ -0,0 +1,38 @@
 +<?xml version="1.0"?>
 +
@@ -784,10 +784,10 @@ Index: sumo/docs/examples/sumo/busses/vehroutes.xml
 +    </vehicle>
 +
 +</routes>
-Index: sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
+Index: sumo-0.23.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
 ===================================================================
 --- /dev/null
-+++ sumo/docs/examples/sumo/vehicle_stops/vehroutes.xml
++++ sumo-0.23.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
 @@ -0,0 +1,26 @@
 +<?xml version="1.0"?>
 +
diff --git a/debian/patches/add_missing_link.patch b/debian/patches/30_add_missing_link.patch
similarity index 76%
rename from debian/patches/add_missing_link.patch
rename to debian/patches/30_add_missing_link.patch
index b7e6854..f8472bb 100644
--- a/debian/patches/add_missing_link.patch
+++ b/debian/patches/30_add_missing_link.patch
@@ -3,23 +3,23 @@ Author: Daniel T Chen <crimsun at ubuntu.com>, Julian Taylor <jtaylor.debian at google
 Origin: https://launchpadlibrarian.net/137511659/sumo_0.16.0~dfsg-1~exp1_0.16.0~dfsg-1~exp1ubuntu1.diff.gz
 Bug-Debian: http://bugs.debian.org/710373
 Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-08-30
+Last-Update: 2015-04-16
 
-Index: sumo/src/Makefile.am
+Index: sumo-0.23.0/src/Makefile.am
 ===================================================================
---- sumo.orig/src/Makefile.am
-+++ sumo/src/Makefile.am
+--- sumo-0.23.0.orig/src/Makefile.am
++++ sumo-0.23.0/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
-Index: sumo/src/Makefile.in
+Index: sumo-0.23.0/src/Makefile.in
 ===================================================================
---- sumo.orig/src/Makefile.in
-+++ sumo/src/Makefile.in
-@@ -353,7 +353,7 @@ STRIP = @STRIP@
+--- sumo-0.23.0.orig/src/Makefile.in
++++ sumo-0.23.0/src/Makefile.in
+@@ -366,7 +366,7 @@ STRIP = @STRIP@
  VERSION = @VERSION@
  XERCES_CFLAGS = @XERCES_CFLAGS@
  XERCES_LDFLAGS = @XERCES_LDFLAGS@
diff --git a/debian/patches/series b/debian/patches/series
index 39b0fc4..a9dd137 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-remove_embedded_gl2ps.patch
-fix_scripts_headers.patch
-add_missing_link.patch
+10_remove_embedded_gl2ps.patch
+20_fix_scripts_headers.patch
+30_add_missing_link.patch

-- 
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