[SCM] Packaging for Red Eclipse branch, master-svn, updated. debian/1.2-2-45-ga25b505

Martin Erik Werner martinerikwerner at gmail.com
Fri Aug 17 13:16:27 UTC 2012


The following commit has been merged in the master-svn branch:
commit 4a44367fabf9a57a7f9650d21eceb57c88167ff4
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

diff --git a/debian/generate-copyright b/debian/generate-copyright
index b547aef..4c278ac 100755
--- a/debian/generate-copyright
+++ b/debian/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
-

-- 
Packaging for Red Eclipse



More information about the Pkg-games-commits mailing list