[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. debian/0.17.1_dfsg-2-2-g638c723
Anton Gladky
gladky.anton at gmail.com
Thu Jun 13 07:03:56 UTC 2013
The following commit has been merged in the master branch:
commit f7f8e0dd59166b5fe9995351f413d58e043c0224
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Wed Jun 12 22:08:49 2013 +0200
Use autoreconf.
diff --git a/debian/control b/debian/control
index 80c27a0..81bb96e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/sumo.gi
Build-Depends:
autotools-dev,
debhelper (>= 9),
+ dh-autoreconf,
dpkg-dev (>= 1.16.1~),
help2man,
libbz2-dev,
diff --git a/debian/patches/drop_eulerspiral.patch b/debian/patches/drop_eulerspiral.patch
index 45a6f11..88ca5b0 100644
--- a/debian/patches/drop_eulerspiral.patch
+++ b/debian/patches/drop_eulerspiral.patch
@@ -1,6 +1,6 @@
Description: Remove eulerspiral source code due to license issues.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-12-04
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-06-12
--- a/src/netimport/NIImporter_OpenDrive.cpp
+++ b/src/netimport/NIImporter_OpenDrive.cpp
@@ -134,3 +134,11 @@ Last-Update: 2012-12-04
static std::vector<Position> geomFromArc(const OpenDriveEdge& e, const OpenDriveGeometry& g);
static std::vector<Position> geomFromPoly(const OpenDriveEdge& e, const OpenDriveGeometry& g);
static Position calculateStraightEndPoint(double hdg, double length, const Position& start);
+--- a/src/foreign/Makefile.am
++++ b/src/foreign/Makefile.am
+@@ -9,4 +9,4 @@
+
+ EXTRA_DIST = additional.txt
+
+-SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS)
++SUBDIRS = mersenne tcpip $(MEMDIRS) $(GUIDIRS)
diff --git a/debian/rules b/debian/rules
index 7240f26..d85dbbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --parallel
+ dh $@ --parallel --with autoreconf
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
--
SUMO packaging. Simulation of Urban MObility.
More information about the debian-science-commits
mailing list