[SCM] Packaging for tachyon branch, master, updated. debian/0.99_b2+dfsg-0.1-3-g10a4c33

[Tobias Hansen]

The following commit has been merged in the master branch:
commit 0a84b0fcb866332ce941faa51085b941fa30cef1
Author: Steffen Moeller <moeller at debian.org>
Date:   Thu Apr 21 23:57:51 2011 +0200

    Imported Debian patch 0.99~b2+dfsg-0.3

diff --git a/debian/README.Debian b/debian/README.Debian
index 4f1efab..9120d2e 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -7,4 +7,6 @@ arch-independent builds:
 
 Many thanks for any suggestion
 
+The fix for #620999 is not right. I had disabled the threading on the kfreebsd platforms to work around the compilation problem with threading.
+
 Steffen
diff --git a/debian/README.source b/debian/README.source
index fe25606..c99a67b 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -6,3 +6,6 @@ Tachyon
  * find . -name ".#*" | xargs -r rm
 
 Left in the msvc folder, which seems find copyright-wise.
+
+ * src/util.c gets sys/time.h included, which helps compilation on kfreebsd
+
diff --git a/debian/changelog b/debian/changelog
index ee49d07..e7b1cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,15 @@
+tachyon (0.99~b2+dfsg-0.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fixed build failures on kfreebsd 
+    - disabling threading (Closes: 620999)
+    - including sys/time.h in src/util.c
+
+ -- Steffen Moeller <moeller at debian.org>  Thu, 21 Apr 2011 23:57:51 +0200
+
 tachyon (0.99~b2+dfsg-0.2) unstable; urgency=low
 
+  * Non-maintainer upload.
   * Moved TeX build requirements from Build-Depends-Indep
     to Build-Depends (Closes: #620068).
 
diff --git a/debian/patches/kfreebsd_error_timezone.patch b/debian/patches/kfreebsd_error_timezone.patch
new file mode 100644
index 0000000..d48f300
--- /dev/null
+++ b/debian/patches/kfreebsd_error_timezone.patch
@@ -0,0 +1,12 @@
+Index: tachyon-0.99~b2/src/util.c
+===================================================================
+--- tachyon-0.99~b2.orig/src/util.c	2011-04-21 23:42:47.137582297 +0200
++++ tachyon-0.99~b2/src/util.c	2011-04-21 23:43:11.201701618 +0200
+@@ -11,6 +11,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/time.h>	/* for struct timezone on kfreebsd */
+ #include <fcntl.h>
+ 
+ #define TACHYON_INTERNAL 1
diff --git a/debian/patches/series b/debian/patches/series
index 63ba3cb..091b122 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+kfreebsd_error_timezone.patch
 shared-library.patch
 enable-png.patch
 architecture.patch
diff --git a/debian/rules b/debian/rules
index 827736d..0c1ca08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,16 @@ include /usr/share/cdbs/1/class/makefile.mk
 DEB_MAKE_INVOKE += -C unix
 
 DEB_MAKE_BUILD_TARGET=linux-base-thr
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+
+# did not get past compile error for src/thread.h
+ifeq ($(DEB_BUILD_ARCH), kfreebsd-i386)
+  DEB_MAKE_BUILD_TARGET = linux
+endif
+ifeq ($(DEB_BUILD_ARCH), kfreebsd-amd64)
+  DEB_MAKE_BUILD_TARGET = linux-64
+endif
 
 build-indep:
 	$(MAKE) -C docs pdf

-- 
Packaging for tachyon