[eclipse-jgit] 01/01: Enable build of org.eclipse.jgit.java7.jar

[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 f97887c33755283637c42349a73eb64d4fd7ed83
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Aug 17 16:56:49 2013 +0200

    Enable build of org.eclipse.jgit.java7.jar
---
 debian/changelog                         |    1 +
 debian/libjgit-java.classpath            |    2 +-
 debian/libjgit-java.poms                 |    1 +
 debian/patches/debian-custom-build.patch |   15 ++++++++++++---
 debian/rules                             |    1 +
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ebbbde3..3d6dabe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ jgit (3.0.0-1) UNRELEASED; urgency=low
   * Add libjavaewah-java to Build-Depends.
   * Don't install org.eclipse.jgit.junit.jar, it's used only by tests.
   * Use xz for upstream tarball compression.
+  * Enable build of org.eclipse.jgit.java7.jar.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 11 Jun 2013 19:22:57 +0200
 
diff --git a/debian/libjgit-java.classpath b/debian/libjgit-java.classpath
index 906670b..dae81d3 100644
--- a/debian/libjgit-java.classpath
+++ b/debian/libjgit-java.classpath
@@ -1,2 +1,2 @@
-usr/share/java/org.eclipse.jgit.jar jsch.jar JavaEWAH.jar
+usr/share/java/org.eclipse.jgit.jar jsch.jar JavaEWAH.jar org.eclipse.jgit.java7.jar
 usr/share/java/org.eclipse.jgit.http.server.jar org.eclipse.jgit.jar servlet-api-2.5.jar
diff --git a/debian/libjgit-java.poms b/debian/libjgit-java.poms
index c113aed..0c618e2 100644
--- a/debian/libjgit-java.poms
+++ b/debian/libjgit-java.poms
@@ -3,6 +3,7 @@ org.eclipse.jgit/pom.xml
 org.eclipse.jgit.ant/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
 org.eclipse.jgit.junit/pom.xml --ignore-pom
 org.eclipse.jgit.pgm/pom.xml --ignore-pom
 org.eclipse.jgit.ui/pom.xml --ignore-pom
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 8370e2e..43bf650 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -10,8 +10,8 @@ Subject: debian-custom-build
 - don't build jgit console all-in-one executable
 ---
  org.eclipse.jgit.pgm/jgit.sh |    2 +-
- pom.xml                      |    7 ++++---
- 2 files changed, 5 insertions(+), 4 deletions(-)
+ pom.xml                      |    9 +++++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh
 index 6b9ce40..3700d4f 100644
@@ -27,7 +27,7 @@ index 6b9ce40..3700d4f 100644
  
  java=java
 diff --git a/pom.xml b/pom.xml
-index 4c27438..aff8b24 100644
+index 4c27438..19573a6 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -371,6 +371,7 @@
@@ -38,6 +38,15 @@ index 4c27438..aff8b24 100644
          </configuration>
          <executions>
            <execution>
+@@ -476,7 +477,7 @@
+       <modules>
+         <module>org.eclipse.jgit.console</module>
+         <module>org.eclipse.jgit.java7</module>
+-        <module>org.eclipse.jgit.java7.test</module>
++        <!--module>org.eclipse.jgit.java7.test</module-->
+       </modules>
+     </profile>
+     <profile>
 @@ -503,11 +504,11 @@
      <module>org.eclipse.jgit.http.server</module>
      <module>org.eclipse.jgit.pgm</module>
diff --git a/debian/rules b/debian/rules
index f206a9b..a22cae2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ install/libjgit-java::
 	mh_installpoms -plibjgit-java
 	mh_installjar -plibjgit-java -l org.eclipse.jgit/pom.xml org.eclipse.jgit/target/org.eclipse.jgit-*-r.jar
 	mh_installjar -plibjgit-java -l org.eclipse.jgit.http.server/pom.xml org.eclipse.jgit.http.server/target/org.eclipse.jgit.http.server-*-r.jar
+	mh_installjar -plibjgit-java -l org.eclipse.jgit.java7/pom.xml org.eclipse.jgit.java7/target/org.eclipse.jgit.java7-*-r.jar
 	mh_unpatchpoms -plibjgit-java
 
 install/libjgit-ant-java::

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