[SCM] netbeans packaging branch, master, updated. debian/7.0.1+dfsg1-4-3-g2562835

Andrew Ross ubuntu at rossfamily.co.uk
Thu Dec 22 22:39:37 UTC 2011


The following commit has been merged in the master branch:
commit 29637475d8867ab2f58a6c47edf4bd50045bcf5a
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Sun Dec 18 23:18:21 2011 +0000

    Include junit support

diff --git a/debian/linked-jars b/debian/linked-jars
index c75e721..c5ec2e8 100644
--- a/debian/linked-jars
+++ b/debian/linked-jars
@@ -48,3 +48,4 @@ $JAVADIR/cglib.jar libs.cglib/external java/modules/ext cglib-2.2.jar
 $JAVADIR/javac-api.jar libs.javacapi/external java/modules/ext javac-api-nb-7.0-b07.jar
 $JAVADIR/javac-impl.jar libs.javacimpl/external java/modules/ext javac-impl-nb-7.0-b07.jar
 $JAVA_HOME/jre/lib/rt.jar swingapp/external java/modules/ext swing-worker-1.1.jar
+$JAVADIR/junit.jar junitlib/external java/modules/ext junit-3.8.2.jar
diff --git a/debian/patches/netbeans~include-junit.patch b/debian/patches/netbeans~include-junit.patch
new file mode 100644
index 0000000..83e1c32
--- /dev/null
+++ b/debian/patches/netbeans~include-junit.patch
@@ -0,0 +1,681 @@
+Description: Upstream changes introduced in version 7.0.1+dfsg1-4
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ netbeans (7.0.1+dfsg1-4) unstable; urgency=low
+ .
+   * Patch core.osgi to use osgi-core 4.3. (Closes: #649750)
+   * Correct binary package names and install locations.
+       (Closes: #646856)
+   * Install AbsoluteLayout.jar in a separate package.
+       (Closes: #646857)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Andrew Ross <ubuntu at rossfamily.co.uk>
+Bug-Debian: http://bugs.debian.org/646856
+Bug-Debian: http://bugs.debian.org/646857
+Bug-Debian: http://bugs.debian.org/649750
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: netbeans/nbbuild/cluster.properties
+===================================================================
+--- netbeans.orig/nbbuild/cluster.properties	2011-12-18 17:43:17.000000000 +0000
++++ netbeans/nbbuild/cluster.properties	2011-12-18 17:43:17.000000000 +0000
+@@ -426,6 +426,7 @@
+         jellytools,\
+         jellytools.java,\
+         junit,\
++        junitlib,\
+         libs.cglib,\
+         libs.javacapi,\
+         libs.javacimpl,\
+@@ -867,7 +868,6 @@
+         jira,\
+         jmx,\
+         jmx.common,\
+-        junitlib,\
+         kenai,\
+         kenai.ui,\
+         libs.jira,\
+Index: netbeans/junitlib/build.xml
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/build.xml	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project basedir="." default="netbeans" name="junitlib">
++    <property name="license.file" location="../nbbuild/licenses/CPL-1.0"/>
++    <target name="-create-license.file"/>
++    <import file="../nbbuild/templates/projectized.xml"/>
++</project>
+Index: netbeans/junitlib/manifest.mf
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/manifest.mf	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,6 @@
++Manifest-Version: 1.0
++OpenIDE-Module: org.netbeans.modules.junitlib
++OpenIDE-Module-Layer: org/netbeans/modules/junitlib/layer.xml
++OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junitlib/Bundle.properties
++OpenIDE-Module-Specification-Version: 1.0
++
+Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
++<library version="1.0">
++    <name>junit</name>
++    <type>j2se</type>
++    <localizing-bundle>org.netbeans.modules.junitlib.Bundle</localizing-bundle>
++    <volume>
++        <type>classpath</type>
++        <resource>jar:nbinst://org.netbeans.modules.junitlib/modules/ext/junit-3.8.2.jar!/</resource>
++    </volume>
++    <volume>
++        <type>javadoc</type>
++        <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-3.8.2-api.zip!/</resource>
++    </volume>
++    <!-- Not currently bundled:
++    <volume>
++        <type>src</type>
++        <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-3.8.2-src.jar!/</resource>
++    </volume>
++    -->
++    <volume>
++        <!-- please check with mkleint at netbeans.org before/after updating this or "classpath" section -->
++        <type>maven-pom</type>
++        <resource>http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.pom</resource>
++    </volume>
++</library>
+Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/layer.xml
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/src/org/netbeans/modules/junitlib/layer.xml	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,14 @@
++<?xml version="1.0"?>
++<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
++<filesystem>
++    <folder name="org-netbeans-api-project-libraries">
++        <folder name="Libraries">
++            <file name="junit-3.8.2.xml" url="junit-3.8.2.xml">
++                <attr name="displayName" bundlevalue="org.netbeans.modules.junitlib.Bundle#junit"/>
++            </file>
++            <file name="junit-4.8.2.xml" url="junit-4.8.2.xml">
++                <attr name="displayName" bundlevalue="org.netbeans.modules.junitlib.Bundle#junit_4"/>
++            </file>
++        </folder>
++    </folder>
++</filesystem>
+Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,7 @@
++OpenIDE-Module-Name=JUnit
++OpenIDE-Module-Display-Category=Java SE
++OpenIDE-Module-Short-Description=Bundles the JUnit testing library.
++OpenIDE-Module-Long-Description=\
++    Includes the JUnit unit testing library and corresponding library definitions. 3.x and 4.x versions are both included.
++junit=JUnit 3.8.2
++junit_4=JUnit 4.8.2
+Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,24 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
++<library version="1.0">
++    <name>junit_4</name>
++    <type>j2se</type>
++    <localizing-bundle>org.netbeans.modules.junitlib.Bundle</localizing-bundle>
++    <volume>
++        <type>classpath</type>
++        <resource>jar:nbinst://org.netbeans.libs.junit4/modules/ext/junit-4.8.2.jar!/</resource>
++    </volume>
++    <volume>
++        <type>javadoc</type>
++        <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-4.8.2-api.zip!/</resource>
++    </volume>
++    <volume>
++        <type>src</type>
++        <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-4.8.2-src.jar!/</resource>
++    </volume>
++    <volume>
++        <!-- please check with mkleint at netbeans.org before/after updating this or "classpath" section -->
++        <type>maven-pom</type>
++        <resource>http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.pom</resource>
++    </volume>
++</library>
+Index: netbeans/junitlib/external/junit-3.8.2-license.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/external/junit-3.8.2-license.txt	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,220 @@
++Name: JUnit
++Version: 3.8.2
++License: CPL-1.0
++OSR: 1221
++Origin: http://www.junit.org/index.htm
++Description: JUnit is a regression testing framework
++Files: junit-3.8.2-api.zip, junit-3.8.2.jar
++
++THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON 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 or anyone
++acting on such Contributor's behalf. Contributions do not include 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 transfer the
++Contribution of such Contributor, if any, in source code and object code form.
++This patent license shall apply to the combination of the Contribution and the
++Program if, at the time the Contribution is added by the Contributor, such
++addition of the Contribution causes such 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 intellectual
++property rights of any other entity. Each Contributor disclaims any liability to
++Recipient for claims brought by any other entity based on infringement of
++intellectual property rights or otherwise. As a condition to exercising the
++rights and licenses granted hereunder, each Recipient hereby assumes sole
++responsibility to secure any other intellectual property rights 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
++includes the Program in a commercial product offering should do so in a manner
++which does not create potential liability for other Contributors. Therefore, if
++a Contributor includes the Program in a commercial product offering, such
++Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
++every other Contributor ("Indemnified Contributor") against any losses, damages
++and costs (collectively "Losses") arising from claims, lawsuits and other legal
++actions brought by a third party against the Indemnified Contributor to the
++extent caused by the acts or omissions of such Commercial Contributor in
++connection with its distribution of the Program in a commercial product
++offering. The obligations in this section do not apply to any claims or Losses
++relating to any actual or alleged intellectual property infringement. In order
++to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
++Contributor in writing of such claim, and b) allow the Commercial Contributor to
++control, and cooperate with the 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 warranties
++related to Product X, those performance claims and warranties are such
++Commercial Contributor's responsibility alone. Under this section, the
++Commercial Contributor would have to defend claims against the other
++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 CONDITIONS OF TITLE,
++NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
++Recipient is solely responsible for determining the appropriateness of using and
++distributing the Program and assumes all risks associated with its exercise of
++rights under this Agreement, 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 LOST
++PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 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 a Contributor with respect to
++a patent applicable to software (including a cross-claim or counterclaim in a
++lawsuit), then any patent licenses granted by that Contributor to such Recipient
++under this Agreement shall terminate as of the date such litigation is filed. In
++addition, 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 aware of
++such noncompliance. If all Recipient's rights under this Agreement terminate,
++Recipient agrees to cease use and distribution of the Program as 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 right to
++publish new versions (including revisions) of this Agreement from time to time.
++No one other than the Agreement Steward has the right to modify this Agreement.
++IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
++as the Agreement Steward to a suitable separate entity. Each new version of the
++Agreement will be given a distinguishing version number. The Program (including
++Contributions) may always be distributed subject to the version of the Agreement
++under which it was received. In addition, after a new version of the Agreement
++is published, Contributor may elect to distribute the Program (including its
++Contributions) under the new version. Except as expressly stated in Sections
++2(a) and 2(b) above, Recipient receives no rights or licenses to the
++intellectual property of any Contributor under 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 one year
++after the cause of action arose. Each party waives its rights to a jury trial in
++any resulting litigation.
+Index: netbeans/junitlib/external/junit-4.8.2-license.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/external/junit-4.8.2-license.txt	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,220 @@
++Name: JUnit
++Version: 4.8.2
++License: CPL-1.0
++OSR: 6529 
++Origin: http://www.junit.org/index.htm
++Description: JUnit is a regression testing framework
++Files: junit-4.8.2-api.zip, junit-4.8.2-src.jar
++
++THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON 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 or anyone
++acting on such Contributor's behalf. Contributions do not include 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 transfer the
++Contribution of such Contributor, if any, in source code and object code form.
++This patent license shall apply to the combination of the Contribution and the
++Program if, at the time the Contribution is added by the Contributor, such
++addition of the Contribution causes such 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 intellectual
++property rights of any other entity. Each Contributor disclaims any liability to
++Recipient for claims brought by any other entity based on infringement of
++intellectual property rights or otherwise. As a condition to exercising the
++rights and licenses granted hereunder, each Recipient hereby assumes sole
++responsibility to secure any other intellectual property rights 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
++includes the Program in a commercial product offering should do so in a manner
++which does not create potential liability for other Contributors. Therefore, if
++a Contributor includes the Program in a commercial product offering, such
++Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
++every other Contributor ("Indemnified Contributor") against any losses, damages
++and costs (collectively "Losses") arising from claims, lawsuits and other legal
++actions brought by a third party against the Indemnified Contributor to the
++extent caused by the acts or omissions of such Commercial Contributor in
++connection with its distribution of the Program in a commercial product
++offering. The obligations in this section do not apply to any claims or Losses
++relating to any actual or alleged intellectual property infringement. In order
++to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
++Contributor in writing of such claim, and b) allow the Commercial Contributor to
++control, and cooperate with the 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 warranties
++related to Product X, those performance claims and warranties are such
++Commercial Contributor's responsibility alone. Under this section, the
++Commercial Contributor would have to defend claims against the other
++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 CONDITIONS OF TITLE,
++NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
++Recipient is solely responsible for determining the appropriateness of using and
++distributing the Program and assumes all risks associated with its exercise of
++rights under this Agreement, 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 LOST
++PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 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 a Contributor with respect to
++a patent applicable to software (including a cross-claim or counterclaim in a
++lawsuit), then any patent licenses granted by that Contributor to such Recipient
++under this Agreement shall terminate as of the date such litigation is filed. In
++addition, 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 aware of
++such noncompliance. If all Recipient's rights under this Agreement terminate,
++Recipient agrees to cease use and distribution of the Program as 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 right to
++publish new versions (including revisions) of this Agreement from time to time.
++No one other than the Agreement Steward has the right to modify this Agreement.
++IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
++as the Agreement Steward to a suitable separate entity. Each new version of the
++Agreement will be given a distinguishing version number. The Program (including
++Contributions) may always be distributed subject to the version of the Agreement
++under which it was received. In addition, after a new version of the Agreement
++is published, Contributor may elect to distribute the Program (including its
++Contributions) under the new version. Except as expressly stated in Sections
++2(a) and 2(b) above, Recipient receives no rights or licenses to the
++intellectual property of any Contributor under 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 one year
++after the cause of action arose. Each party waives its rights to a jury trial in
++any resulting litigation.
+Index: netbeans/junitlib/release/modules/ext/junit-3.8.2.jar.external
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/release/modules/ext/junit-3.8.2.jar.external	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,3 @@
++CRC:857334496
++URL:m2:/junit:junit:3.8.2:jar
++URL:http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar
+Index: netbeans/junitlib/release/docs/junit-3.8.2-api.zip.external
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/release/docs/junit-3.8.2-api.zip.external	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,3 @@
++CRC:1744174913
++URL:m2:/junit:junit:3.8.2:jar:javadoc
++URL:http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2-javadoc.jar
+Index: netbeans/junitlib/release/docs/junit-4.8.2-api.zip.external
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/release/docs/junit-4.8.2-api.zip.external	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,3 @@
++CRC:1619551478
++URL:m2:/junit:junit:4.8.2:jar:javadoc
++URL:http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2-javadoc.jar
+Index: netbeans/junitlib/release/docs/junit-4.8.2-src.jar.external
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/release/docs/junit-4.8.2-src.jar.external	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,3 @@
++CRC:2702705221
++URL:m2:/junit:junit:4.8.2:jar:sources
++URL:http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2-sources.jar
+Index: netbeans/junitlib/nbproject/project.properties
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/nbproject/project.properties	2011-12-18 23:04:55.721321087 +0000
+@@ -0,0 +1,7 @@
++javac.source=1.6
++javac.compilerargs=-Xlint -Xlint:-serial
++release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar
++#release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip
++#release.external/junit-4.8.2-api.zip=docs/junit-4.8.2-api.zip
++#release.external/junit-4.8.2-src.jar=docs/junit-4.8.2-src.jar
++nbm.target.cluster=java
+Index: netbeans/junitlib/nbproject/project.xml
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ netbeans/junitlib/nbproject/project.xml	2011-12-18 17:43:17.000000000 +0000
+@@ -0,0 +1,18 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xmlns="http://www.netbeans.org/ns/project/1">
++    <type>org.netbeans.modules.apisupport.project</type>
++    <configuration>
++        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
++            <code-name-base>org.netbeans.modules.junitlib</code-name-base>
++            <module-dependencies>
++                <dependency>
++                    <code-name-base>org.netbeans.libs.junit4</code-name-base>
++                    <run-dependency>
++                        <specification-version>1.13</specification-version>
++                    </run-dependency>
++                </dependency>
++            </module-dependencies>
++            <public-packages/>
++        </data>
++    </configuration>
++</project>
diff --git a/debian/patches/series b/debian/patches/series
index 3d6427b..94b0dd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ netbeans~debugger.jpda.ui.patch
 netbeans~xsl.patch
 netbeans~db.patch
 netbeans-platform~osgi-4.3.patch
+netbeans~include-junit.patch

-- 
netbeans packaging



More information about the pkg-java-commits mailing list