[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-137-g2d8e382
Niels Thykier
nthykier-guest at alioth.debian.org
Mon Jul 12 09:03:53 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master-3.6 has been updated
via 2d8e3824804aebc9858aadb99e6bdeae1470c478 (commit)
from ace84086f72747ac83cb11e2e34c26870addc420 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2d8e3824804aebc9858aadb99e6bdeae1470c478
Author: Niels Thykier <niels at thykier.net>
Date: Mon Jul 12 11:03:49 2010 +0200
Updated d/copyright.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/copyright | 80 +++++++++++++++++++++++++++++++++++-
debian/extra/copyright-gen.pl | 41 +++++++++++++++++-
debian/extra/generate-copyright.sh | 6 +++
4 files changed, 124 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 169566d..52408e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ eclipse (3.6.0-1) UNRELEASED; urgency=low
[ Niels Thykier ]
* Removed Adrian Perez, thanks for your support.
+ * Updated d/copyright.
-- Benjamin Drung <bdrung at ubuntu.com> Mon, 12 Jul 2010 01:41:36 +0200
diff --git a/debian/copyright b/debian/copyright
index ef6d18d..0cc7581 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,7 +46,7 @@ Copyright: 2008-2009, Adobe Systems, Inc. and others
2008-2009, Heiko Seeberger and others
1999-2010, IBM Corporation
2000-2007, IBM Corporation, BEA Systems, Inc., and others
- 2000-2009, IBM and others.
+ 2000-2010, IBM and others.
2007, IBM, Composent Inc. and others
2006, IBM, Inc and Composent, Inc
2005-2010, Intel Corporation and others
@@ -97,6 +97,78 @@ Copyright: 2008-2009, Adobe Systems, Inc. and others
2009, eXXcellent solutions gmbh, EclipseSource Corporation
License: EPL-1.0
+Files: "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_custom.c",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_custom.h",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.h",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Platform.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/*",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkColor.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkDragContext.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEvent.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventScroll.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventVisibility.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGeometry.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkImage.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkRectangle.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkVisual.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkAdjustment.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkAllocation.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkBorder.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCombo.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkFileSelection.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkFixed.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkRequisition.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkSelectionData.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetPair.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttrColor.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttrInt.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLogAttr.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoRectangle.java",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/*",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/library/*",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/*",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/*",
+ "eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/*"
+Copyright: 2000-2010, IBM Corporation and others
+License: LGPL-2.1
+
Files: eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/bin/*,
eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/*,
eclipse/plugins/org.eclipse.equinox.ds/src/org/apache/*,
@@ -289,6 +361,12 @@ Files: debian/*
Copyright: 2010, Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.debian.org>
License: EPL-1.0
+License: LGPL-2.1
+ On Debian systems, the full text of the GNU
+ Lesser General Public License (LGPL) version
+ 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
License: Apache-2.0
On Debian systems, the full text of the Apache
License version 2 can be found in the file
diff --git a/debian/extra/copyright-gen.pl b/debian/extra/copyright-gen.pl
index 635126c..6b99e0f 100755
--- a/debian/extra/copyright-gen.pl
+++ b/debian/extra/copyright-gen.pl
@@ -3,6 +3,10 @@
use strict;
use warnings;
+my $licpatterns = {
+ 'LGPL-2.1' => qr/GNU Lesser General Public License \(LGPL\) Version 2.1/o,
+ 'EPL-1.0' => qr/Eclipse Public License v1.0/o,
+};
my $assumed = "EPL-1.0";
my $dcp = 'IBM\s+Corporation\s*,?\s*and\s+others?';
my $curFile = '';
@@ -22,15 +26,25 @@ my $at = '@';
open(CP, "licensecheck -r --copyright * | ") or choke("Cannot run licensecheck: $!");
while(my $line = <CP>){
+ my ($file, $license);
chomp($line);
next if($line eq '');
- $line =~ s/UNKNOWN/$assumed/og;
+ if($line =~ m/UNKNOWN/o){
+ ($file, undef) = split(/:\s*+/o, $line, 2);
+ $license = read_license($file);
+ if(!defined($license)){
+ print STDERR "I: Cannot find the license of $file, assuming $assumed\n" unless($file =~ m@^debian/@o or $file =~ m/templates/o);
+ $license = $assumed;
+ }
+ } else {
+ ($file, $license) = split(/:\s*+/o, $line);
+ $license =~ s/\s+$//o;
+ }
if($line !~ m/\*No copyright\*/){
my $cpline = <CP>;
- my ($file, $license) = split(/:\s*+/o, $line);
my @cps = ();
- $license =~ s/\s+$//o;
+
next if($license =~ m/GENERATED FILE/o);
next if($file =~ m@^debian/@o or $file =~ m at eclipse/plugins/org.eclipse.jdt.apt.core/src/com/sun/mirror/@o);
if($file =~m at eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/@){
@@ -213,6 +227,27 @@ close(CP);
exit(0);
+sub read_license{
+ my $file = shift;
+ my $i = 0;
+ my $limit = 15;
+ my $l = undef;
+ open(my $fd, "<", $file) or die("$file: $!");
+ READ: while( my $line = <$fd> ){
+ chomp($line);
+ while ( my ($lic, $pat) = each(%$licpatterns) ){
+ if($line =~ $pat){
+ $l = $lic;
+ last READ;
+ }
+ }
+ $i++;
+ last READ if($i >= $limit)
+ }
+ close($fd);
+ return $l;
+}
+
sub choke{
my $msg = shift;
print STDERR "$msg\n";
diff --git a/debian/extra/generate-copyright.sh b/debian/extra/generate-copyright.sh
index 07b1ae6..90ffd4b 100755
--- a/debian/extra/generate-copyright.sh
+++ b/debian/extra/generate-copyright.sh
@@ -14,6 +14,12 @@ EOF
perl debian/extra/copyright-gen.pl >> debian/copyright
cat <<EOF >> debian/copyright
+License: LGPL-2.1
+ On Debian systems, the full text of the GNU
+ Lesser General Public License (LGPL) version
+ 2.1 can be found in the file
+ \`/usr/share/common-licenses/LGPL-2.1'.
+
License: Apache-2.0
On Debian systems, the full text of the Apache
License version 2 can be found in the file
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list