The following commit has been merged in the master-svn branch:
commit 46b00042d7ebca465790f6e149fae557c475b401
Author: Martin Erik Werner <[email protected]>
Date: Fri Aug 17 20:35:03 2012 +0200
copyright: tolerant token insertion with awk, regenerate
diff --git a/debian/copyright b/debian/copyright
index 1b3e9a5..be5fdd2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -76,8 +76,12 @@ Copyright: 2011, Red Eclipse Team
License: CC-BY-SA-3.0 and Mark-Policy
Files: src/system-install.mk src/dist.mk src/install/nix/redeclipse.am
- src/install/nix/redeclipse.desktop.am doc/examples/*
-Copyright: 2012, Red Eclipse Team
+ src/install/nix/redeclipse.desktop.am
+Copyright: 2011-2012, Red Eclipse Team
+License: Zlib
+
+Files: doc/examples/*
+Copyright: 2011-2012, Red Eclipse Team
License: Zlib
Files: doc/man/cube2font.1 doc/man/redeclipse.6.am
@@ -273,7 +277,7 @@ License:
PARTICULAR PURPOSE.
Files: debian/*
-Copyright: 2011 Martin Erik Werner <[email protected]>
+Copyright: 2011-2012 Martin Erik Werner <[email protected]>
License: Zlib
License: Zlib
diff --git a/debian/generate-copyright b/debian/generate-copyright
index 4c278ac..d6e0316 100755
--- a/debian/generate-copyright
+++ b/debian/generate-copyright
@@ -52,11 +52,8 @@ awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License:
CC-BY-3.0-US$/' debian
mv debian/copyright-temp debian/copyright-new
# Add marker for inserting Enet chunk
-sed 'N;s/^\nLicense:\ Zlib$/\nINSERT_ENET_HERE\n\nLicense:\ Zlib/' -i
debian/copyright-new
-
-# Enet chunk
-cat <<"EOF" > debian/enet-license-temp
-EOF
+awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 ~ /^License: Zlib$/ { print
"INSERT_ENET_HERE" } { print }' debian/copyright-new > debian/copyright-temp
+mv debian/copyright-temp debian/copyright-new
# Insert Enet chunk
ed -s debian/copyright-new << "EOF"
@@ -257,7 +254,7 @@ EOF
ed -s debian/copyright-new <<EOF
/INSERT_DEBIAN_HERE/c
Files: debian/*
-Copyright: 2011 Martin Erik Werner <[email protected]>
+Copyright: 2011-2012 Martin Erik Werner <[email protected]>
License: Zlib
.
w
--
Packaging for Red Eclipse
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
