uncommitted - crrcsim

Ready changes

Diff

diff --git a/debian/changelog b/debian/changelog
index 803633e..bcf0fb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,22 @@ crrcsim (0.9.13-4) UNRELEASED; urgency=medium
 
  -- Debian Janitor <janitor@jelmer.uk>  Wed, 30 Oct 2019 03:13:10 +0000
 
+crrcsim (0.9.13-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch to fix FTBFS with CGAL >= 5.0 (Closes: #946114).
+  * Add Build-Depends: libcgal-dev (>= 5.0~).
+
+ -- Joachim Reichel <reichel@debian.org>  Tue, 03 Dec 2019 22:22:43 +0100
+
+crrcsim (0.9.13-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Switch back to the libjpeg that will be in buster.
+    (Closes: #916346)
+
+ -- Adrian Bunk <bunk@debian.org>  Sat, 22 Dec 2018 01:02:57 +0200
+
 crrcsim (0.9.13-3) unstable; urgency=medium
 
   * Fix sys/io unsupported, defining dummy interfaces for io operations
diff --git a/debian/control b/debian/control
index c62e500..125456a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends:
  libsdl1.2-dev,
  libboost-thread-dev,
  libplib-dev,
- libcgal-dev,
- libjpeg9-dev,
+ libcgal-dev (>= 5.0~),
+ libjpeg-dev,
  portaudio19-dev,
 Standards-Version: 4.1.4
 Homepage: http://crrcsim.berlios.de
diff --git a/debian/patches/10-cgal-use-header-only-mode.patch b/debian/patches/10-cgal-use-header-only-mode.patch
new file mode 100644
index 0000000..1f03b85
--- /dev/null
+++ b/debian/patches/10-cgal-use-header-only-mode.patch
@@ -0,0 +1,13 @@
+Index: crrcsim-0.9.13/configure.ac
+===================================================================
+--- crrcsim-0.9.13.orig/configure.ac
++++ crrcsim-0.9.13/configure.ac
+@@ -232,7 +232,7 @@ if  (test "x$ac_cv_header_CGAL_Exact_pre
+       has_CGAL="yes  (found CGAL v3)"
+     fi   
+     CGAL_CFLAGS=-frounding-math
+-    CGAL_LIBS=-lCGAL
++    CGAL_LIBS=
+     AC_DEFINE([WINDDATA3D], [1], [Import code for wind data, needs CGAL, 0 to disable])
+ else
+     has_CGAL="no   (CGAL not found)"
diff --git a/debian/patches/series b/debian/patches/series
index 11c6181..b623533 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07-add-libgmp.patch
 08-boost_thread-mt-change.patch
 09-remove-extra-std-err.patch
+10-cgal-use-header-only-mode.patch

Run locally

More details

Full run details