[freecol] 83/125: Use Files-Excluded mechanism. Provide a get-orig-source target

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freecol.

commit 2f4de8ef56f6f7149cae7a50469904aa02ca24f2
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 19 23:05:37 2015 +0100

    Use Files-Excluded mechanism. Provide a get-orig-source target
    
    and remove freecol-dist-targz.diff and new-upstream files.
---
 debian/copyright               |  6 +++++
 debian/freecol-dist-targz.diff | 31 --------------------------
 debian/new-upstream            | 50 ------------------------------------------
 debian/rules                   |  2 ++
 4 files changed, 8 insertions(+), 81 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9c2e508..1286296 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Source: http://www.freecol.org
 Upstream-Name: Freecol
 Upstream-Contact: The FreeCol Team <freecol-developers at lists.sourceforge.net>
+Files-Excluded:
+ *.jar
+ *.class
+ .svn
+ Plakat-Fraktur.ttf
+
 Comment:
  This package was debianized by Vincent Fourmond <fourmond at debian.org> on
  Mon, 01 Oct 2007 23:58:51 +0200.
diff --git a/debian/freecol-dist-targz.diff b/debian/freecol-dist-targz.diff
deleted file mode 100644
index 1381a06..0000000
--- a/debian/freecol-dist-targz.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: build.xml
-===================================================================
---- build.xml	(revision 3092)
-+++ build.xml	(working copy)
-@@ -246,6 +246,26 @@
-         </tar>
-     </target>
- 
-+    <!-- A target that builds a 'source' package in the Debian 
-+	 of the term, stripped of all potential legal/building 
-+	 problems, such as jars without sources and already built jars,
-+	 as those cause problems and are unnecessary for a distribution.
-+    -->
-+    <target name="tarDistBundle" unless="skip.dist.source" depends="initDist,prepareSourceFiles">
-+        <tar destfile="${freecol.release.dir}/${freecol.release.name}-dist-src.tar.bz2" compression="bzip2">
-+            <tarfileset dir="${freecol.release.dir}/source/${freecol.name}" 
-+			prefix="${freecol.release.name}"
-+			includes="**"
-+			excludes="build/**, test/lib/**" />
-+	    <tarfileset dir="${basedir}" includes="data/**" 
-+			prefix="${freecol.release.name}"
-+			excludes="**/.svn/**, data/fonts/Plakat-Fraktur.ttf" 
-+			/>
-+
-+	    <!-- We remove test/lib because there is junit.jar there -->
-+        </tar>
-+    </target>
-+
-     <target name="zipSourceBundle" unless="skip.dist.source" depends="initDist,prepareSourceFiles">
-         <zip destfile="${freecol.release.dir}/${freecol.release.name}-src.zip">
-             <fileset dir="${freecol.release.dir}/base" includes="${freecol.name}/**"/>
diff --git a/debian/new-upstream b/debian/new-upstream
deleted file mode 100755
index 7918f3b..0000000
--- a/debian/new-upstream
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# new-upstream: copyright 2007 by Vincent Fourmond.
-# See debian/copyright file for details.
-#
-# Called by uscan; from uscan(1):
-#
-# Finally,  if a third parameter (an action) is given in the watchfile
-# line, this is taken as the name of a command, and the command
-#  command --upstream-version version filename
-# 
-# is executed, using either the original file or the symlink name.
-#
-# Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
-#
-
-# If called manually, this file must be called from within the freecol/
-# directory.
-
-version=$2
-filename=`readlink -f $3`
-
-dir=`mktemp -d`
-
-curdir=`pwd`
-
-origname=freecol_$version"+dfsg".orig.tar.bz2
-
-echo "Repackaging freecol version $version from $filename"
-echo $filename
-echo $version
-
-# Abort on errors:
-set -e
-
-# We repackage the upstream source file, according to the method
-# written in debian/copyrigh
-cd $dir
-# tar xvzf $filename
-# Now using unzip:
-unzip $filename
-cd $dir/freecol*
-patch --no-backup-if-mismatch -p0 < $curdir/debian/freecol-dist-targz.diff
-echo $version | ant tarDistBundle
-# Do not remove the original file !!!
-# rm $curdir/$filename
-echo "Moving back dist/freecol-$version-dist-src.tar.bz2 to $curdir/../$origname"
-mv dist/freecol-$version-dist-src.tar.bz2 $curdir/../$origname
-cd -
-rm -rf $dir
diff --git a/debian/rules b/debian/rules
index b85bdfe..23c3696 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,5 @@ override_dh_auto_build:
 		online-manual \
 		print-manual
 
+get-orig-source:
+	uscan --verbose --download-current-version --force-download

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git