[SCM] osgearth branch, master, updated. debian/1.4.1-1-77-g8ebb0ac

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 8ebb0ac74f29628b72040bf664cc780cf417e24f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 18 21:23:17 2013 +0200

    Use improved uscan to repack the upstream tarball.

diff --git a/debian/copyright b/debian/copyright
index 5e0ef8f..0fbad37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,89 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: osgEarth
 Upstream-Contact: Glenn Waldron
 Source: http://osgearth.org/
+Comment: Several data files with unknown licenses are removed to create
+ the +dfsg version.
+Files-Excluded: data/2s19_ru_desert.tga
+ data/2s19_ru_desert.tga.attr
+ data/2s19_ru_dmg_desert.tga
+ data/2s19_ru_tred_common.tga
+ data/arconline_nodata.png
+ data/BostonBldgs.kmz
+ data/boston_buildings_utm19.dbf
+ data/boston_buildings_utm19.prj
+ data/boston_buildings_utm19.shp
+ data/boston_buildings_utm19.shx
+ data/boston-inset.tif
+ data/boston-inset-wgs84.tif
+ data/boston-parks.dbf
+ data/boston-parks.prj
+ data/boston-parks.shp
+ data/boston-parks.shx
+ data/boston-scl-utm19n-meters.dbf
+ data/boston-scl-utm19n-meters.prj
+ data/boston-scl-utm19n-meters.shp
+ data/boston-scl-utm19n-meters.shx
+ data/boxman.osg
+ data/ci10nv09.dbf
+ data/ci10nv09.prj
+ data/ci10nv09.shp
+ data/ci10nv09.shx
+ data/dcbuildings.dbf
+ data/dcbuildings.prj
+ data/dcbuildings.shp
+ data/dcbuildings.shx
+ data/fells_loop.gpx
+ data/fractal.png
+ data/icon.png
+ data/istates_dissolve.dbf
+ data/istates_dissolve.prj
+ data/istates_dissolve.shp
+ data/istates_dissolve.shx
+ data/KML_Samples.kml
+ data/m2525_air.png
+ data/moon_1024x512.jpg
+ data/nodata.tif
+ data/nyc-inset-wgs84.tif
+ data/oceanalpha.int
+ data/ocean_mask.tif
+ data/osgearth.gif
+ data/parks.dbf
+ data/parks.prj
+ data/parks.shp
+ data/parks.shx
+ data/placemark32.png
+ data/placemark64.png
+ data/points.dbf
+ data/points.prj
+ data/points.shp
+ data/points.shx
+ data/popup-theme.png
+ data/red_flag.osg
+ data/tank.FLT
+ data/terrain/mt_everest_90m.tif
+ data/terrain/mt_fuji_90m.tif
+ data/terrain/mt_rainier_90m.tif
+ data/tfs_boston.zip
+ data/tree.gif
+ data/tree.ive
+ data/tree.osg
+ data/usa.dbf
+ data/usa.prj
+ data/usa.shp
+ data/usa.shx
+ data/USFLAG.TGA
+ data/utah.dbf
+ data/utah.prj
+ data/utah.shp
+ data/utah.shx
+ data/watersurface1.png
+ data/watersurface2.png
+ data/watersurface3.png
+ data/watersurface4.png
+ data/world.dbf
+ data/world.prj
+ data/world.shp
+ data/world.shx
 License: LGPL-3
 
 Files: src/applications/osgearth_kml/osgearth_kml.cpp
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100755
index 0000000..5d371cd
--- /dev/null
+++ b/debian/get-orig-source
@@ -0,0 +1,41 @@
+#!/bin/sh -x
+# Repack tarball because of data files with unknown license
+
+set -e
+
+# Remark: A new uscan that enables easier handling of removing files can be
+#         obtained via
+#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
+#         and then copy scripts/uscan.pl as uscan at the beginning of your PATH
+if uscan --help | grep -q -- --repack-compression ; then
+    echo "Use new enhanced uscan"
+    uscan --verbose --force-download --repack-compression gzip
+    exit
+fi
+
+# Falling back to manually removing files
+
+PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
+VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//'`
+UVERSION=`echo $VERSION | sed 's/\.0\$//'`
+
+uscan --verbose --force-download --no-symlink
+
+mkdir -p ../tarballs
+cd ../tarballs
+
+tar -xaf ../${PACKAGE}-${UVERSION}.tar.gz
+
+# Directory in upstream tarball can contain the project name twice
+if [ -d "${PACKAGE}-${PACKAGE}-${UVERSION}" ]; then
+	mv ${PACKAGE}-${PACKAGE}-${UVERSION} ${PACKAGE}-${UVERSION}
+fi
+
+# Remove data files with unknown license
+find ${PACKAGE}-${UVERSION}/data/ -not -name world.tif -not -path "*/resources/*" -type f -delete
+
+mv ${PACKAGE}-${UVERSION} ${PACKAGE}-${VERSION}+dfsg.orig
+
+GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf ../"${PACKAGE}"_"${VERSION}"+dfsg.orig.tar.gz "${PACKAGE}-${VERSION}"+dfsg.orig
+rm -rf "${PACKAGE}-${VERSION}"+dfsg.orig
+
diff --git a/debian/rules b/debian/rules
index bf86740..b114efa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,15 +97,5 @@ override_dh_makeshlibs:
 	dh_makeshlibs -- -c0 -v$(VERSION)
 
 get-orig-source:
-	uscan --noconf --force-download --rename --download-current-version --destdir=.
-	rm -rf $(PACKAGE)-$(VERSION)
-	tar -xf $(PACKAGE)_*.orig.tar.gz
-	rm $(PACKAGE)_*.orig.tar.gz
-	mv osgearth-osgearth* $(PACKAGE)-$(VERSION)
-	#Remove data files with unknown license
-	find $(PACKAGE)-$(VERSION)/data -not -name world.tif -type f | grep -v "/data/resources/" | xargs rm
-	mv $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).orig
-	GZIP=--best tar -cz --owner root --group root --mode a+rX \
-			-f ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz \
-			$(PACKAGE)-$(VERSION).orig
-	rm -r $(PACKAGE)-$(VERSION).orig
+	. debian/get-orig-source
+
diff --git a/debian/watch b/debian/watch
index 387817e..7319362 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-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
+opts=dversionmangle=s/(\.0)?\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/^\d+\.\d+$/$&.0/ \
+  https://github.com/gwaldron/osgearth/releases .*/osgearth-(\d[\d\.]+)\.tar\.gz \
+  debian debian/get-orig-source

-- 
osgEarth terrain rendering toolkit