[SCM] eclipse-emf - Plug-in for eclipse - Debian package. branch, master, updated. 55b774929fee10105e6591f9948ef132b91cd2df

Benjamin Drung bdrung-guest at alioth.debian.org
Thu Jun 10 09:39:05 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-emf - Plug-in for eclipse - Debian package.".

The branch, master has been updated
       via  55b774929fee10105e6591f9948ef132b91cd2df (commit)
       via  83ba5c391c916d9aa487af9a36bfd4d98efe78e2 (commit)
       via  20cd31a28ad63ff45dd512614e839f2c0f67a0ff (commit)
       via  c932e4b7b0c5eaa40dba1032b8ffc0431497306f (commit)
      from  10500d023dde31722325fd924ed896a00d2d8dd8 (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 55b774929fee10105e6591f9948ef132b91cd2df
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 10 11:38:49 2010 +0200

    Cosmetic change.

commit 83ba5c391c916d9aa487af9a36bfd4d98efe78e2
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 10 11:37:42 2010 +0200

    Cosmetic change.

commit 20cd31a28ad63ff45dd512614e839f2c0f67a0ff
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 10 11:28:11 2010 +0200

    Update debian/copyright.

commit c932e4b7b0c5eaa40dba1032b8ffc0431497306f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 10 11:22:28 2010 +0200

    Update eclipse version.

-----------------------------------------------------------------------

Summary of changes:
 debian/control                |    4 +-
 debian/copyright              |  132 ++++++++++++++++++++---------------------
 debian/eclipse-xsd.eh-install |    1 -
 debian/rules                  |    8 +-
 4 files changed, 71 insertions(+), 74 deletions(-)

diff --git a/debian/control b/debian/control
index c697c2b..28346c7 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Homepage: http://www.eclipse.org/emf
 Package: eclipse-emf
 Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
-         eclipse-platform (>= 3.5.0),
+         eclipse-platform (>= 3.5.2),
          ${misc:Depends}
 Description: Eclipse Modeling Framework (EMF)
  The Eclipse Modeling Framework (EMF) allows developers to build tools and
@@ -45,7 +45,7 @@ Package: eclipse-emf-sdk
 Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
          eclipse-emf (= ${source:Version}),
-         eclipse-pde (>= 3.5.1),
+         eclipse-pde (>= 3.5.2),
          ${misc:Depends}
 Description: Eclipse Modeling Framework (EMF) - (Source/Documentation)
  The Eclipse Modeling Framework (EMF) allows developers to build tools and
diff --git a/debian/copyright b/debian/copyright
index 11cc6c4..9efcb01 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Copyright: 1999-2004, Apache Software Foundation
 License: EPL-1.0
 
 Files: debian/*
-Copyright: 2010, Debian Orbital Alignment Team
+Copyright: 2010, Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.debian.org>
 License: EPL-1.0
 
 Files: debian/patches/Fedora-*.patch
@@ -22,22 +22,21 @@ Files: debian/patches/Fedora-*.patch
 Copyright: 2009, Mat Booth <fedora at matbooth.co.uk>
            2009, Alexander Kurtakov <akurtako at redhat.com>
 License: Fedora-contribution
- 
  The file was downloaded from Fedora's CVS repository; all committers
  are required to sign a license agreement with Fedora, which puts
  contributions without a license under the license included below.
- 
+ .
  At the time Debian acquired these files, the "default" Fedora license
  was:
- 
+ .
  The Fedora Project Individual Contributor License Agreement
- 
+ .
  The Fedora Project
- 
+ .
  Individual Contributor License Agreement (CLA)
- 
+ .
  http://fedoraproject.org/wiki/Legal/Licenses/CLA
- 
+ .
  Thank you for your interest in The Fedora Project (the "Project"). In
  order to clarify the intellectual property license granted with
  Contributions from any person or entity, Red Hat, Inc. ("Red Hat"),
@@ -47,12 +46,12 @@ License: Fedora-contribution
  Your protection as a Contributor as well as the protection of the
  Project and its users; it does not change your rights to use your own
  Contributions for any other purpose.
- 
+ .
  You and the Project hereby accept and agree to the following terms
  and conditions:
- 
+ .
  * 1. Contributors and Contributions.
- 
+ .
    * A. The Project and any individual or legal entity that
      voluntarily submits to the Project a Contribution are
      collectively addressed herein as "Contributors". For legal
@@ -64,14 +63,14 @@ License: Fedora-contribution
      entity, whether by contract or otherwise, or (ii) ownership of
      fifty percent (50%) or more of the outstanding shares, or (iii)
      beneficial ownership of such entity.
- 
+ .
    * B. A "Contribution" is any original work, including any
      modification or addition to an existing work, that has been
      submitted for inclusion in, or documentation of, any of the
      products owned or managed by the Project, where such work
      originates from that particular Contributor or from some entity
      acting on behalf of that Contributor.
- 
+ .
    * C. A Contribution is "submitted" when any form of electronic,
      verbal, or written communication is sent to the Project,
      including but not limited to communication on electronic mailing
@@ -81,22 +80,22 @@ License: Fedora-contribution
      Project, but excluding communication that is conspicuously marked
      or otherwise designated in writing by you as "Not a
      Contribution."
- 
+ .
    * D. Any Contribution submitted by you to the Project shall be
      under the terms and conditions of this License, without any
      additional terms or conditions, unless you explicitly state
      otherwise in the submission.
- 
+ .
  * 2. Contributor Grant of License. You hereby grant to Red Hat, Inc.,
    on behalf of the Project, and to recipients of software distributed
    by the Project:
- 
+ .
    * (a) a perpetual, non-exclusive, worldwide, fully paid-up, royalty
      free, irrevocable copyright license to reproduce, prepare
      derivative works of, publicly display, publicly perform,
      sublicense, and distribute your Contribution and such derivative
      works; and,
- 
+ .
    * (b) a perpetual, non-exclusive, worldwide, fully paid-up, royalty
      free, irrevocable (subject to Section 3) patent license to make,
      have made, use, offer to sell, sell, import, and otherwise
@@ -107,14 +106,14 @@ License: Fedora-contribution
      submitted the Contribution.  Except for the license granted in
      this section, you reserve all right, title and interest in and to
      your Contributions.
- 
+ .
  * 3. Reciprocity. As of the date any such litigation is filed, your
    patent grant shall immediately terminate with respect to any party
    that institutes patent litigation against you (including a
    cross-claim or counterclaim in a lawsuit) alleging that your
    Contribution, or the work to which you have contributed,
    constitutes direct or contributory patent infringement.
- 
+ .
  * 4. You represent that you are legally entitled to grant the above
    license. If your employer(s) has rights to intellectual property
    that you create that includes your Contributions, you represent
@@ -122,7 +121,7 @@ License: Fedora-contribution
    of that employer, that your employer has waived such rights for
    your Contributions to the Project, or that your employer has
    executed a separate Corporate CLA with the Project.
- 
+ .
  * 5. You represent that each of your Contributions is your original
    creation (see section 7 for submissions on behalf of others). You
    represent that your Contribution submission(s) include complete
@@ -130,7 +129,7 @@ License: Fedora-contribution
    but not limited to, related copyright, patents and trademarks) of
    which you are personally aware and which are associated with any
    part of your Contribution.
- 
+ .
  * 6. You are not expected to provide support for your Contributions,
    except to the extent you desire to provide support. You may provide
    support for free, for a fee, or not at all. Your Contributions are
@@ -138,7 +137,7 @@ License: Fedora-contribution
    ANY KIND, either express or implied, including, without limitation,
    any warranties or conditions of NON-INFRINGEMENT, MERCHANTABILITY,
    or FITNESS FOR A PARTICULAR PURPOSE.
- 
+ .
  * 7. Should you wish to submit work that is not your original
    creation, you may submit it to the Project separately from any
    Contribution, identifying the complete details of its source and of
@@ -146,34 +145,33 @@ License: Fedora-contribution
    related patents, trademarks, and license agreements) of which you
    are personally aware, and conspicuously marking the work as
    "Submitted on behalf of a third-party: [named here] ".
- 
+ .
  * 8. You agree to notify the Project of any facts or circumstances of
    which you become aware that would make these representations
    inaccurate in any respect.
- 
+ .
  * 9. The Project is under no obligations to accept and include every
    contribution..
- 
 
 License: EPL-1.0
  Eclipse Public License - v 1.0
- 
+ .
  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE
  PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- 
+ .
  1. DEFINITIONS
- 
+ .
  "Contribution" means:
- 
+ .
  a) in the case of the initial Contributor, the initial code and documentation
  distributed under this Agreement, and
  b) in the case of each subsequent Contributor:
- 
+ .
  i) changes to the Program, and
- 
+ .
  ii) additions to the Program;
- 
+ .
  where such changes and/or additions to the Program originate from and are
  distributed by that particular Contributor. A Contribution 'originates'
  from a Contributor if it was added to the Program by such Contributor itself
@@ -181,27 +179,27 @@ License: EPL-1.0
  additions to the Program which: (i) are separate modules of software
  distributed in conjunction with the Program under their own license
  agreement, and (ii) are not derivative works of the Program.
- 
+ .
  "Contributor" means any person or entity that distributes the Program.
- 
+ .
  "Licensed Patents " mean patent claims licensable by a Contributor which are
  necessarily infringed by the use or sale of its Contribution alone or when
  combined with the Program.
- 
+ .
  "Program" means the Contributions distributed in accordance with this
  Agreement.
- 
+ .
  "Recipient" means anyone who receives the Program under this Agreement,
  including all Contributors.
- 
+ .
  2. GRANT OF RIGHTS
- 
+ .
  a) Subject to the terms of this Agreement, each Contributor hereby grants
  Recipient a non-exclusive, worldwide, royalty-free copyright license to
  reproduce, prepare derivative works of, publicly display, publicly perform,
  distribute and sublicense the Contribution of such Contributor, if any,
  and such derivative works, in source code and object code form.
- 
+ .
  b) Subject to the terms of this Agreement, each Contributor hereby grants
  Recipient a non-exclusive, worldwide, royalty-free patent license under
  Licensed Patents to make, use, sell, offer to sell, import and otherwise
@@ -212,7 +210,7 @@ License: EPL-1.0
  combination to be covered by the Licensed Patents. The patent license shall
  not apply to any other combinations which include the Contribution. No
  hardware per se is licensed hereunder.
- 
+ .
  c) Recipient understands that although each Contributor grants the licenses
  to its Contributions set forth herein, no assurances are provided by any
  Contributor that the Program does not infringe the patent or other
@@ -224,51 +222,51 @@ License: EPL-1.0
  needed, if any. For example, if a third party patent license is required to
  allow Recipient to distribute the Program, it is Recipient's responsibility
  to acquire that license before distributing the Program.
- 
+ .
  d) Each Contributor represents that to its knowledge it has sufficient
  copyright rights in its Contribution, if any, to grant the copyright license
  set forth in this Agreement.
- 
+ .
  3. REQUIREMENTS
- 
+ .
  A Contributor may choose to distribute the Program in object code form under
  its own license agreement, provided that:
- 
+ .
  a) it complies with the terms and conditions of this Agreement; and
- 
+ .
  b) its license agreement:
- 
+ .
  i) effectively disclaims on behalf of all Contributors all warranties and
  conditions, express and implied, including warranties or conditions of title
  and non-infringement, and implied warranties or conditions of merchantability
  and fitness for a particular purpose;
- 
+ .
  ii) effectively excludes on behalf of all Contributors all liability for
  damages, including direct, indirect, special, incidental and consequential
  damages, such as lost profits;
- 
+ .
  iii) states that any provisions which differ from this Agreement are offered
  by that Contributor alone and not by any other party; and
- 
+ .
  iv) states that source code for the Program is available from such
  Contributor, and informs licensees how to obtain it in a reasonable manner on
  or through a medium customarily used for software exchange.
- 
+ .
  When the Program is made available in source code form:
- 
+ .
  a) it must be made available under this Agreement; and
- 
+ .
  b) a copy of this Agreement must be included with each copy of the Program.
- 
+ .
  Contributors may not remove or alter any copyright notices contained within
  the Program.
- 
+ .
  Each Contributor must identify itself as the originator of its Contribution,
  if any, in a manner that reasonably allows subsequent Recipients to identify
  the originator of the Contribution.
- 
+ .
  4. COMMERCIAL DISTRIBUTION
- 
+ .
  Commercial distributors of software may accept certain responsibilities with
  respect to end users, business partners and the like. While this license is
  intended to facilitate the commercial use of the Program, the Contributor who
@@ -289,7 +287,7 @@ License: EPL-1.0
  Commercial Contributor in, the defense and any related settlement
  negotiations. The Indemnified Contributor may participate in any such claim
  at its own expense.
- 
+ .
  For example, a Contributor might include the Program in a commercial product
  offering, Product X. That Contributor is then a Commercial Contributor. If
  that Commercial Contributor then makes performance claims, or offers
@@ -299,9 +297,9 @@ License: EPL-1.0
  Contributors related to those performance claims and warranties, and if a
  court requires any other Contributor to pay any damages as a result, the
  Commercial Contributor must pay those damages.
- 
+ .
  5. NO WARRANTY
- 
+ .
  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
  AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
  EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
@@ -312,9 +310,9 @@ License: EPL-1.0
  including but not limited to the risks and costs of program errors,
  compliance with applicable laws, damage to or loss of data, programs or
  equipment, and unavailability or interruption of operations.
- 
+ .
  6. DISCLAIMER OF LIABILITY
- 
+ .
  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
  CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
@@ -323,21 +321,21 @@ License: EPL-1.0
  ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
  EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGES.
- 
+ .
  7. GENERAL
- 
+ .
  If any provision of this Agreement is invalid or unenforceable under
  applicable law, it shall not affect the validity or enforceability of the
  remainder of the terms of this Agreement, and without further action by
  the parties hereto, such provision shall be reformed to the minimum extent
  necessary to make such provision valid and enforceable.
- 
+ .
  If Recipient institutes patent litigation against any entity (including a
  cross-claim or counterclaim in a lawsuit) alleging that the Program itself
  (excluding combinations of the Program with other software or hardware)
  infringes such Recipient's patent(s), then such Recipient's rights granted
  under Section 2(b) shall terminate as of the date such litigation is filed.
- 
+ .
  All Recipient's rights under this Agreement shall terminate if it fails to
  comply with any of the material terms or conditions of this Agreement and
  does not cure such failure in a reasonable period of time after becoming
@@ -346,7 +344,7 @@ License: EPL-1.0
  soon as reasonably practicable. However, Recipient's obligations under this
  Agreement and any licenses granted by Recipient relating to the Program
  shall continue and survive.
- 
+ .
  Everyone is permitted to copy and distribute copies of this Agreement, but
  in order to avoid inconsistency the Agreement is copyrighted and may only
  be modified in the following manner. The Agreement Steward reserves the
@@ -365,7 +363,7 @@ License: EPL-1.0
  this Agreement, whether expressly, by implication, estoppel or otherwise.
  All rights in the Program not expressly granted under this Agreement are
  reserved.
- 
+ .
  This Agreement is governed by the laws of the State of New York and the
  intellectual property laws of the United States of America. No party to
  this Agreement will bring a legal action under this Agreement more than
diff --git a/debian/eclipse-xsd.eh-install b/debian/eclipse-xsd.eh-install
index a2d1b60..db35198 100644
--- a/debian/eclipse-xsd.eh-install
+++ b/debian/eclipse-xsd.eh-install
@@ -1,4 +1,3 @@
 org.eclipse.xsd
 org.eclipse.xsd.e*
 org.eclipse.xsd.m*
-
diff --git a/debian/rules b/debian/rules
index 7ea7bd7..902e2fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_jh_compilefeatures:
 override_jh_installeclipse:
 	jh_installeclipse
 	# Avoid duplications (sdk depend on the non-sdk packages)
-	(cd debian/eclipse-emf-sdk/$(DROPINS)/emf-sdk/eclipse/features && ls $(CURDIR)/debian/eclipse-emf/$(DROPINS)/emf/eclipse/features | xargs rm -rf)
-	(cd debian/eclipse-emf-sdk/$(DROPINS)/emf-sdk/eclipse/plugins  && ls $(CURDIR)/debian/eclipse-emf/$(DROPINS)/emf/eclipse/plugins  | xargs rm -rf)
-	(cd debian/eclipse-xsd-sdk/$(DROPINS)/xsd-sdk/eclipse/features && ls $(CURDIR)/debian/eclipse-xsd/$(DROPINS)/xsd/eclipse/features | xargs rm -rf)
-	(cd debian/eclipse-xsd-sdk/$(DROPINS)/xsd-sdk/eclipse/plugins  && ls $(CURDIR)/debian/eclipse-xsd/$(DROPINS)/xsd/eclipse/plugins  | xargs rm -rf)
+	cd debian/eclipse-emf-sdk/$(DROPINS)/emf-sdk/eclipse/features && ls $(CURDIR)/debian/eclipse-emf/$(DROPINS)/emf/eclipse/features | xargs rm -rf
+	cd debian/eclipse-emf-sdk/$(DROPINS)/emf-sdk/eclipse/plugins  && ls $(CURDIR)/debian/eclipse-emf/$(DROPINS)/emf/eclipse/plugins  | xargs rm -rf
+	cd debian/eclipse-xsd-sdk/$(DROPINS)/xsd-sdk/eclipse/features && ls $(CURDIR)/debian/eclipse-xsd/$(DROPINS)/xsd/eclipse/features | xargs rm -rf
+	cd debian/eclipse-xsd-sdk/$(DROPINS)/xsd-sdk/eclipse/plugins  && ls $(CURDIR)/debian/eclipse-xsd/$(DROPINS)/xsd/eclipse/plugins  | xargs rm -rf


hooks/post-receive
-- 
eclipse-emf - Plug-in for eclipse - Debian package.



More information about the pkg-java-commits mailing list