[Git][java-team/multiverse-core][master] 6 commits: update changelog for NMU

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / multiverse-core


Commits:
e3e1626e by tony mancill at 2022-01-05T20:04:03-08:00
update changelog for NMU

- - - - -
8488fc68 by tony mancill at 2022-01-05T20:09:24-08:00
Add patch for FTBFS due to javadoc

- - - - -
2a98ebae by tony mancill at 2022-01-05T20:18:38-08:00
Add default-jdk-doc to build-deps

- - - - -
60aee938 by tony mancill at 2022-01-05T20:20:14-08:00
Add myself to Uploaders

- - - - -
ba61a275 by tony mancill at 2022-01-05T20:21:11-08:00
Update Vcs URLs to point to Salsa

- - - - -
eac2a70e by tony mancill at 2022-01-05T20:58:34-08:00
Prepare changelog for upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/03_javadoc.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,4 @@
-multiverse-core (0.7.0-5) UNRELEASED; urgency=medium
-
-  * Team upload.
+multiverse-core (0.7.0-5) unstable; urgency=medium
 
   [ Emmanuel Bourg ]
   * Build with gradle-debian-helper.
@@ -13,7 +11,20 @@ multiverse-core (0.7.0-5) UNRELEASED; urgency=medium
   * Update Vcs-* fields.
   * Update copyright info.
 
- -- Miguel Landaeta <nomadium at debian.org>  Wed, 09 Aug 2017 20:18:07 +0100
+  [ tony mancill ]
+  * Add patch for FTBFS due to javadoc
+  * Add default-jdk-doc to build-deps
+  * Add myself to Uploaders
+  * Update Vcs URLs to point to Salsa
+
+ -- tony mancill <tmancill at debian.org>  Wed, 05 Jan 2022 20:21:27 -0800
+
+multiverse-core (0.7.0-4.1) unstable; urgency=medium
+
+  * Non maintainer upload by the Reproducible Builds team.
+  * No source change upload to rebuild on buildd with .buildinfo files.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 01 Jan 2021 15:29:12 +0100
 
 multiverse-core (0.7.0-4) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -1,16 +1,18 @@
 Source: multiverse-core
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: tony mancill <tmancill at debian.org>
 Section: java
 Priority: optional
 Build-Depends: debhelper (>= 10~),
                default-jdk,
+               default-jdk-doc,
                gradle-debian-helper,
                javahelper,
                maven-repo-helper
 Standards-Version: 3.9.8
 Homepage: http://multiverse.codehaus.org/
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/multiverse-core.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/multiverse-core.git
+Vcs-Git: https://salsa.debian.org/java-team/multiverse-core.git
+Vcs-Browser: https://salsa.debian.org/java-team/multiverse-core
 
 Package: libmultiverse-core-java
 Architecture: all


=====================================
debian/patches/03_javadoc.patch
=====================================
@@ -0,0 +1,15 @@
+--- 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/series
=====================================
@@ -1,2 +1,3 @@
 01_fix_build.diff
 02_remove_unused_maven_repositories.diff
+03_javadoc.patch



View it on GitLab: https://salsa.debian.org/java-team/multiverse-core/-/compare/8e72189fda9b5a15466463121599321c6195f7f5...eac2a70e0be5729331f2e7cb86e4d29d6d4268d1

-- 
View it on GitLab: https://salsa.debian.org/java-team/multiverse-core/-/compare/8e72189fda9b5a15466463121599321c6195f7f5...eac2a70e0be5729331f2e7cb86e4d29d6d4268d1
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/20220106/f376cb58/attachment.htm>