[Git][java-team/jzlib][master] 8 commits: d/patches: add patch to fix mtime and add getModifiedTime
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Wed Oct 25 15:40:44 BST 2023
Jérôme Charaoui pushed to branch master at Debian Java Maintainers / jzlib
Commits:
b94517a2 by Jérôme Charaoui at 2023-10-25T09:37:58-04:00
d/patches: add patch to fix mtime and add getModifiedTime
- - - - -
15fe6e2a by Jérôme Charaoui at 2023-10-25T09:37:59-04:00
d/control: build with headless jdk
- - - - -
48bcd5bb by Jérôme Charaoui at 2023-10-25T10:27:35-04:00
d/watch: bump version, no change needed
- - - - -
bef556db by Jérôme Charaoui at 2023-10-25T10:37:08-04:00
d/control: update Vcs-* links
- - - - -
8240d0d0 by Jérôme Charaoui at 2023-10-25T10:37:15-04:00
d/rules: drop obsolete get-orig-source target
- - - - -
08d0f6c2 by Jérôme Charaoui at 2023-10-25T10:37:16-04:00
d/control: add Rules-Requires-Root: no
- - - - -
b55e3138 by Jérôme Charaoui at 2023-10-25T10:38:23-04:00
d/control: bump Standards-Version
added Rules-Requires-Root and removed get-orig-source target
- - - - -
ea25cfd9 by Jérôme Charaoui at 2023-10-25T10:38:26-04:00
Update changelog for 1.1.3-3 release
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/fix-mtime-and-add-getModifiedTime.patch
- + debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,22 @@
-jzlib (1.1.3-3) UNRELEASED; urgency=medium
+jzlib (1.1.3-3) unstable; urgency=medium
+ * Team upload.
+
+ [ Debian Janitor ]
* Remove MIA uploader Damien Raude-Morvan <drazzib at debian.org>.
Closes: #889357
-
- -- Debian Janitor <janitor at jelmer.uk> Sat, 13 Mar 2021 17:54:31 -0000
+ * Apply multi-arch hints. + libjzlib-java: Add Multi-Arch: foreign.
+
+ [ Jérôme Charaoui ]
+ * d/control: build with headless jdk
+ * d/control: update Vcs-* links
+ * d/control: add Rules-Requires-Root: no
+ * d/control: bump Standards-Version
+ * d/patches: add patch to fix mtime and add getModifiedTime
+ * d/rules: drop obsolete get-orig-source target
+ * d/watch: bump version, no change needed
+
+ -- Jérôme Charaoui <jerome at riseup.net> Wed, 25 Oct 2023 10:28:25 -0400
jzlib (1.1.3-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -6,13 +6,14 @@ Uploaders:
Emmanuel Bourg <ebourg at apache.org>
Build-Depends:
debhelper (>= 10),
- default-jdk,
+ default-jdk-headless,
javahelper,
maven-repo-helper (>= 1.6)
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jzlib.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jzlib.git
+Standards-Version: 4.6.2
+Vcs-Git: https://salsa.debian.org/java-team/jzlib.git
+Vcs-Browser: https://salsa.debian.org/java-team/jzlib
Homepage: http://www.jcraft.com/jzlib/
+Rules-Requires-Root: no
Package: libjzlib-java
Architecture: all
=====================================
debian/patches/fix-mtime-and-add-getModifiedTime.patch
=====================================
@@ -0,0 +1,88 @@
+Description: Fix mtime and add getModifiedTime
+Author: Atsuhiko Yamanaka <atsuhiko.yamanaka at gmail.com>
+Date: Tue, 21 Jan 2014 16:52:41 -0800
+
+This is a patch taken from the (inactive) upstream repository in the fix_mtime
+branch. It's now needed by JRuby, see the jruby-jzlib fork.
+
+Origin: https://github.com/ymnk/jzlib/commit/1a5fb101cebe1b762cfe0ac74cd85ed3045919ea
+Forwarded: not-needed
+
+Index: jzlib/src/main/java/com/jcraft/jzlib/GZIPHeader.java
+===================================================================
+--- jzlib.orig/src/main/java/com/jcraft/jzlib/GZIPHeader.java 2023-10-24 07:37:15.403834694 -0400
++++ jzlib/src/main/java/com/jcraft/jzlib/GZIPHeader.java 2023-10-24 22:45:05.649048187 -0400
+@@ -59,7 +59,6 @@
+
+ boolean text = false;
+ private boolean fhcrc = false;
+- long time;
+ int xflags;
+ int os = 255;
+ byte[] extra;
+Index: jzlib/src/main/java/com/jcraft/jzlib/GZIPInputStream.java
+===================================================================
+--- jzlib.orig/src/main/java/com/jcraft/jzlib/GZIPInputStream.java 2023-10-24 07:37:15.403834694 -0400
++++ jzlib/src/main/java/com/jcraft/jzlib/GZIPInputStream.java 2023-10-24 22:45:05.649048187 -0400
+@@ -50,7 +50,17 @@
+ super(in, inflater, size, close_in);
+ }
+
++ /**
++ * @deprecated use getModifiedTime()
++ */
+ public long getModifiedtime() {
++ return this.getModifiedTime();
++ }
++
++ /**
++ * @return the modified time.
++ */
++ public long getModifiedTime() {
+ return inflater.istate.getGZIPHeader().getModifiedTime();
+ }
+
+Index: jzlib/src/main/java/com/jcraft/jzlib/Inflate.java
+===================================================================
+--- jzlib.orig/src/main/java/com/jcraft/jzlib/Inflate.java 2023-10-24 07:37:15.403834694 -0400
++++ jzlib/src/main/java/com/jcraft/jzlib/Inflate.java 2023-10-24 22:45:05.653048205 -0400
+@@ -454,8 +454,9 @@
+ case TIME:
+ try { r=readBytes(4, r, f); }
+ catch(Return e){ return e.r; }
+- if(gheader!=null)
+- gheader.time = this.need;
++ if(gheader!=null){
++ gheader.setModifiedTime(this.need);
++ }
+ if ((flags & 0x0200)!=0){
+ checksum(4, this.need);
+ }
+Index: jzlib/src/test/scala/GZIPIOStreamTest.scala
+===================================================================
+--- jzlib.orig/src/test/scala/GZIPIOStreamTest.scala 2023-10-24 07:37:15.403834694 -0400
++++ jzlib/src/test/scala/GZIPIOStreamTest.scala 2023-10-24 22:45:05.653048205 -0400
+@@ -26,6 +26,7 @@
+
+ val comment = "hi"
+ val name = "/tmp/foo"
++ val time = System.currentTimeMillis() / 1000
+
+ val content = "hello".getBytes
+
+@@ -34,6 +35,7 @@
+
+ gos.setComment(comment)
+ gos.setName(name)
++ gos.setModifiedTime(time)
+
+ gos.write(content)
+ gos.close
+@@ -51,6 +53,7 @@
+
+ comment should equal(gis.getComment)
+ name should equal(gis.getName)
++ time should equal(gis.getModifiedTime)
+
+ val crc32 = new CRC32
+ crc32.update(content, 0, content.length)
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-mtime-and-add-getModifiedTime.patch
=====================================
debian/rules
=====================================
@@ -4,6 +4,3 @@ export JAVA_HOME := /usr/lib/jvm/default-java
%:
dh $@ --with javahelper --with jh_maven_repo_helper
-
-get-orig-source:
- uscan --force-download --rename --repack
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
+version=4
https://github.com/ymnk/jzlib/tags .*/([\d\.]+).tar.gz
View it on GitLab: https://salsa.debian.org/java-team/jzlib/-/compare/a88ec14d82a30aec694df6c5628186f3474048ff...ea25cfd954d4ad88b5d8101316b1c865faad6f14
--
View it on GitLab: https://salsa.debian.org/java-team/jzlib/-/compare/a88ec14d82a30aec694df6c5628186f3474048ff...ea25cfd954d4ad88b5d8101316b1c865faad6f14
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/20231025/be14de2c/attachment.htm>
More information about the pkg-java-commits
mailing list