[pkg-fgfs-crew] [flightgear-data] 01/01: Repack upstream's tarball, two other minor changes.

[Markus Wanner]

This is an automated email from the git hooks/post-receive script.

markus_wanner-guest pushed a commit to branch experimental
in repository flightgear-data.

commit 5c65afc066293ebc78172545fa3a2f10c3df7767
Author: Markus Wanner <markus at bluegap.ch>
Date:   Tue Feb 17 21:04:11 2015 +0100

    Repack upstream's tarball, two other minor changes.
    
     * Repack upstream's tarball: drop the experimental webgui (it doesn't
       quite seem ready, yet, and bundles various 3rdparty JavaScript
       libraries) and strip the unneeded copies of tzdata and the liberation
       font.
     * Bump S-V: no changes needed.
     * Update debian/copyright and debian/watch.
---
 debian/changelog       |  8 +++++++-
 debian/control         |  2 +-
 debian/copyright       |  7 +++----
 debian/get-orig-source | 10 ++++++++++
 debian/rules           |  7 +------
 debian/watch           |  5 +++--
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b43c165..448df63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-flightgear-data (3.4.0~git20150211+5c0aae-0~exp1) UNRELEASED; urgency=medium
+flightgear-data (3.4.0+dfsg-0~exp1) UNRELEASED; urgency=medium
 
   [ Florent Rougon ]
   * New upstream release 3.2 (Closes: #766251).
@@ -16,6 +16,12 @@ flightgear-data (3.4.0~git20150211+5c0aae-0~exp1) UNRELEASED; urgency=medium
   * Drop patch translation-update-pt.diff, it got applied upstream.
   * Drop references to Textures.high from d/rules. These directories
     no longer exist.
+  * Update debian/copyright and debian/watch.
+  * Repack upstream's tarball: drop the experimental webgui (it doesn't
+    quite seem ready, yet, and bundles various 3rdparty JavaScript
+    libraries) and strip the unneeded copies of tzdata and the liberation
+    font.
+  * Bump S-V: no changes needed.
 
  -- Markus Wanner <markus at bluegap.ch>  Wed, 11 Feb 2015 09:37:39 +0100
 
diff --git a/debian/control b/debian/control
index 0570567..c70c814 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian FlightGear Crew <pkg-fgfs-crew at lists.alioth.debian.org>
 Uploaders: Ove Kaaven <ovek at arcticnet.no>,
  Markus Wanner <markus at bluegap.ch>
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.flightgear.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flightgear-data.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/flightgear-data.git
diff --git a/debian/copyright b/debian/copyright
index 74ef18f..d9b92ec 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,16 +7,15 @@ Files: *
 Copyright: 1999-2012 Curtis L. Olson <curt at flightgear.org>
  and the the FlightGear team (see the Thanks file).
 License: GPL-2+
+Files-Excluded: webgui
+ Fonts/LiberationFonts
+ Timezone
 
 Files: Aircraft/Cub/*
 Copyright: 1999-2012 Curtis L. Olson <curt at flightgear.org>
  and the the FlightGear team (see the Thanks file).
 License: GPL-3+
 
-Files: ATC/Chatter/BR/*
-Copyright: Isaias Prestes
-License: GPL-2+
-
 Files: debian/*
 Copyright: 2001-2012 Ove Kaaven <ovek at arcticnet.no>
            2013 Scott Howard <showard at debian.org>
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100755
index 0000000..4951140
--- /dev/null
+++ b/debian/get-orig-source
@@ -0,0 +1,10 @@
+#!/bin/sh -x
+
+# Repack tarball to strip duplicate stuff.
+
+PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
+VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//'`
+
+uscan --verbose --force-download --no-symlink
+
+bunzip2 -c ../FlightGear-data-${VERSION}.tar.bz2 | tar --delete --wildcards -vf - fgdata/webgui fgdata/Fonts/LiberationFonts fgdata/Timezone | bzip2 -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.bz2
diff --git a/debian/rules b/debian/rules
index 0a920fe..bd97464 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,11 +40,6 @@ override_dh_auto_install:
 		$(CURDIR)/version \
 			debian/flightgear-data-base/usr/share/games/flightgear/
 
-# Note: we do not copy Timezones, but depend on tzdata and provide the
-# required symlinks. In a similar vein, we remove the needless copy of
-# LiberationFonts.
-	rm -r $(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Fonts/LiberationFonts
-
 # Contents of flightgear-data-ai
 	cp -av \
 		$(CURDIR)/AI \
@@ -101,4 +96,4 @@ override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 
 get-orig-source:
-	uscan --download-current-version --verbose --rename
+	. debian/get-orig-source
diff --git a/debian/watch b/debian/watch
index 5435f4a..cac1e0c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/ \
- ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/FlightGear-data-(.*)\.tar\.bz2
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/ \
+http://mirrors.ibiblio.org/flightgear/ftp/Shared/FlightGear-data-(.*)\.tar\.bz2 - \
+debian debian/get-orig-source

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear-data.git