[sumo] 02/05: Refresh patches.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository sumo.

commit 5b43e899adc2cd82544fbc7ba743197c0e43439c
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Aug 30 21:53:14 2013 +0200

    Refresh patches.
---
 debian/patches/add_missing_link.patch      |   24 ++++++++++++------------
 debian/patches/drop_eulerspiral.patch      |   10 +++++-----
 debian/patches/fix_scripts_headers.patch   |    2 +-
 debian/patches/remove_embedded_gl2ps.patch |    4 ++--
 debian/patches/series                      |    1 +
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/patches/add_missing_link.patch b/debian/patches/add_missing_link.patch
index 076e76d..a261f80 100644
--- a/debian/patches/add_missing_link.patch
+++ b/debian/patches/add_missing_link.patch
@@ -3,27 +3,27 @@ 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-06-10
+Last-Update: 2013-08-30
 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -102,7 +102,7 @@
- ./gui/GUIManipulator.o \
+--- sumo-0.18~dfsg.orig/src/Makefile.am
++++ sumo-0.18~dfsg/src/Makefile.am
+@@ -103,7 +103,7 @@ $(sumo_LDADD) \
  ./gui/GUITLLogicPhasesTrackerWindow.o \
  $(OSG_LIBS) \
+ $(GDAL_LIBS) \
 --l$(LIB_FOX)
 +-l$(LIB_FOX) -lpthread -lGLU -lGL
  endif
  
  
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -390,7 +390,7 @@
- @WITH_GUI_TRUE at ./gui/GUIManipulator.o \
+--- sumo-0.18~dfsg.orig/src/Makefile.in
++++ sumo-0.18~dfsg/src/Makefile.in
+@@ -391,7 +391,7 @@ $(PROJ_LIBS)
  @WITH_GUI_TRUE at ./gui/GUITLLogicPhasesTrackerWindow.o \
  @WITH_GUI_TRUE@$(OSG_LIBS) \
+ @WITH_GUI_TRUE@$(GDAL_LIBS) \
 - at WITH_GUI_TRUE@-l$(LIB_FOX)
-+ at WITH_GUI_TRUE@-l$(LIB_FOX)  -lpthread -lGLU -lGL
++ at WITH_GUI_TRUE@-l$(LIB_FOX) -lpthread -lGLU -lGL
  
- SUBDIRS = foreign utils microsim netbuild netwrite netgen netimport netload \
- od2trips polyconvert router dfrouter duarouter jtrrouter activitygen \
+ SUBDIRS = foreign utils microsim router od2trips $(INTERNAL_DIRS) \
+ netbuild netwrite netgen netimport netload \
diff --git a/debian/patches/drop_eulerspiral.patch b/debian/patches/drop_eulerspiral.patch
index 88ca5b0..b0db0ce 100644
--- a/debian/patches/drop_eulerspiral.patch
+++ b/debian/patches/drop_eulerspiral.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-06-12
  #include <utils/options/OptionsCont.h>
  #include <utils/common/FileHelpers.h>
  #include <utils/xml/XMLSubSys.h>
-@@ -718,9 +717,6 @@
+@@ -716,9 +715,6 @@
                  case OPENDRIVE_GT_LINE:
                      geom = geomFromLine(e, g);
                      break;
@@ -22,7 +22,7 @@ Last-Update: 2013-06-12
                  case OPENDRIVE_GT_ARC:
                      geom = geomFromArc(e, g);
                      break;
-@@ -758,23 +754,6 @@
+@@ -756,23 +752,6 @@
      return ret;
  }
  
@@ -48,7 +48,7 @@ Last-Update: 2013-06-12
  NIImporter_OpenDrive::geomFromArc(const OpenDriveEdge& e, const OpenDriveGeometry& g) {
 --- a/configure
 +++ b/configure
-@@ -17427,7 +17427,7 @@
+@@ -17410,7 +17410,7 @@
  
  
  
@@ -57,7 +57,7 @@ Last-Update: 2013-06-12
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -18583,7 +18583,6 @@
+@@ -18566,7 +18566,6 @@
      "src/activitygen/activities/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/activities/Makefile" ;;
      "src/activitygen/city/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/city/Makefile" ;;
      "src/foreign/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/Makefile" ;;
@@ -67,7 +67,7 @@ Last-Update: 2013-06-12
      "src/foreign/nvwa/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/nvwa/Makefile" ;;
 --- a/configure.ac
 +++ b/configure.ac
-@@ -448,7 +448,6 @@
+@@ -440,7 +440,6 @@
  src/activitygen/activities/Makefile
  src/activitygen/city/Makefile
  src/foreign/Makefile
diff --git a/debian/patches/fix_scripts_headers.patch b/debian/patches/fix_scripts_headers.patch
index 18afc5f..7b42eb8 100644
--- a/debian/patches/fix_scripts_headers.patch
+++ b/debian/patches/fix_scripts_headers.patch
@@ -1149,7 +1149,7 @@ Last-Update: 2012-12-04
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  """
- @file    convert_fcd2phem.py
+ @file    traceExporter.py
  @author  Daniel Krajzewicz
 --- a/tools/import/osm/osmPopulationExtractor.py
 +++ b/tools/import/osm/osmPopulationExtractor.py
diff --git a/debian/patches/remove_embedded_gl2ps.patch b/debian/patches/remove_embedded_gl2ps.patch
index a062764..a3eac97 100644
--- a/debian/patches/remove_embedded_gl2ps.patch
+++ b/debian/patches/remove_embedded_gl2ps.patch
@@ -43,7 +43,7 @@ Last-Update: 2012-12-04
  
 --- a/configure
 +++ b/configure
-@@ -17427,7 +17427,7 @@
+@@ -17410,7 +17410,7 @@
  
  
  
@@ -52,7 +52,7 @@ Last-Update: 2012-12-04
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -18583,7 +18583,6 @@
+@@ -18566,7 +18566,6 @@
      "src/activitygen/activities/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/activities/Makefile" ;;
      "src/activitygen/city/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/city/Makefile" ;;
      "src/foreign/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/Makefile" ;;
diff --git a/debian/patches/series b/debian/patches/series
index 487a931..82a03bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 drop_eulerspiral.patch
 remove_embedded_gl2ps.patch
 fix_scripts_headers.patch
+#add_missing_link.patch
 add_missing_link.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git