[DebianGIS-dev] [SCM] osgearth branch, master, updated. c9ef2c7beb35c2b1d8a248ba2aa9a413179ff4ef

[Pirmin Kalberer]

The following commit has been merged in the master branch:
commit c9ef2c7beb35c2b1d8a248ba2aa9a413179ff4ef
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Fri Oct 22 01:13:04 2010 +0200

    Lintian fixes

diff --git a/debian/changelog b/debian/changelog
index 1a59613..4dba642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osgearth (1.4.1-2) unstable; urgency=low
+
+  * Lintian fixes
+
+ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Fri, 22 Oct 2010 00:50:18 +0200
+
 osgearth (1.4.1-1) lucid; urgency=low
 
   * Upstream release 1.4.1
@@ -68,4 +74,4 @@ osgearth (1.3rc1-1) karmic; urgency=low
 
   * Initial Debian package release based on SVN tag osgearth_1.3RC1_T2010-01-04.
 
- -- Pirmin Kalberer <pi at robbe2>  Thu, 07 Jan 2010 13:31:14 +0100
+ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Thu, 07 Jan 2010 13:31:14 +0100
diff --git a/debian/control b/debian/control
index 99ef3ce..7de14fe 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,15 @@ 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.8.3
+Standards-Version: 3.9.1
 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
 Architecture: any
 Depends: libosgearth1 (>= 1.4-2), ttf-liberation, ${shlibs:Depends}, ${misc:Depends}
-Description: osgEarth terrain rendering toolkit
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph
  osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
 
 Package: libosgearth1
@@ -26,8 +28,8 @@ Description: osgEarth terrain rendering toolkit
 
 Package: osgearth-dev
 Architecture: any
-Depends: libopenscenegraph-dev, libgeos-dev, libosgearth1 (= ${binary:Version})
+Depends: libopenscenegraph-dev, libgeos-dev, libosgearth1 (= ${binary:Version}), ${misc:Depends}
 Description: osgEarth development files
- osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
+ Dynamic 3D terrain rendering toolkit for OpenSceneGraph
  .
- This package includes the development files.
+ This package contains the development files.
diff --git a/debian/libosgearth1.install b/debian/libosgearth1.install
new file mode 100644
index 0000000..6f39194
--- /dev/null
+++ b/debian/libosgearth1.install
@@ -0,0 +1,2 @@
+usr/lib/libosg*.so.1*
+usr/lib/osgPlugins-*
diff --git a/debian/lintian/osgearth b/debian/lintian/osgearth
new file mode 100644
index 0000000..f4fcbeb
--- /dev/null
+++ b/debian/lintian/osgearth
@@ -0,0 +1,2 @@
+symlink-should-be-relative usr/share/osgearth/fonts/arial.ttf /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf
+symlink-should-be-relative usr/share/osgearth/fonts/times.ttf /usr/share/fonts/truetype/ttf-liberation/LiberationSerif-Regular.ttf
diff --git a/debian/osgearth-dev.install b/debian/osgearth-dev.install
index e43b95c..81b307c 100644
--- a/debian/osgearth-dev.install
+++ b/debian/osgearth-dev.install
@@ -1 +1,2 @@
 usr/include
+usr/lib/libosg*.so
diff --git a/debian/osgearth-install b/debian/osgearth-install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/osgearth-install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/rules b/debian/rules
index d0e3944..d0f73f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ configure: configure-stamp
 configure-stamp:  $(QUILT_STAMPFN)
 	dh_testdir
 	mkdir tmp
-	cd tmp && cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+	cd tmp && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DLIB_POSTFIX=""
 	touch configure-stamp
 
 
@@ -75,12 +75,6 @@ install-arch:
 	ln -s /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/arial.ttf && \
 	ln -s /usr/share/fonts/truetype/ttf-liberation/LiberationSerif-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/times.ttf
 
-	cp -r debian/tmp/usr/bin debian/osgearth/usr/
-	mkdir -p debian/libosgearth1/usr
-	cp -r debian/tmp/usr/lib debian/libosgearth1/usr/ || \
-	  cp -r debian/tmp/usr/lib64 debian/libosgearth1/usr/
-
-
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

-- 
osgEarth terrain rendering toolkit