diff --git a/debian/changelog b/debian/changelog index 722b7fd..b4bb49b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +sumo (0.15.0~dfsg-3) unstable; urgency=low + + * [6ae8190] Use compat level 9. Apply hardening of buildflags. + * [daa56b5] Remove from compilation embedded copy of gl2ps, + use packaged version instead. + * [8c08de0] Add upstream file + + -- Anton Gladky Wed, 18 Jul 2012 21:04:34 +0200 + sumo (0.15.0~dfsg-2) unstable; urgency=low * [5813a09] Update fix_headers_of_scripts.patch. diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index bc2bf37..4766ab6 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Homepage: http://sumo.sourceforge.net/ 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 (>= 8), libxerces-c2-dev, - libgdal-dev, libproj-dev, libfox-1.6-dev, +Build-Depends: debhelper (>= 9), libxerces-c2-dev, dpkg-dev (>= 1.16.1~), + 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/fix_manpage_output.patch b/debian/patches/fix_manpage_output.patch index 4ddebae..e5fb4cc 100644 --- a/debian/patches/fix_manpage_output.patch +++ b/debian/patches/fix_manpage_output.patch @@ -1,5 +1,6 @@ Description: fixes manpage NAME field Author: Anton Gladk +Bug: https://sourceforge.net/apps/trac/sumo/ticket/717 Last-Update: 2012-05-27 --- a/Makefile.in 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 +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) \ +-@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@./utils/foxtools/libfoxtools.a \ + @WITH_GUI_TRUE@$(MESOGUI_LIBS) \ + @WITH_GUI_TRUE@$(sumo_LDADD) \ +-@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 \ +--- 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@MEMDIRS = nvwa +-@WITH_GUI_TRUE@GUIDIRS = gl2ps polyfonts rtree ++@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 + #include + #include +-#include ++#include + #include + #include + #include 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 2f2cf3b..1ccc065 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,16 @@ %: dh $@ --parallel -export CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS) -export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) -export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +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: dh_auto_configure -- --prefix=/usr diff --git a/debian/upstream b/debian/upstream new file mode 100644 index 0000000..13dfcc3 --- /dev/null +++ b/debian/upstream @@ -0,0 +1,13 @@ +Reference: + Author: M. Behrisch and L. Bieker and J. Erdmann and D. Krajzewicz + Title: "SUMO - Simulation of Urban MObility: An Overview" + Journal: SIMUL 2011, The Third International Conference on Advances in System Simulation + Year: 2011 + Pages: 63-68 + Type: INPROCEEDINGS + eprint: http://sumo.sourceforge.net/pdf/simul_2011_3_40_50150.pdf +Bug-Database: http://sourceforge.net/apps/trac/sumo/report +Screenshots: http://sourceforge.net/apps/mediawiki/sumo/index.php?title=Screenshots +FAQ: http://sumo.sourceforge.net/doc/current/docs/userdoc/FAQ.html +Homepage: http://sumo.sourceforge.net/ +Name: SUMO - Simulation of Urban MObility