[eclipse-jgit] 04/04: Enable build of new artifact org.eclipse.jgit.archive

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master
in repository eclipse-jgit.

commit a8aa84ecb60c9133608409d42e029396078043bb
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Oct 8 20:21:11 2013 +0200

    Enable build of new artifact org.eclipse.jgit.archive
---
 debian/changelog          |    1 +
 debian/control            |    1 +
 debian/jgit-cli.classpath |    2 +-
 debian/jgit-cli.poms      |    1 +
 debian/libjgit-java.poms  |    1 +
 debian/maven.rules        |    1 +
 debian/rules              |    1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d6aef27..84dea78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jgit (3.1.0-1) UNRELEASED; urgency=low
 
   * New Upstream release.
   * Refreshed d/patches/javaewah-compatibility.patch.
+  * Enable build of new artifact org.eclipse.jgit.archive.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 08 Oct 2013 19:57:23 +0200
 
diff --git a/debian/control b/debian/control
index f98f26a..5155dba 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 8~),
                libargs4j-java,
                libbuild-helper-maven-plugin-java,
                libcommons-compress-java,
+               libequinox-osgi-java,
                libhamcrest-java,
                libjavaewah-java,
                libjsch-java,
diff --git a/debian/jgit-cli.classpath b/debian/jgit-cli.classpath
index fd6e09b..cbe2bb7 100644
--- a/debian/jgit-cli.classpath
+++ b/debian/jgit-cli.classpath
@@ -1,3 +1,3 @@
 usr/share/java/org.eclipse.jgit.console.jar org.eclipse.jgit.jar jsch.jar
-usr/share/java/org.eclipse.jgit.pgm.jar org.eclipse.jgit.jar org.eclipse.jgit.ui.jar args4j.jar commons-compress.jar
+usr/share/java/org.eclipse.jgit.pgm.jar org.eclipse.jgit.jar org.eclipse.jgit.archive.jar org.eclipse.jgit.ui.jar args4j.jar commons-compress.jar
 usr/share/java/org.eclipse.jgit.ui.jar org.eclipse.jgit.jar jsch.jar
diff --git a/debian/jgit-cli.poms b/debian/jgit-cli.poms
index 53e624f..e45960e 100644
--- a/debian/jgit-cli.poms
+++ b/debian/jgit-cli.poms
@@ -1,3 +1,4 @@
+org.eclipse.jgit.archive/pom.xml
 org.eclipse.jgit.console/pom.xml
 org.eclipse.jgit.pgm/pom.xml
 org.eclipse.jgit.ui/pom.xml
diff --git a/debian/libjgit-java.poms b/debian/libjgit-java.poms
index 0c618e2..70e0d17 100644
--- a/debian/libjgit-java.poms
+++ b/debian/libjgit-java.poms
@@ -1,6 +1,7 @@
 pom.xml
 org.eclipse.jgit/pom.xml
 org.eclipse.jgit.ant/pom.xml --ignore-pom
+org.eclipse.jgit.archive/pom.xml --ignore-pom
 org.eclipse.jgit.console/pom.xml --ignore-pom
 org.eclipse.jgit.http.server/pom.xml
 org.eclipse.jgit.java7/pom.xml
diff --git a/debian/maven.rules b/debian/maven.rules
index 210139b..ae834f9 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,3 +21,4 @@ args4j args4j jar 2.0.16 * *
 junit junit jar s/4\..*/4.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
 s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
+s/org.osgi/org.eclipse.osgi/ s/org.osgi.core/org.eclipse.osgi/ jar s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 797f681..856d09b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ install/libjgit-ant-java::
 
 install/jgit-cli::
 	mh_installpoms -pjgit-cli
+	mh_installjar -pjgit-cli -l org.eclipse.jgit.archive/pom.xml org.eclipse.jgit.archive/target/org.eclipse.jgit.archive-*-r.jar
 	mh_installjar -pjgit-cli -l org.eclipse.jgit.console/pom.xml org.eclipse.jgit.console/target/org.eclipse.jgit.console-*-r.jar
 	mh_installjar -pjgit-cli -l org.eclipse.jgit.pgm/pom.xml org.eclipse.jgit.pgm/target/org.eclipse.jgit.pgm-*-r.jar
 	mh_installjar -pjgit-cli -l org.eclipse.jgit.ui/pom.xml org.eclipse.jgit.ui/target/org.eclipse.jgit.ui-*-r.jar

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