[SCM] osgearth branch, jessie, updated. debian/2.4-5-5-g18cd3e5

2013-10-05 Thread Bas Couwenberg 
The following commit has been merged in the jessie branch:
commit 5024acc8fc7c2c165d7503cb07bea1b549b4ea55
Author: Bas Couwenberg 
Date:   Sat Oct 5 19:56:55 2013 +0200

Set architecture any again.

diff --git a/debian/changelog b/debian/changelog
index f6799c3..2b800b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 osgearth (2.4.0+dfsg-6) unstable; urgency=low
 
-  * Set architecture to linux-any, FreeBSD is not supported upstream.
   * Fix watch file, don't strip .0 from debian version.
   * Batchpatch the symbols files with recent build logs.
 
diff --git a/debian/control b/debian/control
index 559b08a..933e037 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/osgearth.git
 Homepage: http://osgearth.org/
 
 Package: osgearth
-Architecture: linux-any
+Architecture: any
 Depends: fonts-liberation,
  ${shlibs:Depends},
  ${misc:Depends}
@@ -57,7 +57,7 @@ Description: Dynamic 3D terrain rendering toolkit for 
OpenSceneGraph (data)
  This package contains data files.
 
 Package: libosgearth2
-Architecture: linux-any
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -77,7 +77,7 @@ Description: Dynamic 3D terrain rendering toolkit for 
OpenSceneGraph (shared lib
  This package contains the shared library libosgEarth.
 
 Package: libosgearthannotation2
-Architecture: linux-any
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -93,7 +93,7 @@ Description: Dynamic 3D terrain rendering toolkit for 
OpenSceneGraph (osgEarthAn
  This package contains the shared library libosgEarthAnnotation.
 
 Package: libosgearthfeatures2
-Architecture: linux-any
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -109,7 +109,7 @@ Description: Dynamic 3D terrain rendering toolkit for 
OpenSceneGraph (osgEarthFe
  This package contains the shared library libosgEarthFeatures.
 
 Package: libosgearthqt2
-Architecture: linux-any
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -125,7 +125,7 @@ Description: Dynamic 3D terrain rendering toolkit for 
OpenSceneGraph (osgEarthQt
  This package contains the shared library libosgEarthQt.
 
 Package: libosgearthsymbology2
-Architecture: linux-any
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -141,7 +141,7 @@ Description: Dynamic 3D terrain rendering toolkit for 
OpenSceneGraph (osgEarthSy
  This package contains the shared library libosgEarthSymbology.
 
 Package: libosgearthutil2
-Architecture: linux-any
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -157,7 +157,7 @@ Description: Dynamic 3D terrain rendering toolkit for 
OpenSceneGraph (osgEarthUt
  This package contains the shared library libosgEarthUtil.
 
 Package: openscenegraph-plugin-osgearth
-Architecture: linux-any
+Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: OpenSceneGraph plugins for osgEarth
@@ -171,7 +171,7 @@ Description: OpenSceneGraph plugins for osgEarth
  This package contains the OpenSceneGraph plugins.
 
 Package: libosgearth-dev
-Architecture: linux-any
+Architecture: any
 Section: libdevel
 Depends: libosgearth2 (= ${binary:Version}),
  libosgearthannotation2 (= ${binary:Version}),

-- 
osgEarth terrain rendering toolkit

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[SCM] osgearth branch, jessie, updated. debian/2.4-5-5-g18cd3e5

2013-10-05 Thread Bas Couwenberg 
The following commit has been merged in the jessie branch:
commit 18cd3e50870cf266b994f938f23fa4eaf8cfe5ae
Author: Bas Couwenberg 
Date:   Sat Oct 5 19:58:53 2013 +0200

Add patch to fix FTBFS on kfreebsd-*, use pthread_self instead of gettid. 
Thanks Steven Chamberlain for the patch. (closes: #725383)

diff --git a/debian/changelog b/debian/changelog
index 2b800b2..44e18f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ osgearth (2.4.0+dfsg-6) unstable; urgency=low
 
   * Fix watch file, don't strip .0 from debian version.
   * Batchpatch the symbols files with recent build logs.
+  * Add patch to fix FTBFS on kfreebsd-*, use pthread_self instead of gettid.
+Thanks Steven Chamberlain for the patch.
+(closes: #725383)
 
  -- Bas Couwenberg   Tue, 24 Sep 2013 16:59:37 +0200
 
diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch 
b/debian/patches/kfreebsd-getCurrentThreadId.patch
new file mode 100644
index 000..00e559c
--- /dev/null
+++ b/debian/patches/kfreebsd-getCurrentThreadId.patch
@@ -0,0 +1,29 @@
+Index: osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp
+===
+--- osgearth-2.4.0+dfsg.orig/src/osgEarth/ThreadingUtils.cpp   2013-04-11 
19:07:39.0 +0100
 osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp2013-10-04 
22:04:38.898332000 +0100
+@@ -20,9 +20,11 @@
+ 
+ #ifdef _WIN32
+ extern "C" unsigned long __stdcall GetCurrentThreadId();
+-#else
++#elif defined(__APPLE__) || defined(__LINUX__)
+ #   include 
+ #   include 
++#else
++#   include 
+ #endif
+ 
+ using namespace osgEarth::Threading;
+@@ -38,7 +40,10 @@
+   return (unsigned)::GetCurrentThreadId();
+ #elif __APPLE__
+   return ::syscall(SYS_thread_selfid);
+-#else
++#elif __LINUX__
+   return (unsigned)::syscall(SYS_gettid);
++#else
++  /* :XXX: this truncates to 32 bits, but better than nothing */
++  return (unsigned)pthread_self();
+ #endif
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 9391bea..5fb7e42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 soversion.patch
 MPGeometry-OpenSceneGraph-3.1.8.patch
 becuase-typo.patch
+kfreebsd-getCurrentThreadId.patch

-- 
osgEarth terrain rendering toolkit

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel