[sumo] 01/10: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Sun May 15 08:14:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit 08a309b8feabe06ac1c89e588e55c22c8466a7da
Author: Anton Gladky <gladk at debian.org>
Date: Sat May 14 20:17:38 2016 +0200
Refresh patches.
---
debian/patches/10_remove_embedded_gl2ps.patch | 86 +++++++++++++--------------
debian/patches/20_fix_scripts_headers.patch | 62 +++++++++----------
debian/patches/30_add_missing_link.patch | 18 +++---
debian/patches/40_drop_some_buildflags.patch | 30 +++++-----
debian/patches/50_use_system_openlayers.patch | 6 +-
debian/patches/60_fix_docbuild.diff | 32 ----------
debian/patches/series | 1 -
7 files changed, 102 insertions(+), 133 deletions(-)
diff --git a/debian/patches/10_remove_embedded_gl2ps.patch b/debian/patches/10_remove_embedded_gl2ps.patch
index 91c4959..c5b38d0 100644
--- a/debian/patches/10_remove_embedded_gl2ps.patch
+++ b/debian/patches/10_remove_embedded_gl2ps.patch
@@ -2,42 +2,42 @@ Description: Remove from compilation embedded copy of gl2ps, use packaged versio
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo-0.25.0/src/Makefile.am
+Index: sumo-0.26.0/src/Makefile.am
===================================================================
---- sumo-0.25.0.orig/src/Makefile.am
-+++ sumo-0.25.0/src/Makefile.am
-@@ -97,7 +97,6 @@ sumo_gui_LDADD = ./gui/libgui.a \
- ./utils/foxtools/libfoxtools.a \
- $(MESOGUI_LIBS) \
+--- sumo-0.26.0.orig/src/Makefile.am
++++ sumo-0.26.0/src/Makefile.am
+@@ -94,7 +94,6 @@ sumo_gui_LDADD = ./gui/libgui.a \
+ ./mesogui/libmesogui.a \
+ ./osgview/libosgview.a \
$(sumo_LDADD) \
-./foreign/gl2ps/libgl2ps.a \
./foreign/polyfonts/libpolyfonts.a \
./gui/GUIManipulator.o \
./gui/GUITLLogicPhasesTrackerWindow.o \
-Index: sumo-0.25.0/src/Makefile.in
+Index: sumo-0.26.0/src/Makefile.in
===================================================================
---- sumo-0.25.0.orig/src/Makefile.in
-+++ sumo-0.25.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) \
+--- sumo-0.26.0.orig/src/Makefile.in
++++ sumo-0.26.0/src/Makefile.in
+@@ -173,7 +173,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
+ @WITH_GUI_TRUE@ ./utils/foxtools/libfoxtools.a \
+ @WITH_GUI_TRUE@ ./mesogui/libmesogui.a ./osgview/libosgview.a \
@WITH_GUI_TRUE@ $(am__DEPENDENCIES_3) \
- at WITH_GUI_TRUE@ ./foreign/gl2ps/libgl2ps.a \
@WITH_GUI_TRUE@ ./foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE@ ./gui/GUIManipulator.o \
@WITH_GUI_TRUE@ ./gui/GUITLLogicPhasesTrackerWindow.o \
-@@ -499,7 +498,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
- @WITH_GUI_TRUE at ./utils/foxtools/libfoxtools.a \
- @WITH_GUI_TRUE@$(MESOGUI_LIBS) \
+@@ -505,7 +504,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
+ @WITH_GUI_TRUE at ./mesogui/libmesogui.a \
+ @WITH_GUI_TRUE at ./osgview/libosgview.a \
@WITH_GUI_TRUE@$(sumo_LDADD) \
- at WITH_GUI_TRUE@./foreign/gl2ps/libgl2ps.a \
@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.25.0/src/foreign/Makefile.am
+Index: sumo-0.26.0/src/foreign/Makefile.am
===================================================================
---- sumo-0.25.0.orig/src/foreign/Makefile.am
-+++ sumo-0.25.0/src/foreign/Makefile.am
+--- sumo-0.26.0.orig/src/foreign/Makefile.am
++++ sumo-0.26.0/src/foreign/Makefile.am
@@ -3,7 +3,7 @@ MEMDIRS = nvwa
endif
@@ -46,33 +46,33 @@ Index: sumo-0.25.0/src/foreign/Makefile.am
+GUIDIRS = polyfonts rtree
endif
-
-Index: sumo-0.25.0/src/foreign/Makefile.in
+ SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(MEMDIRS) $(GUIDIRS)
+Index: sumo-0.26.0/src/foreign/Makefile.in
===================================================================
---- sumo-0.25.0.orig/src/foreign/Makefile.in
-+++ sumo-0.25.0/src/foreign/Makefile.in
+--- sumo-0.26.0.orig/src/foreign/Makefile.in
++++ sumo-0.26.0/src/foreign/Makefile.in
@@ -142,7 +142,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
--DIST_SUBDIRS = eulerspiral mersenne tcpip nvwa gl2ps polyfonts rtree
-+DIST_SUBDIRS = eulerspiral mersenne tcpip nvwa polyfonts rtree
+-DIST_SUBDIRS = eulerspiral mersenne tcpip PHEMlight nvwa gl2ps \
++DIST_SUBDIRS = eulerspiral mersenne tcpip PHEMlight nvwa \
+ polyfonts rtree
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
- dir0=`pwd`; \
-@@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@
+@@ -314,7 +314,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@CHECK_MEMORY_LEAKS_TRUE at MEMDIRS = nvwa
- at WITH_GUI_TRUE@GUIDIRS = gl2ps polyfonts rtree
+ at WITH_GUI_TRUE@GUIDIRS = polyfonts rtree
- EXTRA_DIST = additional.txt
- SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS)
+ SUBDIRS = eulerspiral mersenne tcpip PHEMlight $(MEMDIRS) $(GUIDIRS)
all: all-recursive
-Index: sumo-0.25.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
+
+Index: sumo-0.26.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
===================================================================
---- sumo-0.25.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
-+++ sumo-0.25.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
+--- sumo-0.26.0.orig/src/utils/gui/windows/GUISUMOAbstractView.cpp
++++ sumo-0.26.0/src/utils/gui/windows/GUISUMOAbstractView.cpp
@@ -39,7 +39,7 @@
#include <limits>
#include <fxkeys.h>
@@ -82,22 +82,22 @@ Index: sumo-0.25.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.25.0/configure.ac
+Index: sumo-0.26.0/configure.ac
===================================================================
---- sumo-0.25.0.orig/configure.ac
-+++ sumo-0.25.0/configure.ac
-@@ -445,7 +445,6 @@ src/activitygen/activities/Makefile
+--- sumo-0.26.0.orig/configure.ac
++++ sumo-0.26.0/configure.ac
+@@ -459,7 +459,6 @@ src/activitygen/activities/Makefile
src/activitygen/city/Makefile
src/foreign/Makefile
src/foreign/eulerspiral/Makefile
-src/foreign/gl2ps/Makefile
src/foreign/mersenne/Makefile
src/foreign/nvwa/Makefile
- src/foreign/polyfonts/Makefile
-Index: sumo-0.25.0/src/netedit/Makefile.am
+ src/foreign/PHEMlight/Makefile
+Index: sumo-0.26.0/src/netedit/Makefile.am
===================================================================
---- sumo-0.25.0.orig/src/netedit/Makefile.am
-+++ sumo-0.25.0/src/netedit/Makefile.am
+--- sumo-0.26.0.orig/src/netedit/Makefile.am
++++ sumo-0.26.0/src/netedit/Makefile.am
@@ -66,7 +66,6 @@ netedit_LDADD = ../netimport/libnetimpor
../utils/gui/tracker/libguiutilstracker.a \
../utils/foxtools/libfoxtools.a \
@@ -106,10 +106,10 @@ Index: sumo-0.25.0/src/netedit/Makefile.am
../foreign/polyfonts/libpolyfonts.a \
../foreign/eulerspiral/libeulerspiral.a \
../utils/geom/libgeom.a \
-Index: sumo-0.25.0/src/netedit/Makefile.in
+Index: sumo-0.26.0/src/netedit/Makefile.in
===================================================================
---- sumo-0.25.0.orig/src/netedit/Makefile.in
-+++ sumo-0.25.0/src/netedit/Makefile.in
+--- sumo-0.26.0.orig/src/netedit/Makefile.in
++++ sumo-0.26.0/src/netedit/Makefile.in
@@ -152,7 +152,6 @@ am__DEPENDENCIES_1 =
@WITH_GUI_TRUE@ ../utils/gui/tracker/libguiutilstracker.a \
@WITH_GUI_TRUE@ ../utils/foxtools/libfoxtools.a \
@@ -118,7 +118,7 @@ Index: sumo-0.25.0/src/netedit/Makefile.in
@WITH_GUI_TRUE@ ../foreign/polyfonts/libpolyfonts.a \
@WITH_GUI_TRUE@ ../foreign/eulerspiral/libeulerspiral.a \
@WITH_GUI_TRUE@ ../utils/geom/libgeom.a \
-@@ -444,7 +443,6 @@ EXTRA_DIST = netedit64.ico tlslogo.cpp
+@@ -445,7 +444,6 @@ EXTRA_DIST = netedit64.ico tlslogo.cpp
@WITH_GUI_TRUE at ../utils/gui/tracker/libguiutilstracker.a \
@WITH_GUI_TRUE at ../utils/foxtools/libfoxtools.a \
@WITH_GUI_TRUE at ../utils/distribution/libdistribution.a \
diff --git a/debian/patches/20_fix_scripts_headers.patch b/debian/patches/20_fix_scripts_headers.patch
index c679519..19dcaff 100644
--- a/debian/patches/20_fix_scripts_headers.patch
+++ b/debian/patches/20_fix_scripts_headers.patch
@@ -2,73 +2,73 @@ Description: fixes headers of scripts
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo-0.25.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
===================================================================
---- sumo-0.25.0.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
-+++ sumo-0.25.0/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
+--- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py
++++ sumo-0.26.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-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
===================================================================
---- sumo-0.25.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
-+++ sumo-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/Path.py
+--- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Path.py
++++ sumo-0.26.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-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
===================================================================
---- sumo-0.25.0.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
-+++ sumo-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
+--- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/ProgressBar.py
++++ sumo-0.26.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-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
===================================================================
---- sumo-0.25.0.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
-+++ sumo-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
+--- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py
++++ sumo-0.26.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-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
===================================================================
---- sumo-0.25.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
-+++ sumo-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
+--- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/Reader.py
++++ sumo-0.26.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-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
===================================================================
---- sumo-0.25.0.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
-+++ sumo-0.25.0/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
+--- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/util/BinarySearch.py
++++ sumo-0.26.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-0.25.0/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+Index: sumo-0.26.0/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
===================================================================
---- sumo-0.25.0.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
-+++ sumo-0.25.0/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
+--- sumo-0.26.0.orig/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/GenerateTaxiRoutes.py
++++ sumo-0.26.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-0.25.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
+Index: sumo-0.26.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
===================================================================
--- /dev/null
-+++ sumo-0.25.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
++++ sumo-0.26.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+
@@ -183,10 +183,10 @@ Index: sumo-0.25.0/docs/examples/sumo/variable_speed_signs/aggregated_25.xml
+ <interval begin="450.00" end="451.00" id="dump_25">
+ </interval>
+</netstats>
-Index: sumo-0.25.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
+Index: sumo-0.26.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
===================================================================
--- /dev/null
-+++ sumo-0.25.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
++++ sumo-0.26.0/docs/examples/sumo/output/cross3ltl_emissions/summary.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0"?>
+
@@ -658,10 +658,10 @@ Index: sumo-0.25.0/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-0.25.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
+Index: sumo-0.26.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
===================================================================
--- /dev/null
-+++ sumo-0.25.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
++++ sumo-0.26.0/docs/examples/sumo/output/cross3ltl_tripinfo/tripinfos.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
@@ -741,10 +741,10 @@ Index: sumo-0.25.0/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-0.25.0/docs/examples/sumo/busses/vehroutes.xml
+Index: sumo-0.26.0/docs/examples/sumo/busses/vehroutes.xml
===================================================================
--- /dev/null
-+++ sumo-0.25.0/docs/examples/sumo/busses/vehroutes.xml
++++ sumo-0.26.0/docs/examples/sumo/busses/vehroutes.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
@@ -784,10 +784,10 @@ Index: sumo-0.25.0/docs/examples/sumo/busses/vehroutes.xml
+ </vehicle>
+
+</routes>
-Index: sumo-0.25.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
+Index: sumo-0.26.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
===================================================================
--- /dev/null
-+++ sumo-0.25.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
++++ sumo-0.26.0/docs/examples/sumo/vehicle_stops/vehroutes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
diff --git a/debian/patches/30_add_missing_link.patch b/debian/patches/30_add_missing_link.patch
index cf7e406..3206ef3 100644
--- a/debian/patches/30_add_missing_link.patch
+++ b/debian/patches/30_add_missing_link.patch
@@ -5,21 +5,21 @@ Bug-Debian: http://bugs.debian.org/710373
Reviewed-By: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-16
-Index: sumo-0.25.0/src/Makefile.am
+Index: sumo-0.26.0/src/Makefile.am
===================================================================
---- sumo-0.25.0.orig/src/Makefile.am
-+++ sumo-0.25.0/src/Makefile.am
+--- sumo-0.26.0.orig/src/Makefile.am
++++ sumo-0.26.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-0.25.0/src/Makefile.in
+ if WITH_GUI
+ GUI_APPS = sumo-gui
+Index: sumo-0.26.0/src/Makefile.in
===================================================================
---- sumo-0.25.0.orig/src/Makefile.in
-+++ sumo-0.25.0/src/Makefile.in
-@@ -366,7 +366,7 @@ STRIP = @STRIP@
+--- sumo-0.26.0.orig/src/Makefile.in
++++ sumo-0.26.0/src/Makefile.in
+@@ -372,7 +372,7 @@ STRIP = @STRIP@
VERSION = @VERSION@
XERCES_CFLAGS = @XERCES_CFLAGS@
XERCES_LDFLAGS = @XERCES_LDFLAGS@
diff --git a/debian/patches/40_drop_some_buildflags.patch b/debian/patches/40_drop_some_buildflags.patch
index 1b6215f..856c551 100644
--- a/debian/patches/40_drop_some_buildflags.patch
+++ b/debian/patches/40_drop_some_buildflags.patch
@@ -2,19 +2,19 @@ Description: drop msse2 buildfpags, unsupported by some platforms
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-04-20
-Index: sumo-0.25.0/configure.ac
+Index: sumo-0.26.0/configure.ac
===================================================================
---- sumo-0.25.0.orig/configure.ac
-+++ sumo-0.25.0/configure.ac
-@@ -13,11 +13,6 @@ AC_LANG([C++])
-
- dnl the debug check has to be made before the program checks
- dnl because it modifies CXXFLAGS
--if test x$CXX = xclang++; then
-- CXXFLAGS="-msse2 $CXXFLAGS"
--else
-- CXXFLAGS="-msse2 -mfpmath=sse $CXXFLAGS"
--fi
- AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],[enable sumo debugging code [default=no].])])
- if test x$enable_debug = xyes; then
- AC_DEFINE(_DEBUG, 1, [Define to 1 in order to enable sumo debugging code.])
+--- sumo-0.26.0.orig/configure.ac
++++ sumo-0.26.0/configure.ac
+@@ -109,11 +109,6 @@ dnl - - - - - - - - - - - - - - - - - -
+ case "$host" in
+ x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux*)
+ dnl Make sure we are on architecture that supports SIMD
+- if test x$CXX = xclang++; then
+- CXXFLAGS="-msse2 $CXXFLAGS"
+- else
+- CXXFLAGS="-msse2 -mfpmath=sse $CXXFLAGS"
+- fi
+ ;;
+ *-cygwin*)
+ AC_DEFINE([HAVE_CYGWIN], [1], [Define if compiling under cygwin])
diff --git a/debian/patches/50_use_system_openlayers.patch b/debian/patches/50_use_system_openlayers.patch
index 5e9e4ea..178214e 100644
--- a/debian/patches/50_use_system_openlayers.patch
+++ b/debian/patches/50_use_system_openlayers.patch
@@ -2,8 +2,10 @@ Description: Use system packaged OpenLayers.js
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-01-12
---- sumo-0.25.0+dfsg1.orig/tools/webWizard/index.html
-+++ sumo-0.25.0+dfsg1/tools/webWizard/index.html
+Index: sumo-0.26.0/tools/webWizard/index.html
+===================================================================
+--- sumo-0.26.0.orig/tools/webWizard/index.html
++++ sumo-0.26.0/tools/webWizard/index.html
@@ -5,7 +5,7 @@
<meta charset="utf-8" />
<link rel="stylesheet" href="style.css" />
diff --git a/debian/patches/60_fix_docbuild.diff b/debian/patches/60_fix_docbuild.diff
deleted file mode 100644
index 0aaafce..0000000
--- a/debian/patches/60_fix_docbuild.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Force Makefile check for errors
-Author: Santiago Vila <sanvila at debian.org>
-Acked-By: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/817033
-Last-Update: 2016-04-07
-
-Index: sumo/Makefile.am
-===================================================================
---- sumo.orig/Makefile.am
-+++ sumo/Makefile.am
-@@ -7,10 +7,7 @@ doc: pydoc doxygen userdoc javadoc
- pydoc:
- rm -rf docs/pydoc
- mkdir docs/pydoc
-- cd docs/pydoc && \
-- for i in `find ../../tools/traci ../../tools/sumolib -name "*.py" -not -executable | sed 's,../../tools/,,;s,/,.,g;s,.py,,;s,.__init__,,'`; do \
-- PYTHONPATH="../../tools" python -c "import $$i, pydoc; pydoc.writedoc($$i)"; \
-- done
-+ cd docs/pydoc && sh ../../mk-pydoc
-
- doxygen:
- rm -rf docs/doxygen
-Index: sumo/mk-pydoc
-===================================================================
---- /dev/null
-+++ sumo/mk-pydoc
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+set -e
-+for i in `find ../../tools/traci ../../tools/sumolib -name "*.py" -not -executable | sed 's,../../tools/,,;s,/,.,g;s,.py,,;s,.__init__,,'`; do
-+ PYTHONPATH="../../tools" python -c "import $i, pydoc; pydoc.writedoc($i)"
-+done
diff --git a/debian/patches/series b/debian/patches/series
index ab14219..c6f0819 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
30_add_missing_link.patch
40_drop_some_buildflags.patch
50_use_system_openlayers.patch
-60_fix_docbuild.diff
--
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