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

Fri Oct 22 21:55:11 UTC 2010

The following commit has been merged in the master branch:
commit af9134ed336850d2773fd30a6e8480ce32b5d5dc
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Fri Oct 22 23:29:50 2010 +0200

    Copyright & Lintian cleanups

diff --git a/debian/control b/debian/control
index 7de14fe..8f00501 100644
--- a/debian/control
+++ b/debian/control
@@ -19,17 +19,17 @@ Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph
 
 Package: libosgearth1
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: osgearth (<< 1.4-2)
 Breaks: osgearth (<< 1.4-2)
 Suggests: openscenegraph
-Description: osgEarth terrain rendering toolkit
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph
  osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
 
 Package: osgearth-dev
 Architecture: any
 Depends: libopenscenegraph-dev, libgeos-dev, libosgearth1 (= ${binary:Version}), ${misc:Depends}
 Description: osgEarth development files
- Dynamic 3D terrain rendering toolkit for OpenSceneGraph
+ osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
  .
  This package contains the development files.
diff --git a/debian/copyright b/debian/copyright
index 7dc1159..6e04cfb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,36 +2,29 @@ This package was debianized by:
 
     Pirmin Kalberer <pi_deb at sourcepole.ch> on Thu, 07 Jan 2010 13:31:14 +0100
 
-It was downloaded from via svn from http://wush.net/svn/osgearth/
-
-Upstream Authors:
-
-        Jason Beverage
-        Glenn Waldron
+It was downloaded from http://github.com/gwaldron/osgearth/downloads
 
 Copyrights:
 
-    Copyright 2009 Pelican Ventures Inc.
+    Copyright 2008-2010 Pelican Mapping
+    Copyright 2008-2010 Pelican Mapping / 1998-2006 Robert Osfield
+    Copyright 2008-2009 Pelican Ventures Inc.
+    Copyright 2002-2003 Maxim Shemanarev (McSeem)
+
+    /usr/share/osgearth/data/world.tif:
+    This file is in the public domain because it was created by NASA.
+    NASA copyright policy states that "NASA material is not protected by copyright unless noted".
+    Credits: Blue Marble: Next Generation was produced by Reto Stöckli,
+    NASA Earth Observatory (NASA Goddard Space Flight Center)
 
 License:
 
-    osgEarth is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>
+    LGPL (v2 or later) see `/usr/share/common-licenses/LGPL-2'
 
 The Debian packaging is:
 
     Copyright (C) 2009 Pirmin Kalberer <pi_deb at sourcepole.ch>
 
-and is licensed under the GPL version 3, 
-see `/usr/share/common-licenses/GPL-3'.
+and is licensed under the LGPL (v2 or later),
+see `/usr/share/common-licenses/LGPL-2'.
 
diff --git a/debian/lintian/osgearth b/debian/lintian/osgearth
deleted file mode 100644
index f4fcbeb..0000000
--- a/debian/lintian/osgearth
+++ /dev/null
@@ -1,2 +0,0 @@
-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-install b/debian/osgearth-install
deleted file mode 100644
index e772481..0000000
--- a/debian/osgearth-install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/rules b/debian/rules
index d0f73f8..bfdb05f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,7 @@ install-arch:
 	
 	dh_install -s
 
-	install -D LICENSE.txt debian/osgearth/usr/share/doc/osgearth/LICENSE.txt
-	install README.txt debian/osgearth/usr/share/doc/osgearth/README.txt
+	install -D README.txt debian/osgearth/usr/share/doc/osgearth/README.txt
 
 	mkdir -p debian/osgearth/usr/share/osgearth/maps && \
           cp tests/*.earth debian/osgearth/usr/share/osgearth/maps/ && \
@@ -72,8 +71,8 @@ install-arch:
 	mkdir -p debian/osgearth/usr/share/osgearth/data && \
           cp data/world.tif debian/osgearth/usr/share/osgearth/data/
 	mkdir -p debian/osgearth/usr/share/osgearth/fonts && \
-	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
+	ln -s ../../fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/arial.ttf && \
+	ln -s ../../fonts/truetype/ttf-liberation/LiberationSerif-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/times.ttf
 
 
 # Must not depend on anything. This is to be called by
@@ -105,14 +104,3 @@ binary-arch: build-arch install-arch
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure get-orig-source
-
-PACKAGE = osgearth
-SRC_VERSION=$(shell dpkg-parsechangelog|grep Version:|cut -d' ' -f2|cut -d- -f1)
-SVN_TAG  := $(shell dpkg-parsechangelog | sed -ne 's/.\+SVN tag \(osgearth.\+\)\./\1/p')
-SVN_EXPORT := http://wush.net/svn/osgearth/tags/$(SVN_TAG)
-TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
-
-get-orig-source:
-	cd /tmp && svn export $(SVN_EXPORT) $(PACKAGE)-$(SRC_VERSION)
-	tar czvf $(PACKAGE)_$(SRC_VERSION).orig.tar.gz  -C /tmp $(PACKAGE)-$(SRC_VERSION)
-	rm -rf /tmp/$(PACKAGE)-$(SRC_VERSION)
diff --git a/debian/watch b/debian/watch
index a87dbd2..37288ef 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,13 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
-
-# <Webpage URL> <string match>
-#http://wush.net/websvn/osgearth/listing.php?repname=osgearth&path=%2Ftags%2F path=%2Ftags%2Fosgearth(.*)%2F
-
-# There are no source packages
-# SVN tags mark new releases
+http://githubredir.debian.net/github/gwaldron/osgearth (.*).tar.gz

-- 
osgEarth terrain rendering toolkit

