[SCM] UNNAMED PROJECT branch, master, updated. debian/2.3.1-2-5-gd050ebd
Jakub Adam
jakub.adam at ktknet.cz
Mon Jun 24 16:32:41 UTC 2013
The following commit has been merged in the master branch:
commit 6ff31890233b72f508b5dfeab300c47508f975e4
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Tue Jun 11 20:50:43 2013 +0200
Add libjavaewah-java to Build-Depends
diff --git a/debian/changelog b/debian/changelog
index f2ce1fa..998c56b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jgit (3.0.0-1) UNRELEASED; urgency=low
* New Upstream release.
* Use maven.ignoreRules to remove unnecessary maven plugins.
+ * Add libjavaewah-java to Build-Depends.
-- Jakub Adam <jakub.adam at ktknet.cz> Tue, 11 Jun 2013 19:22:57 +0200
diff --git a/debian/control b/debian/control
index 065a853..f98f26a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 8~),
libbuild-helper-maven-plugin-java,
libcommons-compress-java,
libhamcrest-java,
+ libjavaewah-java,
libjsch-java,
libmaven-antrun-plugin-java,
libmaven-javadoc-plugin-java,
diff --git a/debian/libjgit-java.classpath b/debian/libjgit-java.classpath
index 52c1a0a..48ccd5e 100644
--- a/debian/libjgit-java.classpath
+++ b/debian/libjgit-java.classpath
@@ -1,3 +1,3 @@
-usr/share/java/org.eclipse.jgit.jar jsch.jar
+usr/share/java/org.eclipse.jgit.jar jsch.jar JavaEWAH.jar
usr/share/java/org.eclipse.jgit.http.server.jar org.eclipse.jgit.jar servlet-api-2.5.jar
usr/share/java/org.eclipse.jgit.junit.jar org.eclipse.jgit.jar junit4.jar
diff --git a/debian/patches/javaewah-compatibility.patch b/debian/patches/javaewah-compatibility.patch
new file mode 100644
index 0000000..007eccd
--- /dev/null
+++ b/debian/patches/javaewah-compatibility.patch
@@ -0,0 +1,209 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Tue, 11 Jun 2013 20:54:09 +0200
+Subject: javaewah-compatibility
+
+---
+ .../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 +-
+ .../eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java | 2 +-
+ .../src/org/eclipse/jgit/internal/storage/file/BitSet.java | 2 +-
+ .../org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java | 4 ++--
+ .../org/eclipse/jgit/internal/storage/file/InflatingBitSet.java | 6 +++---
+ .../org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java | 4 ++--
+ .../jgit/internal/storage/file/PackBitmapIndexBuilder.java | 2 +-
+ .../jgit/internal/storage/file/PackBitmapIndexRemapper.java | 4 ++--
+ .../eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java | 2 +-
+ .../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 35a4994..d6eb1f8 100644
+--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
++++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
+@@ -39,7 +39,7 @@ Export-Package: org.eclipse.jgit.api;version="3.0.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",
++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 75adbd7..5a85947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
debian-custom-build.patch
+javaewah-compatibility.patch
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list