[plplot] 44/68: Import Debian changes 5.9.0-8+kbsd

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit 79b1310ada078c71fe9c1ffcd300f55355f03a1a
Author: Aurelien Jarno <aurel32 at debian.org>
Date:   Fri Feb 6 02:32:49 2009 +0100

    Import Debian changes 5.9.0-8+kbsd
    
    plplot (5.9.0-8+kbsd) unreleased; urgency=low
    
      * Applied patch from Petr Salinger to fix FTBFS on GNU/kFreeBSD.
---
 cmake/modules/xwin.cmake | 2 ++
 debian/changelog         | 6 ++++++
 debian/control.in        | 2 +-
 debian/rules             | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/xwin.cmake b/cmake/modules/xwin.cmake
index f094a3c..02e6ace 100644
--- a/cmake/modules/xwin.cmake
+++ b/cmake/modules/xwin.cmake
@@ -43,6 +43,8 @@ if(PLD_xwin)
         set(xwin_LINK_FLAGS ${xwin_LINK_FLAGS} ${CMAKE_THREAD_LIBS_INIT})
 	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	  set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE_NP")
+	elseif(CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")
+	  set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE_NP")
 	else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	  set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE")
 	endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/debian/changelog b/debian/changelog
index d7ebac8..a19bfea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plplot (5.9.0-8+kbsd) unreleased; urgency=low
+
+  * Applied patch from Petr Salinger to fix FTBFS on GNU/kFreeBSD.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 06 Feb 2009 02:32:49 +0100
+
 plplot (5.9.0-8) unstable; urgency=low
 
   [ Andrew Ross ]
diff --git a/debian/control.in b/debian/control.in
index 883ddb8..37a5c1f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm],
  python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
  python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386],
- fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel]
+ fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers
diff --git a/debian/rules b/debian/rules
index 7c53f16..e1e9ce9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 # Disable java and ada build on arm - problems with java-gcj-compat-dev
 # at the moment. Also gnat not available on arm, mips, and mipsel.
 
-ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:armeb:armel:mips:mipsel:))
+ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:armeb:armel:mips:mipsel:kfreebsd-amd64:))
 BUILD_ADA = no
 else
 BUILD_ADA = yes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git