[redeclipse-data] 03/03: Follow move of summary license to license.txt, use ex over ed

[Martin Werner]

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

arand-guest pushed a commit to branch master
in repository redeclipse-data.

commit 4135762e713ea6c33fc0f2b84642e58fd2ad44ae
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sun Dec 6 14:19:15 2015 +0100

    Follow move of summary license to license.txt, use ex over ed
    
    * Upstream moved the summary license to doc/license.txt, use this to
      generate debian/copyright
    
    * Use whole summary license, not only data content bit
    
    * Switch to using ex over ed, since ed is now not installed by
      default (and the generate-copyright script is meant to be used by the
      maintainer, not the build system, where ed is a build-dep anyways)
---
 debian/generate-copyright | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/generate-copyright b/debian/generate-copyright
index 4cce829..e6697f8 100755
--- a/debian/generate-copyright
+++ b/debian/generate-copyright
@@ -22,11 +22,11 @@ Files-Excluded: bin config *.bat *.sh src/dpiaware.manifest src/enet
                 src/engine src/game src/include src/install src/lib src/*.sh
                 src/redeclipse* src/scripts src/shared src/*.h
                 src/xcode data/fonts/Play* data/fonts/play*
-License: Red-Eclipse-Data
+License: Red-Eclipse
 EOF
 
-# Data summary license, indented
-sed -e 's/^/\ /' -e 's/^\ $/\ \./' readme.txt >> debian/copyright-new
+# Summary license, indented
+sed -e 's/^/\ /' -e 's/^\ $/\ \./' doc/license.txt >> debian/copyright-new
 
 # Remove duplicated Format: line and insert upstream license dep5 file
 sed '/Format:.*/d' "$all_licenses"  >> debian/copyright-new
@@ -45,7 +45,7 @@ awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 ~ /^License: Zlib$/ { print "INSERT_
 mv debian/copyright-temp debian/copyright-new
 
 # Debian chunk
-ed -s debian/copyright-new <<EOF
+ex -s debian/copyright-new <<EOF
 /INSERT_DEBIAN_HERE/c
 Files: debian/*
 Copyright: 2011-2015 Martin Erik Werner <martinerikwerner at gmail.com>

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