[Git][java-team/libapache-poi-java][master] 11 commits: Standards-Version updated to 4.1.5
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jul 24 13:03:54 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libapache-poi-java
Commits:
cf2522c1 by Emmanuel Bourg at 2018-07-24T12:20:22+02:00
Standards-Version updated to 4.1.5
- - - - -
64f38fac by Emmanuel Bourg at 2018-07-24T12:20:50+02:00
Switch to debhelper level 10
- - - - -
b516afe4 by Emmanuel Bourg at 2018-07-24T12:20:59+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
5ac19623 by Emmanuel Bourg at 2018-07-24T13:18:28+02:00
Fixed the test failures with Java 9 (Closes: #893250)
- - - - -
f05d358f by Emmanuel Bourg at 2018-07-24T13:19:22+02:00
Removed Damien Raude-Morvan from the uploaders (Closes: #889320)
- - - - -
73e4b7b0 by Emmanuel Bourg at 2018-07-24T13:20:01+02:00
Wrap and sort
- - - - -
dd568a72 by Emmanuel Bourg at 2018-07-24T13:25:34+02:00
Use a secure URL in debian/watch
- - - - -
3270db15 by Emmanuel Bourg at 2018-07-24T13:40:26+02:00
Properly install the poi-excelant jar
- - - - -
d9fb4357 by Emmanuel Bourg at 2018-07-24T13:42:14+02:00
Downgraded the ant dependency to "Suggests" level (Closes: #856693)
- - - - -
de349e93 by Emmanuel Bourg at 2018-07-24T13:53:25+02:00
Build with the DH sequencer instead of CDBS
- - - - -
fbe66a66 by Emmanuel Bourg at 2018-07-24T13:55:56+02:00
Upload to unstable
- - - - -
10 changed files:
- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- debian/copyright
- debian/links
- + debian/patches/08_java9-compatibility.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libapache-poi-java (3.10.1-4) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the test failures with Java 9 (Closes: #893250)
+ * Downgraded the ant dependency to "Suggests" level (Closes: #856693)
+ * Removed Damien Raude-Morvan from the uploaders (Closes: #889320)
+ * Properly install the poi-excelant jar
+ * Build with the DH sequencer instead of CDBS
+ * Standards-Version updated to 4.1.5
+ * Switch to debhelper level 10
+ * Use salsa.debian.org Vcs-* URLs
+ * Use a secure URL in debian/watch
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 24 Jul 2018 13:55:38 +0200
+
libapache-poi-java (3.10.1-3) unstable; urgency=medium
* Team upload.
=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+docs/skin/css/
+ooxml-lib/*.jar
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -2,38 +2,38 @@ Source: libapache-poi-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Rene Engelhard <rene at debian.org>,
- Torsten Werner <twerner at debian.org>,
- Damien Raude-Morvan <drazzib at debian.org>,
- Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant,
- ant-optional,
- cdbs,
- debhelper (>= 9),
- default-jdk,
- javahelper,
- junit4,
- libcommons-codec-java,
- libcommons-logging-java,
- libdom4j-java,
- liblog4j1.2-java,
- libxmlbeans-java,
- maven-repo-helper
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libapache-poi-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libapache-poi-java.git
+Uploaders:
+ Rene Engelhard <rene at debian.org>,
+ Torsten Werner <twerner at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 10~),
+ default-jdk,
+ javahelper,
+ junit4,
+ libcommons-codec-java,
+ libcommons-logging-java,
+ libdom4j-java,
+ liblog4j1.2-java,
+ libxmlbeans-java,
+ maven-repo-helper
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/libapache-poi-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libapache-poi-java
Homepage: http://poi.apache.org
Package: libapache-poi-java
Architecture: all
-Depends: ant,
- libcommons-codec-java,
- libcommons-logging-java,
- libdom4j-java,
- liblog4j1.2-java,
- libxmlbeans-java,
- ${misc:Depends}
-Suggests: libapache-poi-java-doc
+Depends:
+ libcommons-codec-java,
+ libcommons-logging-java,
+ libdom4j-java,
+ liblog4j1.2-java,
+ libxmlbeans-java,
+ ${misc:Depends}
+Suggests: libapache-poi-java-doc, ant
Conflicts: libjakarta-poi-java
Replaces: libjakarta-poi-java
Provides: libjakarta-poi-java
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache POI
Source: http://poi.apache.org
=====================================
debian/links
=====================================
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1,3 @@
# some compatibility symlinks
-/usr/share/java/poi.jar /usr/share/java/jakarta-poi.jar
/usr/share/java/poi-scratchpad.jar /usr/share/java/jakarta-scratchpad-poi.jar
+/usr/share/java/poi.jar /usr/share/java/jakarta-poi.jar
=====================================
debian/patches/08_java9-compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/08_java9-compatibility.patch
@@ -0,0 +1,42 @@
+Description: Fixes the test failures with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java
++++ b/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java
+@@ -82,9 +82,7 @@
+ List<Attachment> attachments = quick.getAttachments();
+
+ // Pick a predictable date format + timezone
+- DateFormat fmt = DateFormat.getDateTimeInstance(
+- DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
+- );
++ DateFormat fmt = new java.text.SimpleDateFormat("dd-MMM-yyyy HH:mm:ss", Locale.UK);
+ fmt.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+ // They should all have the same date on them
+--- a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
++++ b/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
+@@ -149,9 +149,7 @@
+ assertEquals(MAPIDateAttribute.class, attr.getClass());
+
+ MAPIDateAttribute date = (MAPIDateAttribute)attr;
+- DateFormat fmt = DateFormat.getDateTimeInstance(
+- DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
+- );
++ DateFormat fmt = new java.text.SimpleDateFormat("dd-MMM-yyyy HH:mm:ss", Locale.UK);
+ fmt.setTimeZone(TimeZone.getTimeZone("UTC"));
+ assertEquals("15-Dec-2010 14:46:31", fmt.format(date.getDate()));
+
+--- a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
++++ b/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
+@@ -159,9 +159,7 @@
+ // Ask for it as a Java date, and have it converted
+ // Pick a predictable format + location + timezone
+ TNEFDateAttribute date = (TNEFDateAttribute)attr;
+- DateFormat fmt = DateFormat.getDateTimeInstance(
+- DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
+- );
++ DateFormat fmt = new java.text.SimpleDateFormat("dd-MMM-yyyy HH:mm:ss", Locale.UK);
+ fmt.setTimeZone(TimeZone.getTimeZone("UTC"));
+ assertEquals("28-Apr-2010 12:40:56", fmt.format(date.getDate()));
+ }
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
05_use-local-ooxml-xsds.patch
06_java8-compatibility.patch
07_CVE-2014-9527.patch
+08_java9-compatibility.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,46 +1,28 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
-
-PACKAGE := apache-poi
-MAVEN_DIST := build/dist
-POM_DIR := $(MAVEN_DIST)
-JAR_DIR := $(MAVEN_DIST)
-
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := ant ant-junit ant-junit4
-DEB_ANT_BUILD_TARGET := jar maven-poms javadocs
-DEB_ANT_CHECK_TARGET := test
-#DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
-DEB_CHANGELOG_DATETIME = $(shell dpkg-parsechangelog --show-field Date)
-DSTAMP = $(shell date '--date=$(DEB_CHANGELOG_DATETIME)' +%Y%m%d)
-
-ANT_ARGS := -Dversion.id=$(VERSION) -DDSTAMP=$(DSTAMP)
-
-clean::
- mh_clean
- -test -d docs/skin/css && rmdir docs/skin/css
- -rm -rf debian/tmp
- rm -f ooxml-lib/*.jar
-
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-$(VERSION).pom
- mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-scratchpad-$(VERSION).pom
- mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-ooxml-$(VERSION).pom
- mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-ooxml-schemas-$(VERSION).pom
- mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-excelant-$(VERSION).pom
- mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-$(VERSION).pom $(JAR_DIR)/poi-$(VERSION).jar
- mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-scratchpad-$(VERSION).pom $(JAR_DIR)/poi-scratchpad-$(VERSION).jar
- mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-ooxml-$(VERSION).pom $(JAR_DIR)/poi-ooxml-$(VERSION).jar
- mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-ooxml-schemas-$(VERSION).pom $(JAR_DIR)/poi-ooxml-schemas-$(VERSION).jar
- mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-excelant-$(VERSION).pom $(JAR_DIR)/poi-ooxml-schemas-$(VERSION).jar
-
- jh_classpath -plib$(PACKAGE)-java
-
-get-orig-source:
- debian/orig-tar.sh --upstream-version $(VERSION)
+include /usr/share/dpkg/pkg-info.mk
+
+VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+dfsg//')
+
+%:
+ dh $@ --with maven-repo-helper --with javahelper
+
+override_dh_auto_build:
+ dh_auto_build -- -Dversion.id=$(VERSION) -DDSTAMP=$(shell date '--date=@$(SOURCE_DATE_EPOCH)' +%Y%m%d) jar maven-poms javadocs
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ dh_auto_build -- test
+endif
+
+override_dh_auto_install:
+ mh_installpom -plibapache-poi-java build/dist/poi-$(VERSION).pom
+ mh_installpom -plibapache-poi-java build/dist/poi-scratchpad-$(VERSION).pom
+ mh_installpom -plibapache-poi-java build/dist/poi-ooxml-$(VERSION).pom
+ mh_installpom -plibapache-poi-java build/dist/poi-ooxml-schemas-$(VERSION).pom
+ mh_installpom -plibapache-poi-java build/dist/poi-excelant-$(VERSION).pom
+ mh_installjar -plibapache-poi-java -l build/dist/poi-$(VERSION).pom build/dist/poi-$(VERSION).jar
+ mh_installjar -plibapache-poi-java -l build/dist/poi-scratchpad-$(VERSION).pom build/dist/poi-scratchpad-$(VERSION).jar
+ mh_installjar -plibapache-poi-java -l build/dist/poi-ooxml-$(VERSION).pom build/dist/poi-ooxml-$(VERSION).jar
+ mh_installjar -plibapache-poi-java -l build/dist/poi-ooxml-schemas-$(VERSION).pom build/dist/poi-ooxml-schemas-$(VERSION).jar
+ mh_installjar -plibapache-poi-java -l build/dist/poi-excelant-$(VERSION).pom build/dist/poi-excelant-$(VERSION).jar
=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://archive.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz debian debian/orig-tar.sh
+https://archive.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz debian debian/orig-tar.sh
View it on GitLab: https://salsa.debian.org/java-team/libapache-poi-java/compare/a53b1be9e614a2aabb39ed0beb6c06b90d068b15...fbe66a667864f21c1b063968393c047143bf7728
--
View it on GitLab: https://salsa.debian.org/java-team/libapache-poi-java/compare/a53b1be9e614a2aabb39ed0beb6c06b90d068b15...fbe66a667864f21c1b063968393c047143bf7728
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/20180724/29b6db92/attachment.html>
More information about the pkg-java-commits
mailing list