Emmanuel Bourg pushed to branch master at Debian Java Maintainers / multiverse-core
Commits: 4d656e19 by Emmanuel Bourg at 2022-05-18T08:07:47+02:00 Standards-Version updated to 4.6.1 - - - - - 8bd6b729 by Emmanuel Bourg at 2022-05-18T08:17:28+02:00 Switch to debhelper level 13 - - - - - 79fc6c26 by Emmanuel Bourg at 2022-05-18T08:17:32+02:00 Updated the watch file - - - - - d2d48595 by Emmanuel Bourg at 2022-05-18T08:18:01+02:00 Removed the -java-doc package - - - - - bd7363de by Emmanuel Bourg at 2022-05-18T08:18:03+02:00 Fixed the build failure with Java 17 (Closes: #1011185) - - - - - 88609d40 by Emmanuel Bourg at 2022-05-18T08:18:13+02:00 Upload to unstable - - - - - 9 changed files: - debian/changelog - − debian/compat - debian/control - − debian/libmultiverse-core-java-doc.javadoc - − debian/patches/03_javadoc.patch - + debian/patches/04_language_level.patch - debian/patches/series - debian/rules - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +multiverse-core (0.7.0-6) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 17 (Closes: #1011185) + * Removed the -java-doc package + * Standards-Version updated to 4.6.1 + * Switch to debhelper level 13 + * Updated the watch file + + -- Emmanuel Bourg <[email protected]> Wed, 18 May 2022 08:18:09 +0200 + multiverse-core (0.7.0-5) unstable; urgency=medium [ Emmanuel Bourg ] ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -10 ===================================== debian/control ===================================== @@ -3,13 +3,12 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: tony mancill <[email protected]> Section: java Priority: optional -Build-Depends: debhelper (>= 10~), +Build-Depends: debhelper-compat (= 13), default-jdk, - default-jdk-doc, gradle-debian-helper, javahelper, maven-repo-helper -Standards-Version: 3.9.8 +Standards-Version: 4.6.1 Homepage: http://multiverse.codehaus.org/ Vcs-Git: https://salsa.debian.org/java-team/multiverse-core.git Vcs-Browser: https://salsa.debian.org/java-team/multiverse-core @@ -30,25 +29,3 @@ Description: Java library implementing Software Transactional Memory (STM) Also it reduces complexity of concurrency control, it can be used demanding production environments and provides a framework for STM experiments. - -Package: libmultiverse-core-java-doc -Architecture: all -Section: doc -Depends: ${misc:Depends} -Recommends: libmultiverse-core-java (= ${binary:Version}) -Suggests: default-jdk-doc -Description: Documentation for libmultiverse-core-java - Multiverse is meant as an alternative to traditional lock based - concurrency. If you have worked with databases before, Transactional - Memory should feel familiar because both share one very important - concept: transactions. - . - Multiverse is language independent so it can be used without relying - on instrumentation and therefore can easily be used with other - languages that can run on the JVM like Scala, Groovy or JRuby. - . - Also it reduces complexity of concurrency control, it can be used - demanding production environments and provides a framework for STM - experiments. - . - This package contains the Multiverse Core API javadocs. ===================================== debian/libmultiverse-core-java-doc.javadoc deleted ===================================== @@ -1 +0,0 @@ -multiverse-core/build/docs/javadoc ===================================== debian/patches/03_javadoc.patch deleted ===================================== @@ -1,15 +0,0 @@ ---- a/multiverse-core/src/main/java/org/multiverse/api/Lock.java -+++ b/multiverse-core/src/main/java/org/multiverse/api/Lock.java -@@ -52,9 +52,9 @@ - * <p>It is possible to upgrade a lock to more strict version, e.g. to upgrade a read-lock to a write-lock. - * The following upgrades are possible: - * <ol> -- * <li>LockMode.Read->LockMode.Write: as long as no other transaction has acquired the Lock in LockMode.Read</li> -- * <li>LockMode.Read->LockMode.Exclusive: as long as no other transaction has acquired the Lock in LockMode.Read</li> -- * <li>LockMode.Write->LockMode.Exclusive: will always succeed</li> -+ * <li>LockMode.Read to LockMode.Write: as long as no other transaction has acquired the Lock in LockMode.Read</li> -+ * <li>LockMode.Read to LockMode.Exclusive: as long as no other transaction has acquired the Lock in LockMode.Read</li> -+ * <li>LockMode.Write to LockMode.Exclusive: will always succeed</li> - * </ol> - * <p> - * The Txn is allowed to apply a more strict LockMode than the one specified. ===================================== debian/patches/04_language_level.patch ===================================== @@ -0,0 +1,14 @@ +Description: Change the source level to build with recent JDKs +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/build.gradle ++++ b/build.gradle +@@ -28,7 +28,7 @@ + apply plugin: 'maven' + apply plugin: 'project-reports' + +- sourceCompatibility = 1.6 ++ sourceCompatibility = 8 + version = '0.7.0' + group = 'org.multiverse' + ===================================== debian/patches/series ===================================== @@ -1,3 +1,3 @@ 01_fix_build.diff 02_remove_unused_maven_repositories.diff -03_javadoc.patch +04_language_level.patch ===================================== debian/rules ===================================== @@ -4,14 +4,6 @@ dh $@ --buildsystem=gradle --with javahelper --with maven_repo_helper override_dh_auto_build: - dh_auto_build -- --project-prop finalRelease=true jar javadoc - -get-orig-source: - cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ - uscan \ - --verbose \ - --rename \ - --no-symlink \ - --destdir $(CURDIR) \ - --watchfile debian/watch \ - --force-download + dh_auto_build -- --project-prop finalRelease=true jar + +override_dh_auto_test: ===================================== debian/watch ===================================== @@ -1,3 +1,3 @@ -version=3 +version=4 https://github.com/pveentjer/Multiverse/tags \ -.*/archive/\w+-?(\d\S*)\.tar\.gz +.*/\w+-?(\d\S*)\.tar\.gz View it on GitLab: https://salsa.debian.org/java-team/multiverse-core/-/compare/eac2a70e0be5729331f2e7cb86e4d29d6d4268d1...88609d408e14ef1917995a82337383b6cf466a52 -- View it on GitLab: https://salsa.debian.org/java-team/multiverse-core/-/compare/eac2a70e0be5729331f2e7cb86e4d29d6d4268d1...88609d408e14ef1917995a82337383b6cf466a52 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
