The following commit has been merged in the master branch:
commit fecb93dc34df4d0c4406cbcc7eddb52f6366eb28
Author: Pirmin Kalberer <p...@sourcepole.ch>
Date: Fri Jul 8 23:35:50 2011 +0200
Debian package 2.0-4
diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake
index fdb9b25..a6c9648 100644
--- a/CMakeModules/FindGDAL.cmake
+++ b/CMakeModules/FindGDAL.cmake
@@ -57,7 +57,7 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
)
FIND_LIBRARY(GDAL_LIBRARY
- NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0
gdal1.3.2 GDAL
+ NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
PATHS
c:/Program Files/FWTools2.1.0/lib
$ENV{GDAL_DIR}
@@ -65,14 +65,14 @@ FIND_LIBRARY(GDAL_LIBRARY
PATH_SUFFIXES lib64 lib
)
FIND_LIBRARY(GDAL_LIBRARY
- NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0
gdal1.3.2 GDAL
+ NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
c:/Program Files/FWTools2.1.0/lib
NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib
)
FIND_LIBRARY(GDAL_LIBRARY
- NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0
gdal1.3.2 GDAL
+ NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
PATHS
~/Library/Frameworks
/Library/Frameworks
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f6c0554..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-
-README.Debian-source
-
-The source package uses quilt for the modifications of the upstream source.
-If you want to change something it is best to use the quilt approach as
-documented in
- /usr/share/doc/quilt/README.source
-
diff --git a/debian/changelog b/debian/changelog
index eff9d02..e75e5f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+osgearth (2.0-4) unstable; urgency=low
+
+ * Changed maintainer to Debian GIS Project
+ * Renamed osgearth-dev to libosgearth-dev
+ * Removed binaries from libosgearth-dev
+ * Moved to sections devel/libs/libdevel
+ * Enhanced package descriptions
+ * Standards-Version 3.9.2
+ * Added source/format 3.0 (quilt)
+ * Ready for Debian upload (closes: #633068)
+
+ -- Pirmin Kalberer <pi_...@sourcepole.ch> Fri, 08 Jul 2011 20:58:44 +0200
+
osgearth (2.0-3) unstable; urgency=low
* GDAL 1.8 support
diff --git a/debian/control b/debian/control
index 8f00501..57686e5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,35 +1,59 @@
Source: osgearth
-Section: science
+Section: devel
Priority: extra
-Maintainer: Pirmin Kalberer <pi_...@sourcepole.ch>
+Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
+Uploaders: Pirmin Kalberer <pi_...@sourcepole.ch>
Build-Depends: debhelper (>= 7), quilt, cmake (>= 2.6.2),
libopenscenegraph-dev (>= 2.8.0), openscenegraph (>= 2.8.0),
libgdal1-dev (>= 1.6.0), libgeos-dev, libexpat1-dev (>= 2.0.1),
libcurl4-gnutls-dev, libzip-dev, libsqlite3-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://osgearth.org/
Vcs-Git: git://git.debian.org/pkg-grass/osgearth.git
Vcs-Browser: http://git.debian.org/?p=pkg-grass/osgearth.git
Package: osgearth
+Section: devel
Architecture: any
Depends: libosgearth1 (>= 1.4-2), ttf-liberation, ${shlibs:Depends},
${misc:Depends}
Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph
+ 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.
osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
+ .
+ This package contains binaries and data files.
Package: libosgearth1
+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
+ 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.
osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
+ .
+ This package contains the shared libraries.
-Package: osgearth-dev
+Package: libosgearth-dev
+Section: libdevel
Architecture: any
Depends: libopenscenegraph-dev, libgeos-dev, libosgearth1 (=
${binary:Version}), ${misc:Depends}
+Replaces: osgearth-dev
Description: osgEarth development files
+ 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.
osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
.
This package contains the development files.
diff --git a/debian/libosgearth-dev.install b/debian/libosgearth-dev.install
new file mode 100644
index 0000000..81b307c
--- /dev/null
+++ b/debian/libosgearth-dev.install
@@ -0,0 +1,2 @@
+usr/include
+usr/lib/libosg*.so
diff --git a/debian/osgearth-dev.install b/debian/osgearth-dev.install
deleted file mode 100644
index 251d291..0000000
--- a/debian/osgearth-dev.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/bin/osgearth_shadercomp
-usr/bin/osgearth_features
-usr/bin/osgearth_ocean
-usr/bin/osgearth_manip
-usr/bin/osgearth_tilesource
-usr/bin/osgearth_elevation
-usr/bin/osgearth_controls
-usr/bin/osgearth_clouds
-usr/include
-usr/lib/libosg*.so
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
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
