[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. debian/0.17.1_dfsg-1-10-g2035aa9
Anton Gladky
gladky.anton at gmail.com
Mon Jun 10 20:56:09 UTC 2013
The following commit has been merged in the master branch:
commit 5961f4ce4dcbde7cc7eaaf3eeeabc2aa0d715474
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Mon Jun 10 21:00:16 2013 +0200
Fix FTBFS with ld --no-add-needed. (Closes: #710373)
diff --git a/debian/patches/add_missing_link.patch b/debian/patches/add_missing_link.patch
index 71978d1..076e76d 100644
--- a/debian/patches/add_missing_link.patch
+++ b/debian/patches/add_missing_link.patch
@@ -1,12 +1,13 @@
Description: Added missing libs to link, fixing FTBFS.
-Author: Daniel T Chen <crimsun at ubuntu.com>
+Author: Daniel T Chen <crimsun at ubuntu.com>, Julian Taylor <jtaylor.debian at googlemail.com>
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-05-14
+Last-Update: 2013-06-10
---- sumo-0.17.1~dfsg.orig/src/Makefile.am
-+++ sumo-0.17.1~dfsg/src/Makefile.am
-@@ -102,7 +102,7 @@ $(sumo_LDADD) \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -102,7 +102,7 @@
./gui/GUIManipulator.o \
./gui/GUITLLogicPhasesTrackerWindow.o \
$(OSG_LIBS) \
@@ -15,3 +16,14 @@ Last-Update: 2013-05-14
endif
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -390,7 +390,7 @@
+ @WITH_GUI_TRUE at ./gui/GUIManipulator.o \
+ @WITH_GUI_TRUE at ./gui/GUITLLogicPhasesTrackerWindow.o \
+ @WITH_GUI_TRUE@$(OSG_LIBS) \
+- at WITH_GUI_TRUE@-l$(LIB_FOX)
++ 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 \
--
SUMO packaging. Simulation of Urban MObility.
More information about the debian-science-commits
mailing list