This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc.
commit c21a9923af26c444ef4b61a5c1df977a4e008178 Author: Emmanuel Bourg <[email protected]> Date: Mon Oct 21 10:50:47 2013 +0200 debian/copyright: Merged the duplicate Copyright fields --- debian/changelog | 1 + debian/copyright | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 765d6f7..a36d8e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low * debian/control: - Use canonical URLs for the Vcs-* fields - Updated Standards-Version to 3.9.4 (no changes) + * debian/copyright: Merged the duplicate Copyright fields [ Eugene Zhukov ] * add patch to remove jdk15 classifier from testng dependency from pom.xml diff --git a/debian/copyright b/debian/copyright index 3d862d0..c88a458 100644 --- a/debian/copyright +++ b/debian/copyright @@ -129,12 +129,12 @@ Files: sisu-inject/containers/guice-plexus/guice-plexus-binders/pom.xml sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/sonatype/guice/plexus/shim/PseudoPlexusContainer.java sisu-inject/containers/guice-plexus/pom.xml sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml -Copyright: Copyright (c) 2010-2011 Sonatype, Inc. +Copyright: 2010-2011, Sonatype, Inc. License: EPL Files: sisu-inject/containers/guice-plexus/guice-plexus-shim/src/test/java/org/codehaus/plexus/component/configurator/* sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/component/configurator/* -Copyright: Copyright (c) 2004, The Codehaus +Copyright: 2004, The Codehaus License: Expat Files: sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java @@ -147,8 +147,8 @@ Files: sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/c sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/component/MapOrientedComponent.java sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/PlexusTestCase.java sisu-inject/containers/guice-plexus/guice-plexus-shim/src/test/* -Copyright: Copyright 2001-2005 The Apache Software Foundation -Copyright: Copyright 2001-2006 Codehaus Foundation +Copyright: 2001-2005, The Apache Software Foundation + 2001-2006, Codehaus Foundation License: Apache-2.0 Files: sisu-inject/containers/guice-bean/guice-bean-scanners/src/main/java/org/sonatype/guice/bean/scanners/asm/* -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
