aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@vega.ocn.ne.jp>2011-05-04 07:36:51 +0000
committerTatsuya Kinoshita <tats@vega.ocn.ne.jp>2011-05-04 07:36:51 +0000
commita39fed31e23487b5fc4778ce76ba3963c44ec4eb (patch)
tree5ccc23cb8292ff29f07091c6afef60d5d616f60a
parentReleasing debian version 0.5.2-2 (diff)
downloadw3m-debian/0.5.2-2.1.tar.gz
w3m-debian/0.5.2-2.1.zip
Releasing debian version 0.5.2-2.1debian/0.5.2-2.1
-rw-r--r--debian/changelog11
-rw-r--r--debian/patches/06-gnukfreebsd-ftbfs-fix11
-rw-r--r--debian/patches/series1
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a2820aa..87f57b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+w3m (0.5.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/06-gnukfreebsd-ftbfs-fix:
+ - Fix FTBFS on GNU/kFreeBSD by extending the check on the FreeBSD
+ version to __FreeBSD_kernel_version, as exported by the FreeBSD
+ kernel on the GNU/kFreeBSD environments, as suggested by Petr
+ Salinger (Closes: #493486).
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 30 Jun 2009 00:46:59 +0200
+
w3m (0.5.2-2) unstable; urgency=low
* debian/control:
diff --git a/debian/patches/06-gnukfreebsd-ftbfs-fix b/debian/patches/06-gnukfreebsd-ftbfs-fix
new file mode 100644
index 0000000..8398f4d
--- /dev/null
+++ b/debian/patches/06-gnukfreebsd-ftbfs-fix
@@ -0,0 +1,11 @@
+--- a/terms.c
++++ b/terms.c
+@@ -26,7 +26,7 @@
+ #endif /* USE_GPM */
+ #ifdef USE_SYSMOUSE
+ #include <osreldate.h>
+-#if (__FreeBSD_version >= 400017)
++#if (__FreeBSD_version >= 400017) || (__FreeBSD_kernel_version >= 400017)
+ #include <sys/consio.h>
+ #include <sys/fbio.h>
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index e55a89f..3857133 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
03-w3m.1-debian-fix
04-ja-w3m.1-debian-fix
05-config-debian-fix
+06-gnukfreebsd-ftbfs-fix