[Git][java-team/jcodings][debian/sid] 8 commits: [maven-release-plugin] prepare for next development iteration

[Hideki Yamane]

Hideki Yamane pushed to branch debian/sid at Debian Java Maintainers / jcodings


Commits:
8e09c6ca by Marcin Mielzynski at 2019-04-23T16:32:55Z
[maven-release-plugin] prepare for next development iteration

- - - - -
ead98826 by Marcin Mielzynski at 2019-07-23T15:21:43Z
add utf8 -> utf-8 alias

- - - - -
4cbf09e6 by Charles Oliver Nutter at 2019-10-02T01:42:18Z
Avoid calling Java 9+ version of *Buffer.position.

Fixes #27.

- - - - -
3709fc51 by Charles Oliver Nutter at 2019-10-02T01:43:34Z
[maven-release-plugin] prepare release jcodings-1.0.45

- - - - -
4e4eab15 by Hideki Yamane at 2019-10-03T16:13:52Z
Merge tag 'jcodings-1.0.45' into debian/sid

[maven-release-plugin]  copy for tag jcodings-1.0.45

- - - - -
62660359 by Hideki Yamane at 2019-10-03T16:14:25Z
set Standards-Version: 4.4.1

- - - - -
4d6f544c by Hideki Yamane at 2019-10-03T16:14:46Z
drop debhelper, just specifying debhelper-compat is enough

- - - - -
3d4ded52 by Hideki Yamane at 2019-10-03T16:16:23Z
note to changelog

- - - - -


6 changed files:

- debian/changelog
- debian/control
- pom.xml
- scripts/generate.rb
- src/org/jcodings/EncodingList.java
- src/org/jcodings/spi/ISO_8859_16.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+jcodings (1.0.45-1) unstable; urgency=medium
+
+  * New upstream release 1.0.45
+  * disable blhc and test-build-any check on CI
+  * debian/control
+    - set Standards-Version: 4.4.1
+    -drop debhelper, just specifying debhelper-compat is enough
+
+ -- Hideki Yamane <henrich at debian.org>  Fri, 04 Oct 2019 01:16:21 +0900
+
 jcodings (1.0.44-2) unstable; urgency=medium
 
   * debian/control: set Standards-Version: 4.4.0


=====================================
debian/control
=====================================
@@ -3,10 +3,10 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Hideki Yamane <henrich at debian.org>
-Build-Depends: default-jdk, debhelper (>= 12), debhelper-compat (= 12),
+Build-Depends: default-jdk, debhelper-compat (= 12),
                maven-debian-helper,
 Build-Depends-Indep: junit4 (>= 4.10)
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/java-team/jcodings.git
 Vcs-Browser: https://salsa.debian.org/java-team/jcodings
 Homepage: https://github.com/jruby/jcodings


=====================================
pom.xml
=====================================
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jruby.jcodings</groupId>
   <artifactId>jcodings</artifactId>
-  <version>1.0.44</version>
+  <version>1.0.45</version>
   <name>JCodings</name>
   <description>Byte based encoding support library for java</description>
   <parent>


=====================================
scripts/generate.rb
=====================================
@@ -80,6 +80,7 @@ def generate_encoding_list
 
     defines, other = open("#{REPO_PATH}/encdb.h").read.tr('()', '').scan(/ENC_([A-Z_]+)(.*?);/m).partition { |a, b| a =~ /DEFINE/ }
     other << ["ALIAS", "\"MS932\", \"Windows-31J\""]
+    other << ["ALIAS", "\"UTF8\", \"UTF-8\""]
 
     open("#{SRC_DIR}/EncodingList.java", "wb") { |f| f << open("EncodingListTemplate.java", "rb").read.
         sub(/%\{defines\}/, defines.map { |cmd, name| "#{INDENT*2}EncodingDB.declare(#{name}, \"#{enc_map[name[/[^"]+/]] || (raise 'class not found for encoding ' + name)}\");" }.join("\n")).


=====================================
src/org/jcodings/EncodingList.java
=====================================
@@ -194,6 +194,7 @@ final class EncodingList {
         EncodingDB.replicate("UTF8-SoftBank", "UTF-8");
         EncodingDB.replicate("SJIS-SoftBank", "Windows-31J");
         EncodingDB.alias("MS932", "Windows-31J");
+        EncodingDB.alias("UTF8", "UTF-8");
     }
 
     public static Encoding getInstance(String name) {


=====================================
src/org/jcodings/spi/ISO_8859_16.java
=====================================
@@ -20,6 +20,7 @@
 
 package org.jcodings.spi;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -174,7 +175,7 @@ public class ISO_8859_16 extends Charset {
 
                 if (replace != null) {
                     if (out.remaining() < replace.length) {
-                        in.position(in.position() - 1);
+                        ((Buffer) in).position(in.position() - 1);
                         return CoderResult.OVERFLOW;
                     } else {
                         out.put(replace);



View it on GitLab: https://salsa.debian.org/java-team/jcodings/compare/12afdf2a23bbb2e27d3f4c13780d4e7178266cf1...3d4ded5284dc77aa529b3b018000b1711a264f91

-- 
View it on GitLab: https://salsa.debian.org/java-team/jcodings/compare/12afdf2a23bbb2e27d3f4c13780d4e7178266cf1...3d4ded5284dc77aa529b3b018000b1711a264f91
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/20191003/9fdc0c74/attachment.html>