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 069d2d311e2feeb2a28022d7a87dcc581db6c66f Author: Jakub Adam <[email protected]> Date: Thu Mar 6 17:44:11 2014 +0100 Removed d/patches/javaewah-compatibility.patch (applied upstream) --- debian/changelog | 1 + debian/patches/javaewah-compatibility.patch | 209 ---------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 210 deletions(-) diff --git a/debian/changelog b/debian/changelog index edb904d..d712a14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ jgit (3.3.0-1) UNRELEASED; urgency=medium * New Upstream release. + * Removed d/patches/javaewah-compatibility.patch (applied upstream). -- Jakub Adam <[email protected]> Thu, 06 Mar 2014 17:29:30 +0100 diff --git a/debian/patches/javaewah-compatibility.patch b/debian/patches/javaewah-compatibility.patch deleted file mode 100644 index ab68185..0000000 --- a/debian/patches/javaewah-compatibility.patch +++ /dev/null @@ -1,209 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Tue, 11 Jun 2013 20:54:09 +0200 -Subject: javaewah-compatibility - ---- - .../org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java | 2 +- - .../org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java | 2 +- - org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- - .../org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java | 2 +- - .../src/org/eclipse/jgit/internal/storage/file/BitSet.java | 2 +- - .../src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java | 4 ++-- - .../src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java | 6 +++--- - .../src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java | 4 ++-- - .../eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java | 2 +- - .../eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java | 4 ++-- - .../org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java | 2 +- - .../eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java | 2 +- - .../jgit/internal/storage/pack/PackWriterBitmapPreparer.java | 2 +- - 13 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java -index f4f66c8..465c61b 100644 ---- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java -+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/InflatingBitSetTest.java -@@ -46,7 +46,7 @@ - import static org.junit.Assert.assertFalse; - import static org.junit.Assert.assertTrue; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - import org.eclipse.jgit.internal.storage.file.InflatingBitSet; - import org.junit.Test; -diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java -index dc4c25e..0adf3e4 100644 ---- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java -+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/StoredBitmapTest.java -@@ -45,7 +45,7 @@ - - import static org.junit.Assert.*; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap; - import org.eclipse.jgit.lib.ObjectId; -diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF -index 034c199..2edbc19 100644 ---- a/org.eclipse.jgit/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF -@@ -49,7 +49,7 @@ Export-Package: org.eclipse.jgit.api;version="3.1.0", - Bundle-ActivationPolicy: lazy - Bundle-RequiredExecutionEnvironment: J2SE-1.5 - Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" --Import-Package: javaewah;version="[0.5.6,1.0.0)", -+Import-Package: com.googlecode.javaewah, - javax.crypto, - javax.net.ssl, - org.xml.sax, -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java -index b6214ba..3c101e6 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java -@@ -43,7 +43,7 @@ - - package org.eclipse.jgit.internal.storage.file; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - import org.eclipse.jgit.lib.AnyObjectId; - import org.eclipse.jgit.lib.ObjectIdOwnerMap; -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java -index d0ab32f..ddb5ff0 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java -@@ -45,7 +45,7 @@ - - import java.util.Arrays; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - /** - * A random access BitSet to supports efficient conversions to -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java -index 6ada2ec..0c3c736 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java -@@ -47,8 +47,8 @@ - import java.util.Iterator; - import java.util.NoSuchElementException; - --import javaewah.EWAHCompressedBitmap; --import javaewah.IntIterator; -+import com.googlecode.javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.IntIterator; - - import org.eclipse.jgit.internal.JGitText; - import org.eclipse.jgit.lib.AnyObjectId; -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java -index 7d8e124..bca89cf 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InflatingBitSet.java -@@ -43,8 +43,8 @@ - - package org.eclipse.jgit.internal.storage.file; - --import javaewah.EWAHCompressedBitmap; --import javaewah.IntIterator; -+import com.googlecode.javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.IntIterator; - - /** - * A wrapper around the EWAHCompressedBitmap optimized for the contains -@@ -164,4 +164,4 @@ final InflatingBitSet xor(EWAHCompressedBitmap other) { - final EWAHCompressedBitmap getBitmap() { - return bitmap; - } --} -\ No newline at end of file -+} -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java -index 129da22..ae4de84 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java -@@ -49,7 +49,7 @@ - import java.io.InputStream; - import java.text.MessageFormat; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - import org.eclipse.jgit.errors.CorruptObjectException; - import org.eclipse.jgit.internal.JGitText; -@@ -193,4 +193,4 @@ public abstract EWAHCompressedBitmap ofObjectType( - * pack that this index was generated from. - */ - public abstract int getObjectCount(); --} -\ No newline at end of file -+} -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java -index 5d31b18..05cd100 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java -@@ -50,7 +50,7 @@ - import java.util.List; - import java.util.NoSuchElementException; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - import org.eclipse.jgit.internal.JGitText; - import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap; -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java -index d3e1990..6b96b07 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java -@@ -47,8 +47,8 @@ - import java.util.Iterator; - import java.util.NoSuchElementException; - --import javaewah.EWAHCompressedBitmap; --import javaewah.IntIterator; -+import com.googlecode.javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.IntIterator; - - import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap; - import org.eclipse.jgit.lib.AnyObjectId; -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java -index 1d927d3..c79a5cb 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java -@@ -49,7 +49,7 @@ - import java.text.MessageFormat; - import java.util.Arrays; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - import org.eclipse.jgit.internal.JGitText; - import org.eclipse.jgit.lib.AnyObjectId; -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java -index a9a742a..8325e2e 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java -@@ -50,7 +50,7 @@ - import java.security.DigestOutputStream; - import java.text.MessageFormat; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - import org.eclipse.jgit.internal.JGitText; - import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry; -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java -index 4eabdb5..fca9063 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java -@@ -55,7 +55,7 @@ - import java.util.List; - import java.util.Set; - --import javaewah.EWAHCompressedBitmap; -+import com.googlecode.javaewah.EWAHCompressedBitmap; - - import org.eclipse.jgit.errors.IncorrectObjectTypeException; - import org.eclipse.jgit.errors.MissingObjectException; diff --git a/debian/patches/series b/debian/patches/series index d15fd49..4a2bdfe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ debian-custom-build.patch -javaewah-compatibility.patch ftbfs-args4j-2.0.25-fix.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
