[SCM] osgearth branch, master, updated. debian/1.4.1-1-71-gecb0256
Bas Couwenberg
sebastic at xs4all.nl
Wed Sep 18 11:46:00 UTC 2013
The following commit has been merged in the master branch:
commit ccad11fb71db2d730bbc337c5d9a2039df2272c8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Sep 15 16:34:46 2013 +0200
Split osgearth library into separate binary packages.
Split osgearth library into separate binary packages:
- libosgearth2: libosgEarth.so
- libosgearthannotation2: libosgEarthAnnotation.so
- libosgearthfeatures2: libosgEarthFeatures.so
- libosgearthqt2: libosgEarthQt.so
- libosgearthsymbology2: libosgEarthSymbology.so
- libosgearthutil2: libosgEarthUtil.so
- openscenegraph-plugin-osgearth: OpenSceneGraph plugins.
diff --git a/debian/changelog b/debian/changelog
index a002899..0fe822b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,14 @@ osgearth (2.4.0+dfsg-4) UNRELEASED; urgency=low
* Add patch to fix 'becuase' typo.
* Use minimal dh rules with debhelper 9.
* Include all executables in osgearth.
+ * Split osgearth library into separate binary packages:
+ - libosgearth2: libosgEarth.so
+ - libosgearthannotation2: libosgEarthAnnotation.so
+ - libosgearthfeatures2: libosgEarthFeatures.so
+ - libosgearthqt2: libosgEarthQt.so
+ - libosgearthsymbology2: libosgEarthSymbology.so
+ - libosgearthutil2: libosgEarthUtil.so
+ - openscenegraph-plugin-osgearth: OpenSceneGraph plugins
-- Bas Couwenberg <sebastic at xs4all.nl> Fri, 13 Sep 2013 15:14:27 +0200
diff --git a/debian/control b/debian/control
index d0befe8..5d91ebe 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/osgearth.git
Package: osgearth
Architecture: any
-Depends: libosgearth1 (>= 1.4-2), fonts-liberation, ${shlibs:Depends}, ${misc:Depends}
+Depends: fonts-liberation, ${shlibs:Depends}, ${misc:Depends}
Suggests: osgearth-data
Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (binaries)
osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
@@ -41,13 +41,117 @@ Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (data)
This package contains data files.
Package: libosgearth1
+Section: oldlibs
+Architecture: any
+Depends: libosgearth2,
+ libosgearthannotation2,
+ libosgearthfeatures2,
+ libosgearthqt2,
+ libosgearthsymbology2,
+ libosgearthutil2,
+ ${misc:Depends}
+Description: Transitional dummy package for libosgearth2
+ This is a transitional dummy package to ease upgrades from the
+ libosgearth1 package to the libosgearth2 package.
+ It can safely be removed.
+
+Package: libosgearth2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: libosgearth1
+Replaces: libosgearth1, osgearth (<< 1.4-2)
+Breaks: libosgearth1, osgearth (<< 1.4-2)
+Suggests: openscenegraph
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (shared lib)
+ osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
+ .
+ This package contains the shared library libosgEarth.
+
+Package: libosgearthannotation2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: openscenegraph
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthAnnotation)
+ osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
+ .
+ This package contains the shared library libosgEarthAnnotation.
+
+Package: libosgearthfeatures2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: openscenegraph
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthFeatures)
+ osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
+ .
+ This package contains the shared library libosgEarthFeatures.
+
+Package: libosgearthqt2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: openscenegraph
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthQt)
+ osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
+ .
+ This package contains the shared library libosgEarthQt.
+
+Package: libosgearthsymbology2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: openscenegraph
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthSymbology)
+ osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
+ .
+ This package contains the shared library libosgEarthSymbology.
+
+Package: libosgearthutil2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: osgearth (<< 1.4-2)
-Breaks: osgearth (<< 1.4-2)
Suggests: openscenegraph
-Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (shared libs)
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthUtil)
+ osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
+ .
+ This package contains the shared library libosgEarthUtil.
+
+Package: openscenegraph-plugin-osgearth
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenSceneGraph plugins for osgEarth
osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
(OSG), an open source, high performance, 3D graphics toolkit. Just create a
simple XML file, point it at your imagery, elevation, and vector data, load it
@@ -55,12 +159,18 @@ Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (shared lib
data and comes with lots of examples to help you get up and running quickly
and easily.
.
- This package contains the shared libraries.
+ This package contains the OpenSceneGraph plugins.
Package: libosgearth-dev
Section: libdevel
Architecture: any
-Depends: libopenscenegraph-dev, libgeos-dev, libosgearth1 (= ${binary:Version}), ${misc:Depends}
+Depends: libosgearth2 (= ${binary:Version}),
+ libosgearthannotation2 (= ${binary:Version}),
+ libosgearthfeatures2 (= ${binary:Version}),
+ libosgearthqt2 (= ${binary:Version}),
+ libosgearthsymbology2 (= ${binary:Version}),
+ libosgearthutil2 (= ${binary:Version}),
+ libopenscenegraph-dev, libgeos-dev, ${misc:Depends}
Replaces: osgearth-dev
Description: osgEarth development files
osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
diff --git a/debian/libosgearth1.install b/debian/libosgearth1.install
deleted file mode 100644
index 981e267..0000000
--- a/debian/libosgearth1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libosg*.so.2*
-usr/lib/osgPlugins-*
diff --git a/debian/libosgearth1.lintian-overrides b/debian/libosgearth1.lintian-overrides
deleted file mode 100644
index 586c4be..0000000
--- a/debian/libosgearth1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libosgearth1: embedded-library usr/lib/libosgEarth.so.2.0.0: tinyxml
\ No newline at end of file
diff --git a/debian/libosgearth2.install b/debian/libosgearth2.install
new file mode 100644
index 0000000..5bd208c
--- /dev/null
+++ b/debian/libosgearth2.install
@@ -0,0 +1 @@
+usr/lib/libosgEarth.so.*
diff --git a/debian/libosgearth2.lintian-overrides b/debian/libosgearth2.lintian-overrides
new file mode 100644
index 0000000..c486afe
--- /dev/null
+++ b/debian/libosgearth2.lintian-overrides
@@ -0,0 +1,4 @@
+# Linking with libtinyxml is risky, because osgearth contains
+# patched version from CVS, compiled without TIXML_USE_STL.
+# libtinyxml provides only tinyxml with STL support.
+libosgearth2: embedded-library usr/lib/libosgEarth.so.2.4.0: tinyxml
diff --git a/debian/libosgearthannotation2.install b/debian/libosgearthannotation2.install
new file mode 100644
index 0000000..75b07ee
--- /dev/null
+++ b/debian/libosgearthannotation2.install
@@ -0,0 +1 @@
+usr/lib/libosgEarthAnnotation.so.*
diff --git a/debian/libosgearthfeatures2.install b/debian/libosgearthfeatures2.install
new file mode 100644
index 0000000..9a3045e
--- /dev/null
+++ b/debian/libosgearthfeatures2.install
@@ -0,0 +1 @@
+usr/lib/libosgEarthFeatures.so.*
diff --git a/debian/libosgearthqt2.install b/debian/libosgearthqt2.install
new file mode 100644
index 0000000..33c92c1
--- /dev/null
+++ b/debian/libosgearthqt2.install
@@ -0,0 +1 @@
+usr/lib/libosgEarthQt.so.*
diff --git a/debian/libosgearthsymbology2.install b/debian/libosgearthsymbology2.install
new file mode 100644
index 0000000..7f7ea40
--- /dev/null
+++ b/debian/libosgearthsymbology2.install
@@ -0,0 +1 @@
+usr/lib/libosgEarthSymbology.so.*
diff --git a/debian/libosgearthutil2.install b/debian/libosgearthutil2.install
new file mode 100644
index 0000000..e2637d0
--- /dev/null
+++ b/debian/libosgearthutil2.install
@@ -0,0 +1 @@
+usr/lib/libosgEarthUtil.so.*
diff --git a/debian/openscenegraph-plugin-osgearth.install b/debian/openscenegraph-plugin-osgearth.install
new file mode 100644
index 0000000..1fb0153
--- /dev/null
+++ b/debian/openscenegraph-plugin-osgearth.install
@@ -0,0 +1 @@
+usr/lib/osgPlugins-*
--
osgEarth terrain rendering toolkit
More information about the Pkg-grass-devel
mailing list