[Git][java-team/xmlgraphics-commons][master] 9 commits: Update Vcs URLs to point to Salsa
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Sun Oct 10 22:55:58 BST 2021
Tony Mancill pushed to branch master at Debian Java Maintainers / xmlgraphics-commons
Commits:
9e6d8c1e by tony mancill at 2021-10-10T11:30:18-07:00
Update Vcs URLs to point to Salsa
- - - - -
588bc122 by tony mancill at 2021-10-10T11:30:49-07:00
Use debhelper-compat 13
- - - - -
be3a2e53 by tony mancill at 2021-10-10T14:50:33-07:00
Remove deprecated get-orig-source target
- - - - -
391a1b9d by tony mancill at 2021-10-10T14:50:33-07:00
Bump Standards-Version to 4.6.0
- - - - -
505c4c8b by tony mancill at 2021-10-10T14:50:33-07:00
Set timezone to UTC when SOURCE_DATE_EPOCH is set (Closes: #983588)
- - - - -
3635fe38 by tony mancill at 2021-10-10T14:50:33-07:00
Update debian/watch
- - - - -
ca40d2d2 by tony mancill at 2021-10-10T14:50:33-07:00
Set Rules-Requires-Root: no in debian/control
- - - - -
49294096 by tony mancill at 2021-10-10T14:50:33-07:00
Update debian/copyright
- - - - -
de330712 by tony mancill at 2021-10-10T14:50:49-07:00
Prepare changelog for upload to unstable
- - - - -
8 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/0001-XMPSchemaAdapter.java-Use-UTC-timezone-when-SOURCE_D.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+xmlgraphics-commons (2.4-3) unstable; urgency=medium
+
+ * Team upload
+ * Update Vcs URLs to point to Salsa
+ * Use debhelper-compat 13
+ * Remove deprecated get-orig-source target
+ * Bump Standards-Version to 4.6.0
+ * Set timezone to UTC when SOURCE_DATE_EPOCH is set (Closes: #983588)
+ Thank you to Vagrant Cascadian for the patch.
+ * Set Rules-Requires-Root: no in debian/control
+
+ -- tony mancill <tmancill at debian.org> Sun, 10 Oct 2021 14:49:19 -0700
+
xmlgraphics-commons (2.4-2) unstable; urgency=high
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders:
Mathieu Malaterre <malat at debian.org>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
default-jdk-doc,
gnupg,
@@ -16,10 +16,11 @@ Build-Depends:
libmockito-java,
libxml-commons-resolver1.1-java,
maven-debian-helper (>= 2.2)
-Standards-Version: 4.5.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/xmlgraphics-commons.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/xmlgraphics-commons.git
+Standards-Version: 4.6.0
+Vcs-Git: https://salsa.debian.org/java-team/xmlgraphics-commons.git
+Vcs-Browser: https://salsa.debian.org/java-team/xmlgraphics-commons
Homepage: http://xmlgraphics.apache.org/commons/
+Rules-Requires-Root: no
Package: libxmlgraphics-commons-java
Architecture: all
=====================================
debian/copyright
=====================================
@@ -3,7 +3,7 @@ Upstream-Name: xmlgraphics-commons
Upstream-Contact: Chris Bowditch, Thomas DeWeese, Christian Geisert,
Clay Leeds, Jeremias Märki, Cameron McCormack, Simon Pepping, Jörg
Pietschmann
-Source: http://xmlgraphics.apache.org/commons/
+Source: https://xmlgraphics.apache.org/commons/
Files: *
Copyright: 2006, The Apache Software Foundation
=====================================
debian/patches/0001-XMPSchemaAdapter.java-Use-UTC-timezone-when-SOURCE_D.patch
=====================================
@@ -0,0 +1,32 @@
+From 2146f4a44fbee1e3aef12e56ae3d904e793090cd Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagrant at reproducible-builds.org>
+Date: Fri, 26 Feb 2021 19:10:10 +0000
+Subject: [PATCH] XMPSchemaAdapter.java: Use UTC timezone when
+ SOURCE_DATE_EPOCH is set.
+
+SOURCE_DATE_EPOCH specifies the timestamp, but needs to be rendered in
+UTC timezone to ensure reproducible builds.
+
+https://reproducible-builds.org/docs/source-date-epoch/
+
+This is a follow-up to https://bugs.debian.org/978499 in apache fop,
+as there is no way for fop itself to pass the timezone information for
+some values.
+---
+ .../java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
++++ b/src/main/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
+@@ -157,6 +157,11 @@
+ * @return the formatted date
+ */
+ public static String formatISO8601Date(Date dt) {
++ // https://reproducible-builds.org/docs/source-date-epoch/
++ String source_date_epoch = System.getenv("SOURCE_DATE_EPOCH");
++ if (source_date_epoch != null) {
++ return formatISO8601Date(dt, TimeZone.getTimeZone("Etc/UTC"));
++ }
+ return formatISO8601Date(dt, TimeZone.getDefault());
+ }
+
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
CVE-2020-11988.patch
+0001-XMPSchemaAdapter.java-Use-UTC-timezone-when-SOURCE_D.patch
=====================================
debian/rules
=====================================
@@ -7,6 +7,3 @@ unexport DISPLAY
%:
dh $@ --buildsystem=maven
-
-get-orig-source:
- uscan --force-download --verbose --repack --rename
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,pgpsigurlmangle=s/$/.asc/ \
-http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-(\d.*)-src\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian jh_repack
+https://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-(\d.*)-src\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian jh_repack
View it on GitLab: https://salsa.debian.org/java-team/xmlgraphics-commons/-/compare/d7c835e44e1f97d48b06d8de5fb83c231d526a94...de33071263e950ccd66859804d1f427da3cd3b37
--
View it on GitLab: https://salsa.debian.org/java-team/xmlgraphics-commons/-/compare/d7c835e44e1f97d48b06d8de5fb83c231d526a94...de33071263e950ccd66859804d1f427da3cd3b37
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/20211010/9405eb67/attachment.htm>
More information about the pkg-java-commits
mailing list