[Git][java-team/snappy-java][master] 6 commits: Standards-Version updated to 4.2.1
Emmanuel Bourg
gitlab at salsa.debian.org
Fri Oct 5 00:18:18 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / snappy-java
Commits:
10471090 by Emmanuel Bourg at 2018-10-04T22:53:02Z
Standards-Version updated to 4.2.1
- - - - -
d8a0ee84 by Emmanuel Bourg at 2018-10-04T22:54:35Z
Wrap and sort
- - - - -
d28eceb0 by Emmanuel Bourg at 2018-10-04T22:55:24Z
Removed the dfsg suffix
- - - - -
12ed654d by Emmanuel Bourg at 2018-10-04T23:14:07Z
New upstream version 1.1.7.2
- - - - -
9ad14647 by Emmanuel Bourg at 2018-10-04T23:14:09Z
Update upstream source from tag 'upstream/1.1.7.2'
Update to upstream version '1.1.7.2'
with Debian dir a222e0f55a1f423dfe2099fc4cd81534b043bbfb
- - - - -
e0e148b1 by Emmanuel Bourg at 2018-10-04T23:16:32Z
New upstream release (1.1.7.2)
- - - - -
8 changed files:
- Makefile
- Makefile.common
- build.sbt
- debian/changelog
- debian/control
- debian/watch
- src/main/java/org/xerial/snappy/SnappyOutputStream.java
- version.sbt
Changes:
=====================================
Makefile
=====================================
@@ -106,8 +106,10 @@ $(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
# aarch64 can use big-endian optimzied code
ifeq ($(OS_ARCH),aarch64)
+ifeq ($(ENDIANESS),$(BIG_ENDIAN))
SNAPPY_CXX_OPTS:=-DSNAPPY_IS_BIG_ENDIAN
endif
+endif
$(SNAPPY_OUT)/%.o: $(SNAPPY_SRC_DIR)/%.cc
@mkdir -p $(@D)
=====================================
Makefile.common
=====================================
@@ -11,6 +11,8 @@ JAVA := "$$JAVA_HOME/bin/java"
JAVAC := "$$JAVA_HOME/bin/javac"
JAVAH := "$$JAVA_HOME/bin/javah"
+LITTLE_ENDIAN := "Little Endian"
+BIG_ENDIAN := "Big Endian"
OSINFO_CLASS := org.xerial.snappy.OSInfo
OSINFO_PROG := lib/org/xerial/snappy/OSInfo.class
@@ -24,6 +26,7 @@ OS_ARCH := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --arch)
LIB_FOLDER := $(shell $(JAVA) -cp lib $(OSINFO_CLASS))
IBM_JDK_LIB := lib/inc_ibm
+ENDIANESS=$(shell lscpu | grep "Byte Order" |cut -d ":" -f2)
# Windows uses different path separators
ifeq ($(OS_NAME),Windows)
sep := ;
=====================================
build.sbt
=====================================
@@ -109,10 +109,13 @@ libraryDependencies ++= Seq(
enablePlugins(SbtOsgi)
+osgiSettings
+
OsgiKeys.exportPackage := Seq("org.xerial.snappy", "org.xerial.snappy.buffer")
OsgiKeys.bundleSymbolicName := "org.xerial.snappy.snappy-java"
OsgiKeys.bundleActivator := Option("org.xerial.snappy.SnappyBundleActivator")
OsgiKeys.importPackage := Seq("""org.osgi.framework;version="[1.5,2)"""")
+OsgiKeys.requireCapability := """osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))""""
OsgiKeys.additionalHeaders := Map(
"Bundle-NativeCode" -> Seq(
@@ -128,7 +131,7 @@ OsgiKeys.additionalHeaders := Map(
"org/xerial/snappy/native/Linux/x86/libsnappyjava.so;osname=linux;processor=x86",
"org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so;osname=linux;processor=aarch64",
"org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm",
- "org/xerial/snappy/native/Linux/arm7/libsnappyjava.so;osname=linux;processor=arm_le",
+ "org/xerial/snappy/native/Linux/armv7/libsnappyjava.so;osname=linux;processor=arm_le",
"org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le",
"org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x",
"org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc",
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+snappy-java (1.1.7.2-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 05 Oct 2018 01:16:23 +0200
+
snappy-java (1.1.7.1+dfsg-1) unstable; urgency=medium
* Turn exclusions of orig-tar.sh into Files-Excluded
=====================================
debian/control
=====================================
@@ -1,23 +1,23 @@
Source: snappy-java
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Charles Plessy <plessy at debian.org>,
- Andreas Tille <tille at debian.org>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 11~),
- libsnappy-dev,
- maven-debian-helper
-Build-Depends-Indep: libmaven-bundle-plugin-java
-Standards-Version: 4.1.4
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Charles Plessy <plessy at debian.org>,
+ Andreas Tille <tille at debian.org>
+Build-Depends:
+ debhelper (>= 11~),
+ libmaven-bundle-plugin-java,
+ libsnappy-dev,
+ maven-debian-helper
+Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/java-team/snappy-java
Vcs-Git: https://salsa.debian.org/java-team/snappy-java.git
Homepage: https://github.com/xerial/snappy-java
Package: libsnappy-java
Architecture: all
-Depends: ${misc:Depends},
- ${maven:Depends},
- libsnappy-jni
+Depends: ${misc:Depends}, ${maven:Depends}, libsnappy-jni
Description: Snappy for Java, a fast compressor/decompresser
Java port of Snappy, a fast compresser/decompresser written in C++,
originally developed by Google.
@@ -29,8 +29,7 @@ Description: Snappy for Java, a fast compressor/decompresser
Package: libsnappy-jni
Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Snappy for Java, a fast compressor/decompresser (JNI library)
Java port of Snappy, a fast compresser/decompresser written in C++,
originally developed by Google.
=====================================
debian/watch
=====================================
@@ -1,4 +1,3 @@
version=4
-
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
+opts="dversionmangle=s/\+dfsg//g,repack,compression=xz" \
https://github.com/xerial/snappy-java/tags .*/([\d\.]+).tar.gz
=====================================
src/main/java/org/xerial/snappy/SnappyOutputStream.java
=====================================
@@ -41,6 +41,7 @@ import java.io.OutputStream;
* The output data format is:
* <ol>
* <li>snappy codec header defined in {@link SnappyCodec} (8 bytes)
+ * <li>codec version (4 bytes integer, at least 1) and compatible version (4 bytes integer)
* <li>compressed block 1 : a pair of (compressed data size [4 byte integer.
* Big-endian], compressed data...)
* <li>compressed block 2
=====================================
version.sbt
=====================================
@@ -1 +1 @@
-version in ThisBuild := "1.1.7.1"
+version in ThisBuild := "1.1.7.2"
View it on GitLab: https://salsa.debian.org/java-team/snappy-java/compare/5fcb52a43005750d1083d1aaedeb5e855a6cc365...e0e148b10a599514c3ab637cc2b8b068bd532f01
--
View it on GitLab: https://salsa.debian.org/java-team/snappy-java/compare/5fcb52a43005750d1083d1aaedeb5e855a6cc365...e0e148b10a599514c3ab637cc2b8b068bd532f01
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181004/7e1ff212/attachment.html>
More information about the pkg-java-commits
mailing list