[SCM] osgearth branch, master, updated. debian/1.4.1-1-39-g6366f59

[Pirmin Kalberer]

The following commit has been merged in the master branch:
commit 88e3386e869eabd92d66add65ed6a631c6569b2d
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Tue Jul 9 21:42:43 2013 +0200

    Lib version to 2.4.0 / SO version 2

diff --git a/debian/changelog b/debian/changelog
index 9615e2c..ee7bb64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-osgearth (2.3.0rc+dfsg-1) unstable; urgency=low
+osgearth (2.4.0+dfsg-1) unstable; urgency=low
 
-  * Upstream release 2.3.0 RC
+  * Upstream release 2.4.0
 
- -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Tue, 16 Oct 2012 16:43:31 +0200
+ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Tue, 09 Jul 2013 22:31:06 +0200
 
 osgearth (2.1.1+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4810113..70b2a45 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ 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}
+Depends: libosgearth1 (>= 1.4-2), 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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0a55278
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+soversion.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
new file mode 100644
index 0000000..5189361
--- /dev/null
+++ b/debian/patches/soversion.patch
@@ -0,0 +1,16 @@
+Index: osgearth-2.4.0/CMakeLists.txt
+===================================================================
+--- osgearth-2.4.0.orig/CMakeLists.txt	2013-07-09 21:39:07.382882255 +0200
++++ osgearth-2.4.0/CMakeLists.txt	2013-07-09 21:41:06.414873949 +0200
+@@ -19,9 +19,9 @@
+ PROJECT(OSGEARTH)
+ 
+ SET(OSGEARTH_MAJOR_VERSION 2)
+-SET(OSGEARTH_MINOR_VERSION 3)
++SET(OSGEARTH_MINOR_VERSION 4)
+ SET(OSGEARTH_PATCH_VERSION 0)
+-SET(OSGEARTH_SOVERSION     0)
++SET(OSGEARTH_SOVERSION     2)
+ 
+ SET(OSGEARTH_PLUGIN_PREFIX "")
+ 
diff --git a/debian/rules b/debian/rules
index d7dae2c..126425a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,8 +76,8 @@ install-arch:
 	install -D README.txt debian/osgearth/usr/share/doc/osgearth/README.txt
 
 	mkdir -p debian/osgearth/usr/share/osgearth/fonts && \
-	  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
+	  ln -s /usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/arial.ttf && \
+	  ln -s /usr/share/fonts/truetype/liberation/LiberationSerif-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/times.ttf
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
@@ -94,7 +94,7 @@ binary-common:
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps
+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):tmp/lib dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -114,10 +114,10 @@ binary: binary-arch binary-indep
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=.
 	rm -rf $(PACKAGE)-$(VERSION)
-	tar -xf $(PACKAGE)_$(VERSION).orig.tar.gz
-	rm $(PACKAGE)_$(VERSION).orig.tar.gz
-	mv gwaldron-osgearth* $(PACKAGE)-$(VERSION)
-	#Remove data files with unknown license
+	tar -xf $(PACKAGE)_*.orig.tar.gz
+	rm $(PACKAGE)_*.orig.tar.gz
+	mv osgearth-osgearth* $(PACKAGE)-$(VERSION)
+	#Remove data files with unknown license (TODO: keep resources/)
 	find $(PACKAGE)-$(VERSION)/data -not -name world.tif -type f | xargs rm
 	mv $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).orig
 	GZIP=--best tar -cz --owner root --group root --mode a+rX \
diff --git a/debian/watch b/debian/watch
index ea8286c..387817e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://githubredir.debian.net/github/gwaldron/osgearth .*osgearth-(.*).tar.gz
+opts=dversionmangle=s/(\.0)?\+(debian|dfsg|ds|deb)\d*$//,filenamemangle=s/.+\/v?(.*)\.tar\.gz/osgearth-$1.tar.gz/ \
+  https://github.com/gwaldron/osgearth/tags .*/osgearth-(\d[\d\.]+)\.tar\.gz
\ No newline at end of file

-- 
osgEarth terrain rendering toolkit