Sudip Mukherjee pushed to branch master at Debian Java Maintainers / libisnativec-java
Commits: 10c09be2 by Sudip Mukherjee at 2020-08-01T18:59:03+01:00 Fix FTBFS Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - 15293185 by Sudip Mukherjee at 2020-08-01T18:59:03+01:00 Add changelog for 5.3.20100629+fix-3 release Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - ec96f067 by Debian Janitor at 2020-08-01T19:02:29+01:00 Use secure URI in debian/watch. Fixes: lintian: debian-watch-uses-insecure-uri See-also: https://lintian.debian.org/tags/debian-watch-uses-insecure-uri.html - - - - - 6521a01b by Debian Janitor at 2020-08-01T19:02:36+01:00 Bump debhelper from old 11 to 12. Fixes: lintian: package-uses-old-debhelper-compat-version See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html - - - - - b44f99ee by Debian Janitor at 2020-08-01T19:02:36+01:00 Set debhelper-compat version in Build-Depends. Fixes: lintian: uses-debhelper-compat-file See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html - - - - - f9f7e805 by Debian Janitor at 2020-08-01T19:02:36+01:00 Change priority extra to priority optional. Fixes: lintian: priority-extra-is-replaced-by-priority-optional See-also: https://lintian.debian.org/tags/priority-extra-is-replaced-by-priority-optional.html - - - - - 78cdb996 by Debian Janitor at 2020-08-01T19:02:36+01:00 Update Vcs-* headers to use salsa repository. Fixes: lintian: vcs-obsolete-in-debian-infrastructure See-also: https://lintian.debian.org/tags/vcs-obsolete-in-debian-infrastructure.html - - - - - 10812318 by Debian Janitor at 2020-08-01T19:02:36+01:00 Remove unnecessary get-orig-source-target. Fixes: lintian: debian-rules-contains-unnecessary-get-orig-source-target See-also: https://lintian.debian.org/tags/debian-rules-contains-unnecessary-get-orig-source-target.html - - - - - 342db079 by Emmanuel Bourg at 2020-08-01T19:02:37+01:00 Merge branch 'lintian-fixes' into 'master' Fix some issues reported by lintian See merge request java-team/libisnativec-java!2 - - - - - 2df88f4d by Sudip Mukherjee at 2020-08-01T19:38:02+01:00 Refresh FTBFS patch for salsa Issue with ^M. Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - 7db5e385 by Sudip Mukherjee at 2020-08-01T19:38:22+01:00 Fix version Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - 7 changed files: - debian/changelog - − debian/compat - debian/control - + debian/patches/fix_ftbfs.patch - debian/patches/series - debian/rules - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,21 @@ +libisnativec-java (5.3.20100629+fix-4) UNRELEASED; urgency=medium + + * Use secure URI in debian/watch. + * Bump debhelper from old 11 to 12. + * Set debhelper-compat version in Build-Depends. + * Change priority extra to priority optional. + * Update Vcs-* headers to use salsa repository. + * Remove unnecessary get-orig-source-target. + + -- Debian Janitor <[email protected]> Sun, 17 May 2020 20:41:47 +0000 + +libisnativec-java (5.3.20100629+fix-3) unstable; urgency=medium + + * Team upload. + * Fix FTBFS. (Closes: #963286) + + -- Sudip Mukherjee <[email protected]> Sat, 01 Aug 2020 18:28:33 +0100 + libisnativec-java (5.3.20100629+fix-2) unstable; urgency=medium * Team upload. ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -1,16 +1,16 @@ Source: libisnativec-java Section: java -Priority: extra +Priority: optional Maintainer: Steffen Moeller <[email protected]> Build-Depends: - debhelper (>= 11), + debhelper-compat (= 12), default-jdk, javahelper (>= 0.37), libisrt-java, libjna-java Standards-Version: 4.1.3 -Vcs-Git: git://anonscm.debian.org/pkg-java/libisnativec-java.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libisnativec-java.git +Vcs-Git: https://salsa.debian.org/moeller/libisnativec-java.git +Vcs-Browser: https://salsa.debian.org/moeller/libisnativec-java Homepage: http://opensource.intarsys.de/home/en/index.php?n=IsNativeC.HomePage Package: libisnativec-java ===================================== debian/patches/fix_ftbfs.patch ===================================== @@ -0,0 +1,34 @@ +Description: Use getString() and setWideString() + The api public String getString(long offset, boolean wide) and + public void setString(long offset, String value, boolean wide) was + removed in the latest version of libjna-java. The call with 'false' + should now use getString(), and the ones with 'true' should use + getWideString(). Similary, for setString() it should be setString() + or setWideString(). + +Author: Sudip Mukherjee <[email protected]> +Bug-Debian: https://bugs.debian.org/963286 +Forwarded: no + +--- + +--- libisnativec-java-5.3.20100629+fix.orig/src/de/intarsys/nativec/jna/JnaNativeHandle.java ++++ libisnativec-java-5.3.20100629+fix/src/de/intarsys/nativec/jna/JnaNativeHandle.java +@@ -126,7 +126,7 @@ public class JnaNativeHandle implements + } + + public String getWideString(int index) { +- return getPointer().getString(index, true); ++ return getPointer().getWideString(index); + } + + @Override +@@ -181,7 +181,7 @@ public class JnaNativeHandle implements + } + + public void setWideString(int index, String value) { +- getPointer().setString(index, value, true); ++ getPointer().setWideString(index, value); + } + + } ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 01-java9-compatibility.patch +fix_ftbfs.patch ===================================== debian/rules ===================================== @@ -4,6 +4,3 @@ export CLASSPATH := /usr/share/java/jna.jar:/usr/share/java/isrt.jar %: dh $@ --with javahelper - -get-orig-source: - uscan --force-download ===================================== debian/watch ===================================== @@ -1,3 +1,3 @@ version=3 -http://sf.net/jpodrenderer/isNative\.(.*)\.zip debian debian/orig-tar.sh +https://sf.net/jpodrenderer/isNative\.(.*)\.zip debian debian/orig-tar.sh View it on GitLab: https://salsa.debian.org/java-team/libisnativec-java/-/compare/0abc595a2b3b2658d80f1ca9b388fcc0ed3ad6f3...7db5e3854c92bf0a654d32ce5517cfa89fa6935f -- View it on GitLab: https://salsa.debian.org/java-team/libisnativec-java/-/compare/0abc595a2b3b2658d80f1ca9b388fcc0ed3ad6f3...7db5e3854c92bf0a654d32ce5517cfa89fa6935f You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
