[sumo] 03/05: Refres patch.

[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 2998b6641e7e27e02b3ebf4d3bda38e568bcaedf
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Nov 30 19:17:17 2013 +0100

    Refres patch.
---
 debian/patches/add_missing_link.patch              | 39 ++++++++++------------
 .../TaxiFCD_Krieg/src/analysis/__init__.py         |  0
 .../projects/TaxiFCD_Krieg/src/backup/__init__.py  |  0
 .../TaxiFCD_Krieg/src/fcdQuality/__init__.py       |  0
 .../TaxiFCD_Krieg/src/fcdToRoutes/__init__.py      |  0
 tools/projects/TaxiFCD_Krieg/src/util/__init__.py  |  0
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/debian/patches/add_missing_link.patch b/debian/patches/add_missing_link.patch
index a261f80..d6e536d 100644
--- a/debian/patches/add_missing_link.patch
+++ b/debian/patches/add_missing_link.patch
@@ -5,25 +5,22 @@ Bug-Debian: http://bugs.debian.org/710373
 Reviewed-By: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-08-30
 
---- 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.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-XERCES_LIBS = -l$(LIB_XERCES)
++XERCES_LIBS = -l$(LIB_XERCES) -lpthread -lGLU -lGL
  
- 
---- 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
- 
- SUBDIRS = foreign utils microsim router od2trips $(INTERNAL_DIRS) \
- netbuild netwrite netgen netimport netload \
+ if INTERNAL
+ MESO_LIBS = ./mesosim/libmesosim.a
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -252,7 +252,7 @@
+ VERSION = @VERSION@
+ XERCES_CFLAGS = @XERCES_CFLAGS@
+ XERCES_LDFLAGS = @XERCES_LDFLAGS@
+-XERCES_LIBS = -l$(LIB_XERCES)
++XERCES_LIBS = -l$(LIB_XERCES) -lpthread -lGLU -lGL
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
diff --git a/tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py b/tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/tools/projects/TaxiFCD_Krieg/src/backup/__init__.py b/tools/projects/TaxiFCD_Krieg/src/backup/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/tools/projects/TaxiFCD_Krieg/src/fcdQuality/__init__.py b/tools/projects/TaxiFCD_Krieg/src/fcdQuality/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py b/tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/tools/projects/TaxiFCD_Krieg/src/util/__init__.py b/tools/projects/TaxiFCD_Krieg/src/util/__init__.py
deleted file mode 100755
index e69de29..0000000

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