[sumo] 04/10: Refresh patches.

Anton Gladky gladk at moszumanska.debian.org
Thu Nov 20 22:26:49 UTC 2014


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

gladk pushed a commit to branch experimental
in repository sumo.

commit 785774fbd8820f782db890ddb48767a139cfeba1
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Nov 20 21:45:51 2014 +0100

    Refresh patches.
---
 debian/patches/add_missing_link.patch      | 2 +-
 debian/patches/remove_embedded_gl2ps.patch | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/add_missing_link.patch b/debian/patches/add_missing_link.patch
index c06bd44..b7e6854 100644
--- a/debian/patches/add_missing_link.patch
+++ b/debian/patches/add_missing_link.patch
@@ -19,7 +19,7 @@ Index: sumo/src/Makefile.in
 ===================================================================
 --- sumo.orig/src/Makefile.in
 +++ sumo/src/Makefile.in
-@@ -351,7 +351,7 @@ STRIP = @STRIP@
+@@ -353,7 +353,7 @@ STRIP = @STRIP@
  VERSION = @VERSION@
  XERCES_CFLAGS = @XERCES_CFLAGS@
  XERCES_LDFLAGS = @XERCES_LDFLAGS@
diff --git a/debian/patches/remove_embedded_gl2ps.patch b/debian/patches/remove_embedded_gl2ps.patch
index fd3d37a..5fa20dc 100644
--- a/debian/patches/remove_embedded_gl2ps.patch
+++ b/debian/patches/remove_embedded_gl2ps.patch
@@ -6,7 +6,7 @@ Index: sumo/src/Makefile.am
 ===================================================================
 --- sumo.orig/src/Makefile.am
 +++ sumo/src/Makefile.am
-@@ -85,7 +85,6 @@ sumo_gui_LDADD =  ./gui/libgui.a \
+@@ -84,7 +84,6 @@ sumo_gui_LDADD =  ./gui/libgui.a \
  ./utils/foxtools/libfoxtools.a \
  $(MESOGUI_LIBS) \
  $(sumo_LDADD) \
@@ -18,7 +18,7 @@ Index: sumo/src/Makefile.in
 ===================================================================
 --- sumo.orig/src/Makefile.in
 +++ sumo/src/Makefile.in
-@@ -155,7 +155,6 @@ am__DEPENDENCIES_3 = ./netload/libnetloa
+@@ -157,7 +157,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/src/Makefile.in
  @WITH_GUI_TRUE@	./foreign/polyfonts/libpolyfonts.a \
  @WITH_GUI_TRUE@	./gui/GUIManipulator.o \
  @WITH_GUI_TRUE@	./gui/GUITLLogicPhasesTrackerWindow.o \
-@@ -474,7 +473,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
+@@ -475,7 +474,6 @@ $(XERCES_LDFLAGS) $(GDAL_LDFLAGS) $(PROJ
  @WITH_GUI_TRUE at ./utils/foxtools/libfoxtools.a \
  @WITH_GUI_TRUE@$(MESOGUI_LIBS) \
  @WITH_GUI_TRUE@$(sumo_LDADD) \
@@ -60,7 +60,7 @@ Index: sumo/src/foreign/Makefile.in
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
-@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
+@@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  @CHECK_MEMORY_LEAKS_TRUE at MEMDIRS = nvwa

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