From: John Wright <jsw@debian.org>
Date: Sat, 15 May 2010 01:07:08 +0000 (-0600)
Subject: Upgrade to "3.0 (quilt)" source format
X-Git-Tag: 0.97.7-3~6
X-Git-Url: http://git.johnwright.org/?a=commitdiff_plain;h=1524a928955b981a47dd9edd2e0b6ec3b5675f50;p=fmit.git

Upgrade to "3.0 (quilt)" source format

This involved converting the inline patch for 0.97.7-2.1 into a quilt
patch.
---

diff --git a/debian/changelog b/debian/changelog
index a0592ee..257b234 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ fmit (0.97.7-3) UNRELEASED; urgency=low
 
   * Change Build-Depends on fftw3-dev to libfftw3-dev, to avoid depending
     on a virtual package
+  * Upgrade to "3.0 (quilt)" source format
 
  -- John Wright <jsw@debian.org>  Fri, 18 Jan 2008 17:12:25 -0700
 
diff --git a/debian/patches/include-cstdlib.patch b/debian/patches/include-cstdlib.patch
new file mode 100644
index 0000000..2ec7a01
--- /dev/null
+++ b/debian/patches/include-cstdlib.patch
@@ -0,0 +1,15 @@
+Fix FTBFS on GNU/kFreeBSD (Closes: #542540):
+
+Add a <cstdlib> include (for exit) to src/main.cc.  Patch from
+Cyril Brulebois <kibi@debian.org>.
+
+--- fmit-0.97.7.orig/src/main.cpp
++++ fmit-0.97.7/src/main.cpp
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ 
+ #include <iostream>
++#include <cstdlib>
+ using namespace std;
+ #include <signal.h>
+ #include <qapplication.h>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0b91d7d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+include-cstdlib.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/src/main.cpp b/src/main.cpp
index 29b632c..fc565bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,6 @@
 #include "config.h"
 
 #include <iostream>
-#include <cstdlib>
 using namespace std;
 #include <signal.h>
 #include <qapplication.h>