[sisu-inject] 01/02: Initial packaging

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Oct 2 07:20:26 UTC 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository sisu-inject.

commit e10e354ec21dae5ab9c783364a06f34d938f365d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 2 09:15:16 2014 +0200

    Initial packaging
---
 debian/README.source                             |   9 +
 debian/changelog                                 |   5 +
 debian/compat                                    |   1 +
 debian/control                                   |  31 +++
 debian/copyright                                 | 258 +++++++++++++++++++++++
 debian/libsisu-inject-java.poms                  |  32 +++
 debian/maven.cleanIgnoreRules                    |   1 +
 debian/maven.ignoreRules                         |  11 +
 debian/maven.properties                          |   4 +
 debian/maven.publishedRules                      |   1 +
 debian/maven.rules                               |   9 +
 debian/orig-tar.sh                               |  11 +
 debian/patches/01-drop-maven3-prereq.patch       |  16 ++
 debian/patches/02-change-packaging-type.patch    |  25 +++
 debian/patches/03-add-missing-dependencies.patch |  41 ++++
 debian/patches/04-fix-compatibility.patch        |  16 ++
 debian/patches/series                            |   5 +
 debian/rules                                     |   9 +
 debian/source/format                             |   1 +
 debian/watch                                     |   2 +
 20 files changed, 488 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..c12e63d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about sisu-inject
+-----------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..cb8f56d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+sisu-inject (0.0.0.M5-1) unstable; urgency=medium
+
+  * Initial release (Closes: #763704)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 01 Oct 2014 19:28:09 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..c3c9bca
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,31 @@
+Source: sisu-inject
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: cdbs,
+               debhelper (>= 9),
+               default-jdk,
+               libbuild-helper-maven-plugin-java,
+               libcdi-api-java,
+               libfelix-framework-java,
+               libguice-java,
+               liblogback-java,
+               libosgi-core-java,
+               libslf4j-java,
+               maven-debian-helper (>= 1.5),
+               testng
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/sisu-inject.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sisu-inject.git
+Homepage: http://www.eclipse.org/sisu/
+
+Package: libsisu-inject-java
+Architecture: all
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: ${maven:OptionalDepends}
+Description: Dependency Injection container for Java
+ Sisu is a modular JSR330-based container that supports classpath scanning,
+ auto-binding, and dynamic auto-wiring. Sisu uses Google-Guice to perform
+ dependency injection and provide the core JSR330 support, but removes the
+ need to write explicit bindings in Guice modules.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..b9ade31
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,258 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Sisu Inject
+Source: http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git
+
+Files: *
+Copyright: 2010-2013 Sonatype, Inc.
+License: EPL-1.0
+
+Files: org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/*
+Copyright: 2000-2011, INRIA, France Telecom
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Files: debian/*
+Copyright: 2014, Emmanuel Bourg <ebourg at apache.org>
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
+
+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
+ 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 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. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation 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.
diff --git a/debian/libsisu-inject-java.poms b/debian/libsisu-inject-java.poms
new file mode 100644
index 0000000..0beb822
--- /dev/null
+++ b/debian/libsisu-inject-java.poms
@@ -0,0 +1,32 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version
+org.eclipse.sisu.inject/pom.xml --has-package-version --java-lib --usj-name=sisu-inject
+org.eclipse.sisu.inject.extender/pom.xml --ignore
+org.eclipse.sisu.inject.tests/pom.xml --ignore
+org.eclipse.sisu.inject.site/pom.xml --ignore
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..a310a64
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,11 @@
+
+org.eclipse.sisu org.eclipse.sisu.inject.site eclipse-repository * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
+org.eclipse.tycho target-platform-configuration * * * *
+org.eclipse.tycho tycho-maven-plugin * * * *
+org.eclipse.tycho tycho-source-plugin * * * *
+org.jacoco jacoco-maven-plugin * * * *
+org.sonatype.plugins nexus-staging-maven-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..7c29bd7
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..c291623
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,9 @@
+
+junit junit jar s/4\..*/4.x/ * *
+org.eclipse.sisu org.eclipse.sisu.inject eclipse-plugin s/.*/debian/ * *
+org.eclipse.sisu org.eclipse.sisu.inject.extender eclipse-plugin s/.*/debian/ * *
+org.eclipse.sisu org.eclipse.sisu.inject.tests jar s/.*/debian/ * *
+org.eclipse.sisu sisu-inject pom s/.*/debian/ * *
+org.testng testng jar s/6\..*/6.x/ * *
+s/org.apache.felix/org.osgi/ org.osgi.core * * * *
+org.testng testng * s/.*/6.x/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..b607ff8
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+VERSION=$2
+TAR=../sisu-inject_$VERSION.orig.tar.xz
+DIR=sisu-inject-$VERSION.orig
+
+mkdir $DIR
+tar -xf $3 --strip 2 -C $DIR
+rm $3
+
+XZ_OPT=--best tar -cJvf $TAR --exclude '.gitignore' --exclude 'doclava-style' --exclude 'leftovers' --exclude 'bin' $DIR
+rm -Rf $DIR
diff --git a/debian/patches/01-drop-maven3-prereq.patch b/debian/patches/01-drop-maven3-prereq.patch
new file mode 100644
index 0000000..3230861
--- /dev/null
+++ b/debian/patches/01-drop-maven3-prereq.patch
@@ -0,0 +1,16 @@
+Description: Remove the prerequisite on Maven 3 to be able to build with Maven 2
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -58,10 +58,6 @@
+     </mailingList>
+   </mailingLists>
+ 
+-  <prerequisites>
+-    <maven>3.0</maven>
+-  </prerequisites>
+-
+   <modules>
+     <module>org.eclipse.sisu.inject</module>
+     <module>org.eclipse.sisu.inject.extender</module>
diff --git a/debian/patches/02-change-packaging-type.patch b/debian/patches/02-change-packaging-type.patch
new file mode 100644
index 0000000..a65c525
--- /dev/null
+++ b/debian/patches/02-change-packaging-type.patch
@@ -0,0 +1,25 @@
+Description: Change the type of Maven packaging from eclipse-plugin to jar
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/org.eclipse.sisu.inject.extender/pom.xml
++++ b/org.eclipse.sisu.inject.extender/pom.xml
+@@ -21,7 +21,7 @@
+   </parent>
+ 
+   <artifactId>org.eclipse.sisu.inject.extender</artifactId>
+-  <packaging>eclipse-plugin</packaging>
++  <packaging>jar</packaging>
+ 
+   <build>
+     <sourceDirectory>src</sourceDirectory>
+--- a/org.eclipse.sisu.inject/pom.xml
++++ b/org.eclipse.sisu.inject/pom.xml
+@@ -21,7 +21,7 @@
+   </parent>
+ 
+   <artifactId>org.eclipse.sisu.inject</artifactId>
+-  <packaging>eclipse-plugin</packaging>
++  <packaging>jar</packaging>
+ 
+   <!--
+    | Minimum requirements
diff --git a/debian/patches/03-add-missing-dependencies.patch b/debian/patches/03-add-missing-dependencies.patch
new file mode 100644
index 0000000..411d632
--- /dev/null
+++ b/debian/patches/03-add-missing-dependencies.patch
@@ -0,0 +1,41 @@
+Description: Add the missing dependencies to build the main module (where are they inherited from normally?)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/org.eclipse.sisu.inject/pom.xml
++++ b/org.eclipse.sisu.inject/pom.xml
+@@ -32,6 +32,35 @@
+       <artifactId>guice</artifactId>
+       <version>3.0</version>
+     </dependency>
++    <dependency>
++      <groupId>javax.enterprise</groupId>
++      <artifactId>cdi-api</artifactId>
++      <version>1.0</version>
++      <scope>provided</scope>
++    </dependency>
++    <dependency>
++      <groupId>org.osgi</groupId>
++      <artifactId>org.osgi.core</artifactId>
++      <version>4.2.0</version>
++      <scope>provided</scope>
++    </dependency>
++    <dependency>
++      <groupId>org.slf4j</groupId>
++      <artifactId>slf4j-api</artifactId>
++      <version>1.7.7</version>
++    </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.11</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.testng</groupId>
++      <artifactId>testng</artifactId>
++      <version>6.8.8</version>
++      <optional>true</optional>
++    </dependency>
+   </dependencies>
+ 
+   <build>
diff --git a/debian/patches/04-fix-compatibility.patch b/debian/patches/04-fix-compatibility.patch
new file mode 100644
index 0000000..59ebff8
--- /dev/null
+++ b/debian/patches/04-fix-compatibility.patch
@@ -0,0 +1,16 @@
+Description: Fix a type cast error probably caused by a mislaligned dependency (guice?)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/InjectorPublisher.java
++++ b/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/InjectorPublisher.java
+@@ -137,8 +137,9 @@
+     private void publishBindings( final TypeLiteral searchType, final BindingSubscriber subscriber,
+                                   final TypeLiteral superType )
+     {
+-        for ( final Binding binding : injector.<Object> findBindingsByType( searchType ) )
++        for ( final Object obj : injector.<Object> findBindingsByType( searchType ) )
+         {
++            Binding binding = (Binding) obj;
+             if ( isVisible( binding ) && ( null == superType || isAssignableFrom( superType, binding ) ) )
+             {
+                 subscriber.add( binding, function.rank( binding ) );
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4908309
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01-drop-maven3-prereq.patch
+
+02-change-packaging-type.patch
+03-add-missing-dependencies.patch
+04-fix-compatibility.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..261ec16
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+get-orig-source:
+	uscan --download-current-version --force-download --rename
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..541fd3f
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/refs/ .*/(?:milestones|releases)/(.*).tar.gz debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-inject.git



More information about the pkg-java-commits mailing list