This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch debdir in repository redeclipse.
commit f01f9ee9f74c3f0072d44cc3b3d4d40c89758856 Author: Martin Erik Werner <[email protected]> Date: Fri Aug 17 20:35:03 2012 +0200 copyright: tolerant token insertion with awk, regenerate --- copyright | 10 +++++++--- generate-copyright | 9 +++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/copyright b/copyright index 1b3e9a5..be5fdd2 100644 --- a/copyright +++ b/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/generate-copyright b/generate-copyright index 4c278ac..d6e0316 100755 --- a/generate-copyright +++ b/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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
