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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 5024acc8fc7c2c165d7503cb07bea1b549b4ea55
Author: Bas Couwenberg <sebastic at xs4all.nl>
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