[redeclipse] 401/494: generate-copyright: nicer insertion with ed, fixes missing debian

[Martin Werner]

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

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

commit d6d3bd3353a268f47054f8470894178a4107053a
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Aug 17 15:15:46 2012 +0200

    generate-copyright: nicer insertion with ed, fixes missing debian
---
 generate-copyright | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/generate-copyright b/generate-copyright
index b547aef..4c278ac 100755
--- a/generate-copyright
+++ b/generate-copyright
@@ -56,6 +56,11 @@ sed 'N;s/^\nLicense:\ Zlib$/\nINSERT_ENET_HERE\n\nLicense:\ Zlib/' -i debian/cop
 
 # Enet chunk
 cat <<"EOF" > debian/enet-license-temp
+EOF
+
+# Insert Enet chunk
+ed -s debian/copyright-new << "EOF"
+/INSERT_ENET_HERE/c
 Files: src/enet/*
 Copyright: 2002-2012 Lee Salzman
 License: Expat
@@ -244,20 +249,17 @@ License:
  PARTICULAR PURPOSE.
 
 INSERT_DEBIAN_HERE
+.
+w
 EOF
 
-# Insert Enet chunk
-sed -e '/INSERT_ENET_HERE/r debian/enet-license-temp' -e '/INSERT_ENET_HERE/d' -i debian/copyright-new
-rm debian/enet-license-temp
-
 # Debian chunk
-cat <<EOF > debian/debian-license-temp
+ed -s debian/copyright-new <<EOF
+/INSERT_DEBIAN_HERE/c
 Files: debian/*
 Copyright: 2011 Martin Erik Werner <martinerikwerner at gmail.com>
 License: Zlib
+.
+w
 EOF
 
-# Insert Debian chunk
-sed -e '/INSERT_DEBIAN_HERE/r debian/enet-license-temp' -e '/INSERT_DEBIAN_HERE/d' -i debian/copyright-new
-rm debian/debian-license-temp
-

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