[simutrans] 01/04: Remove repack.sh and use Files-Excluded mechanism instead.

[Markus Koschany]

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

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

commit afb5acc63b54bab39b69e424aa106178940d4fc4
Author: Markus Koschany <apo at debian.org>
Date:   Wed Feb 10 13:03:57 2016 +0100

    Remove repack.sh and use Files-Excluded mechanism instead.
---
 debian/changelog |  1 +
 debian/copyright |  4 ++++
 debian/repack.sh | 33 ---------------------------------
 debian/rules     |  2 +-
 debian/watch     |  2 +-
 5 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d218d47..64bb0ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ simutrans (120.1.3+repack-1) unstable; urgency=low
   [ Markus Koschany ]
   * Vcs-Git: Use https.
   * Declare compliance with Debian Policy 3.9.7.
+  * Remove repack.sh and use Files-Excluded mechanism instead.
 
  -- Jörg Frings-Fürst <debian at jff-webhosting.net>  Mon, 08 Feb 2016 00:10:30 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 705dac9..83540e2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Simutrans
 Source: http://sourceforge.net/projects/simutrans
+Files-Excluded:
+ simutrans/skin/menu.WindowSkin.pak
+ utils/sha1.cc
+ utils/sha1.h
 
 Files: *
 Copyright: 1997-2004 Hansjörg Malthaner
diff --git a/debian/repack.sh b/debian/repack.sh
deleted file mode 100755
index 5ea391f..0000000
--- a/debian/repack.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -e
-# Repackaging script to be called by Uscan
-
-echo "Repackaging ..."
-TMP="../simutrans-$2/"
-PKG="`dpkg-parsechangelog|sed 's/^Source: //p;d'`_$2+repack.orig"
-
-
-echo "Extracting tarball ..."
-mkdir "$TMP"
-tar xzf "$3" -C "$TMP"
-
-echo "Removing unwanted stuff ..."
-# source is skins.src/*, only removed to make sure we rebuild it.
-rm -rf ${TMP}simutrans/skin/menu.WindowSkin.pak
-
-# freeware, cf. http://www.packetizer.com/security/sha1/ [2011-02-15]
-rm -rf ${TMP}utils/sha1.cc ${TMP}utils/sha1.h
-
-
-echo "Creating repack tarball ..."
-tar -caf "../simutrans_$2+repack.orig.tar.xz" ${TMP}*
-
-
-echo "Clean tmp dir ..."
-rm -rf ${TMP}
-#rmdir --ignore-fail-on-non-empty $TMP
-
-echo "Clean uscan files ..."
-rm -rf ../simutrans-src-$2.zip
-rm -rf ../simutrans_$2.orig.tar.gz
-
-echo "Repackaged tarball created"
diff --git a/debian/rules b/debian/rules
index f6244ba..02bf9e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,4 +48,4 @@ update-translations:
 	$(RM) language_pack-Base+texts.zip
 
 get-orig-source:
-	uscan --verbose --download-current-version --force-download
+	uscan --verbose --download-current-version --force-download --repack
diff --git a/debian/watch b/debian/watch
index c823014..5de0863 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=4
 opts=uversionmangle=s/-/./g,\
 dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
-http://sf.net/simutrans/simutrans-src-(.*)\.zip debian debian/repack.sh
+http://sf.net/simutrans/simutrans-src-(.*)\.zip

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