[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. debian/0.15.0_dfsg-2-5-gac68147
Anton Gladky
gladky.anton at gmail.com
Wed Jul 18 19:06:47 UTC 2012
The following commit has been merged in the master branch:
commit daa56b5a5cc323c67fcbc9f2d98b245988df4361
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Wed Jul 18 20:37:34 2012 +0200
Remove from compilation embedded copy of gl2ps, use packaged version instead.
diff --git a/debian/control b/debian/control
index b92986a..4766ab6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/debian-science/packages/sumo.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/sumo.git
Build-Depends: debhelper (>= 9), libxerces-c2-dev, dpkg-dev (>= 1.16.1~),
- libgdal-dev, libproj-dev, libfox-1.6-dev,
+ libgdal-dev, libproj-dev, libfox-1.6-dev, libgl2ps-dev,
libxrandr-dev, libbz2-dev, libcups2-dev, help2man
Build-Depends-Indep: doxygen, python
diff --git a/debian/patches/remove_embedded_gl2ps.patch b/debian/patches/remove_embedded_gl2ps.patch
new file mode 100644
index 0000000..04f7cdb
--- /dev/null
+++ b/debian/patches/remove_embedded_gl2ps.patch
@@ -0,0 +1,93 @@
+Description: Remove from compilation embedded copy of gl2ps, use packaged version instead.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-07-18
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -98,7 +98,6 @@
+ ./utils/foxtools/libfoxtools.a \
+ $(MESOGUI_LIBS) \
+ $(sumo_LDADD) \
+-./foreign/gl2ps/libgl2ps.a \
+ ./foreign/polyfonts/libpolyfonts.a \
+ ./gui/GUIManipulator.o \
+ ./gui/GUITLLogicPhasesTrackerWindow.o \
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -111,7 +111,6 @@
+ @WITH_GUI_TRUE@ ./utils/gui/tracker/libguiutilstracker.a \
+ @WITH_GUI_TRUE@ ./utils/foxtools/libfoxtools.a $(MESOGUI_LIBS) \
+ @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 \
+@@ -386,7 +385,6 @@
+ @WITH_GUI_TRUE at ./utils/foxtools/libfoxtools.a \
+ @WITH_GUI_TRUE@$(MESOGUI_LIBS) \
+ @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 \
+--- a/src/foreign/Makefile.am
++++ b/src/foreign/Makefile.am
+@@ -3,7 +3,7 @@
+ endif
+
+ if WITH_GUI
+-GUIDIRS = gl2ps polyfonts rtree
++GUIDIRS = polyfonts rtree
+ endif
+
+
+--- a/configure
++++ b/configure
+@@ -16774,7 +16774,7 @@
+
+
+
+-ac_config_files="$ac_config_files src/Makefile src/activitygen/Makefile src/activitygen/activities/Makefile src/activitygen/city/Makefile src/foreign/Makefile src/foreign/gl2ps/Makefile src/foreign/mersenne/Makefile src/foreign/nvwa/Makefile src/foreign/polyfonts/Makefile src/foreign/rtree/Makefile src/foreign/tcpip/Makefile src/gui/Makefile src/gui/dialogs/Makefile src/guinetload/Makefile src/guisim/Makefile src/microsim/Makefile src/microsim/actions/Makefile src/microsim/cfmodels/Makefile src/microsim/devices/Makefile src/microsim/logging/Makefile src/microsim/output/Makefile src/microsim/traffic_lights/Makefile src/microsim/trigger/Makefile src/netbuild/Makefile src/netgen/Makefile src/netimport/Makefile src/netimport/vissim/Makefile src/netimport/vissim/tempstructs/Makefile src/netimport/vissim/typeloader/Makefile src/netload/Makefile src/netwrite/Makefile src/od2trips/Makefile src/polyconvert/Makefile src/router/Makefile src/dfrouter/Makefile src/duarouter/Makefile src/jtrrouter/Makefile src/traci_testclient/Makefile src/traci-server/Makefile src/utils/Makefile src/utils/common/Makefile src/utils/distribution/Makefile src/utils/foxtools/Makefile src/utils/geom/Makefile src/utils/gui/Makefile src/utils/gui/div/Makefile src/utils/gui/events/Makefile src/utils/gui/globjects/Makefile src/utils/gui/images/Makefile src/utils/gui/settings/Makefile src/utils/gui/tracker/Makefile src/utils/gui/windows/Makefile src/utils/importio/Makefile src/utils/iodevices/Makefile src/utils/options/Makefile src/utils/shapes/Makefile src/utils/xml/Makefile unittest/Makefile unittest/src/Makefile unittest/src/microsim/Makefile unittest/src/netbuild/Makefile unittest/src/utils/Makefile unittest/src/utils/common/Makefile unittest/src/utils/geom/Makefile unittest/src/utils/iodevices/Makefile bin/Makefile Makefile"
++ac_config_files="$ac_config_files src/Makefile src/activitygen/Makefile src/activitygen/activities/Makefile src/activitygen/city/Makefile src/foreign/Makefile src/foreign/mersenne/Makefile src/foreign/nvwa/Makefile src/foreign/polyfonts/Makefile src/foreign/rtree/Makefile src/foreign/tcpip/Makefile src/gui/Makefile src/gui/dialogs/Makefile src/guinetload/Makefile src/guisim/Makefile src/microsim/Makefile src/microsim/actions/Makefile src/microsim/cfmodels/Makefile src/microsim/devices/Makefile src/microsim/logging/Makefile src/microsim/output/Makefile src/microsim/traffic_lights/Makefile src/microsim/trigger/Makefile src/netbuild/Makefile src/netgen/Makefile src/netimport/Makefile src/netimport/vissim/Makefile src/netimport/vissim/tempstructs/Makefile src/netimport/vissim/typeloader/Makefile src/netload/Makefile src/netwrite/Makefile src/od2trips/Makefile src/polyconvert/Makefile src/router/Makefile src/dfrouter/Makefile src/duarouter/Makefile src/jtrrouter/Makefile src/traci_testclient/Makefile src/traci-server/Makefile src/utils/Makefile src/utils/common/Makefile src/utils/distribution/Makefile src/utils/foxtools/Makefile src/utils/geom/Makefile src/utils/gui/Makefile src/utils/gui/div/Makefile src/utils/gui/events/Makefile src/utils/gui/globjects/Makefile src/utils/gui/images/Makefile src/utils/gui/settings/Makefile src/utils/gui/tracker/Makefile src/utils/gui/windows/Makefile src/utils/importio/Makefile src/utils/iodevices/Makefile src/utils/options/Makefile src/utils/shapes/Makefile src/utils/xml/Makefile unittest/Makefile unittest/src/Makefile unittest/src/microsim/Makefile unittest/src/netbuild/Makefile unittest/src/utils/Makefile unittest/src/utils/common/Makefile unittest/src/utils/geom/Makefile unittest/src/utils/iodevices/Makefile bin/Makefile Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -17908,7 +17908,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" ;;
+- "src/foreign/gl2ps/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/gl2ps/Makefile" ;;
+ "src/foreign/mersenne/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/mersenne/Makefile" ;;
+ "src/foreign/nvwa/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/nvwa/Makefile" ;;
+ "src/foreign/polyfonts/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/polyfonts/Makefile" ;;
+--- a/src/foreign/Makefile.in
++++ b/src/foreign/Makefile.in
+@@ -60,7 +60,7 @@
+ distdir
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = mersenne tcpip nvwa gl2ps polyfonts rtree
++DIST_SUBDIRS = mersenne tcpip nvwa polyfonts rtree
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+ dir0=`pwd`; \
+@@ -227,7 +227,7 @@
+ 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 = mersenne tcpip $(MEMDIRS) $(GUIDIRS)
+ all: all-recursive
+--- a/src/utils/gui/windows/GUISUMOAbstractView.cpp
++++ b/src/utils/gui/windows/GUISUMOAbstractView.cpp
+@@ -44,7 +44,7 @@
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+ #include <foreign/polyfonts/polyfonts.h>
+-#include <foreign/gl2ps/gl2ps.h>
++#include <gl2ps.h>
+ #include <utils/foxtools/FXSingleEventThread.h>
+ #include <utils/foxtools/MFXCheckableButton.h>
+ #include <utils/foxtools/MFXImageHelper.h>
diff --git a/debian/patches/series b/debian/patches/series
index ccbf286..de7c5eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ fix_format_not_a_string.patch
drop_eulerspiral.patch
fix_headers_of_scripts.patch
fix_gcc-4.7.patch
+
+remove_embedded_gl2ps.patch
diff --git a/debian/rules b/debian/rules
index 1163162..1ccc065 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@ DPKG_EXPORT_BUILDFLAGS = 1
export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export LIBS := -lgl2ps
+
include /usr/share/dpkg/buildflags.mk
override_dh_auto_configure:
--
SUMO packaging. Simulation of Urban MObility.
More information about the debian-science-commits
mailing list