[eclipse-jgit] 03/04: Refreshed patches
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Sat Jun 21 13:16:16 UTC 2014
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 3a5cb227e9f4982624ab3bfd3742be9b137166b6
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sat Jun 21 14:21:49 2014 +0200
Refreshed patches
---
debian/changelog | 2 +
debian/patches/debian-custom-build.patch | 18 +++++----
debian/patches/ftbfs-args4j-2.0.25-fix.patch | 24 ++++++++---
debian/patches/java8-compatibility.patch | 60 ----------------------------
debian/patches/series | 1 -
5 files changed, 32 insertions(+), 73 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3781532..aa6d1a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
jgit (3.4.0-1) UNRELEASED; urgency=medium
* New Upstream release.
+ * Refreshed debian-custom-build.patch and ftbfs-args4j-2.0.25-fix.patch.
+ * Removed d/patches/java8-compatibility.patch (applied upstream).
-- Jakub Adam <jakub.adam at ktknet.cz> Sat, 21 Jun 2014 14:16:30 +0200
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index de26413..182882f 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -9,13 +9,15 @@ Subject: debian-custom-build
- add org.eclipse.jgit.pgm to jgit console classpath
- don't build jgit console all-in-one executable
---
- org.eclipse.jgit.pgm/jgit.sh | 2 +-
- pom.xml | 9 +++++----
+ org.eclipse.jgit.pgm/jgit.sh | 2 +-
+ 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
--- a/org.eclipse.jgit.pgm/jgit.sh
+++ b/org.eclipse.jgit.pgm/jgit.sh
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ Darwin)
;;
esac
@@ -24,9 +26,11 @@ Subject: debian-custom-build
export CLASSPATH
java=java
+diff --git a/pom.xml b/pom.xml
+index edd2e6e..79fdb90 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -400,6 +400,7 @@
+@@ -410,6 +410,7 @@
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
</links>
@@ -34,16 +38,16 @@ Subject: debian-custom-build
</configuration>
<executions>
<execution>
-@@ -517,7 +518,7 @@
+@@ -547,7 +548,7 @@
+ </activation>
<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>
-@@ -604,11 +605,11 @@
+@@ -634,11 +635,11 @@
<module>org.eclipse.jgit.http.server</module>
<module>org.eclipse.jgit.pgm</module>
<module>org.eclipse.jgit.junit</module>
diff --git a/debian/patches/ftbfs-args4j-2.0.25-fix.patch b/debian/patches/ftbfs-args4j-2.0.25-fix.patch
index 68e3954..9078c2b 100644
--- a/debian/patches/ftbfs-args4j-2.0.25-fix.patch
+++ b/debian/patches/ftbfs-args4j-2.0.25-fix.patch
@@ -7,6 +7,7 @@ as it had no effect.
Added 'hidden' argument to OptionDef constructor.
---
+ org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java | 2 +-
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java | 10 +++++-----
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java | 2 +-
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java | 2 +-
@@ -17,8 +18,21 @@ Added 'hidden' argument to OptionDef constructor.
.../src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java | 4 ++--
.../src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java | 6 +++---
.../src/org/eclipse/jgit/pgm/opt/CmdLineParser.java | 2 +-
- 10 files changed, 17 insertions(+), 17 deletions(-)
+ 11 files changed, 18 insertions(+), 18 deletions(-)
+diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
+index 8f911fd..e424bf7 100644
+--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
++++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
+@@ -75,7 +75,7 @@
+ private String name;
+
+ @Argument(index = 1)
+- @Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = StopOptionHandler.class)
++ @Option(name = "--", metaVar = "metaVar_paths", handler = StopOptionHandler.class)
+ private List<String> paths = new ArrayList<String>();
+
+ @Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
index 04182d6..65a6c2b 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
@@ -78,10 +92,10 @@ index d89053c..90d7c06 100644
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java
-index e444d21..5249552 100644
+index 4b16ed8..4da8e09 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
private AbstractTreeIterator tree;
@Argument(index = 1)
@@ -91,7 +105,7 @@ index e444d21..5249552 100644
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
-index 847bf7f..3109544 100644
+index d6063c3..a223587 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
@@ -126,7 +126,7 @@ void enableBoundary(final boolean on) {
@@ -174,7 +188,7 @@ index 4205140..72425f1 100644
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
-index c36cc2c..f5f42c5 100644
+index 3f77aa6..595e772 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
@@ -184,7 +184,7 @@ public RevWalk getRevWalkGently() {
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
deleted file mode 100644
index 93488db..0000000
--- a/debian/patches/java8-compatibility.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Fixes the test failures with Java 8
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: http://git.eclipse.org/c/jgit/jgit.git/commit/?id=20fc10
- http://git.eclipse.org/c/jgit/jgit.git/commit/?id=bb9a48
---- a/org.eclipse.jgit.pgm.test/pom.xml
-+++ b/org.eclipse.jgit.pgm.test/pom.xml
-@@ -64,7 +64,7 @@
- <profile>
- <id>jgit.java7</id>
- <activation>
-- <jdk>1.7</jdk>
-+ <jdk>[1.7,)</jdk>
- </activation>
- <dependencies>
- <dependency>
---- a/org.eclipse.jgit.pgm/pom.xml
-+++ b/org.eclipse.jgit.pgm/pom.xml
-@@ -112,7 +112,7 @@
- <profile>
- <id>java7</id>
- <activation>
-- <jdk>1.7</jdk>
-+ <jdk>[1.7,)</jdk>
- </activation>
- <dependencies>
- <dependency>
---- a/org.eclipse.jgit.test/pom.xml
-+++ b/org.eclipse.jgit.test/pom.xml
-@@ -66,7 +66,7 @@
- <profile>
- <id>jgit.java7</id>
- <activation>
-- <jdk>1.7</jdk>
-+ <jdk>[1.7,)</jdk>
- </activation>
- <dependencies>
- <dependency>
---- a/pom.xml
-+++ b/pom.xml
-@@ -504,7 +504,7 @@
- <profile>
- <id>jgit.java6</id>
- <activation>
-- <jdk>1.6</jdk>
-+ <jdk>[1.6,)</jdk>
- </activation>
- <modules>
- <module>org.eclipse.jgit.console</module>
-@@ -513,10 +513,9 @@
- <profile>
- <id>jgit.java7</id>
- <activation>
-- <jdk>1.7</jdk>
-+ <jdk>[1.7,)</jdk>
- </activation>
- <modules>
-- <module>org.eclipse.jgit.console</module>
- <module>org.eclipse.jgit.java7</module>
- <!--module>org.eclipse.jgit.java7.test</module-->
- </modules>
diff --git a/debian/patches/series b/debian/patches/series
index 08f8f24..5beecbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ debian-custom-build.patch
ftbfs-args4j-2.0.25-fix.patch
unversioned-orbit-dependencies.patch
fix-jgit-pgm-test-dependencies.patch
-java8-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git
More information about the pkg-java-commits
mailing list