[Git][java-team/sbt-launcher-interface][master] 10 commits: Depending on dehelper-compat 13
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Wed Nov 3 15:45:06 GMT 2021
Pierre Gruet pushed to branch master at Debian Java Maintainers / sbt-launcher-interface
Commits:
0edcddcf by Pierre Gruet at 2021-11-03T10:45:48+01:00
Depending on dehelper-compat 13
- - - - -
259db4eb by Pierre Gruet at 2021-11-03T11:12:20+01:00
Using https URI in d/copyright
- - - - -
14bad757 by Pierre Gruet at 2021-11-03T11:12:41+01:00
Rules-Requires-Root: no
- - - - -
e2ad1dc5 by Pierre Gruet at 2021-11-03T11:13:21+01:00
Using https URI for homepage in d/control
- - - - -
67d8565a by Pierre Gruet at 2021-11-03T11:13:43+01:00
Setting Standards version to 4.6.0
- - - - -
a2c81368 by Pierre Gruet at 2021-11-03T14:13:52+01:00
Patching Update.scala so that it builds against Ivy 2.5.0
- - - - -
692948f5 by Pierre Gruet at 2021-11-03T14:23:49+01:00
Cleaning the d/patches directory
- - - - -
02e8be50 by Pierre Gruet at 2021-11-03T14:27:48+01:00
Updating changelog
- - - - -
e8db2c23 by Pierre Gruet at 2021-11-03T14:27:55+01:00
Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse.
Changes-By: lintian-brush
Fixes: lintian: upstream-metadata-file-is-missing
See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html
Fixes: lintian: upstream-metadata-missing-bug-tracking
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html
Fixes: lintian: upstream-metadata-missing-repository
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html
- - - - -
f89b12a8 by Pierre Gruet at 2021-11-03T16:44:48+01:00
Upload to unstable
- - - - -
9 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/ivy_2.5.0_classes.patch
- debian/patches/series
- debian/patches/upgrade-proguard-to-work-with-java-1.8.patch
- debian/patches/use-latest-sbt.patch
- + debian/upstream/metadata
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+sbt-launcher-interface (1.0.1-2) unstable; urgency=medium
+
+ * Team upload
+ * Depending on dehelper-compat 13
+ * Setting Standards version to 4.6.0:
+ - Using https URI in d/copyright
+ - Rules-Requires-Root: no
+ * Using https URI for homepage in d/control
+ * Patching Update.scala so that it builds against Ivy 2.5.0 (Closes: #980612)
+ * Cleaning the d/patches directory
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+ Repository-Browse.
+
+ -- Pierre Gruet <pgt at debian.org> Wed, 03 Nov 2021 14:27:59 +0100
+
sbt-launcher-interface (1.0.1-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -4,16 +4,17 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Frédéric Bonnard <frediz at linux.vnet.ibm.com>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
ivy,
javahelper,
maven-repo-helper,
scala
-Standards-Version: 4.2.1
+Standards-Version: 4.6.0
Vcs-Git: https://salsa.debian.org/java-team/sbt-launcher-interface.git
Vcs-Browser: https://salsa.debian.org/java-team/sbt-launcher-interface
-Homepage: http://www.scala-sbt.org
+Homepage: https://www.scala-sbt.org
+Rules-Requires-Root: no
Package: libsbt-launcher-interface-java
Architecture: all
=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: launcher
Source: https://github.com/sbt/launcher
=====================================
debian/patches/ivy_2.5.0_classes.patch
=====================================
@@ -0,0 +1,29 @@
+Description: modifying Update.scala to account for the changes of classes in
+ ivy 2.5.0.
+Author: Pierre Gruet <pgt at debian.org>
+Bug-Debian: https://bugs.debian.org/980612
+Forwarded: not-needed
+Last-Update: 2021-11-03
+
+--- a/launcher-implementation/src/main/scala/xsbt/boot/Update.scala
++++ b/launcher-implementation/src/main/scala/xsbt/boot/Update.scala
+@@ -187,7 +187,7 @@
+ private def excludeRule(organization: String, name: String): ExcludeRule =
+ {
+ val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "*", "*")
+- val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, java.util.Collections.emptyMap[AnyRef, AnyRef])
++ val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, java.util.Collections.emptyMap[String, String])
+ rule.addConfiguration(DefaultIvyConfiguration)
+ rule
+ }
+@@ -230,8 +230,8 @@
+ problem.printStackTrace(logWriter)
+ }
+ }
+- private final class ArtifactFilter(f: IArtifact => Boolean) extends Filter {
+- def accept(o: Any) = o match { case a: IArtifact => f(a); case _ => false }
++ private final class ArtifactFilter(f: IArtifact => Boolean) extends Filter[IArtifact] {
++ def accept(o: IArtifact) = o match { case a: IArtifact => f(a); case _ => false }
+ }
+ /** Retrieves resolved dependencies using the given target to determine the location to retrieve to. */
+ private def retrieve(eventManager: EventManager, module: ModuleDescriptor, target: UpdateTarget, autoScalaVersion: Option[String]) {
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
+#base-on-scala211.patch
#upgrade-proguard-to-work-with-java-1.8.patch
#use-latest-sbt.patch
+ivy_2.5.0_classes.patch
=====================================
debian/patches/upgrade-proguard-to-work-with-java-1.8.patch
=====================================
@@ -2,6 +2,7 @@ Description: Fix proguard failure
When running proguard with optimization and using Java 1.8, proguard fails. So
we're just disabling optimization and other stuff for now.
Author: Frederic Bonnard <frediz at linux.vnet.ibm.com>
+Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/project/Proguard.scala
=====================================
debian/patches/use-latest-sbt.patch
=====================================
@@ -2,6 +2,7 @@ Description: Use latest sbt version
sbt launcher is used by sbt and we're in the process of building sbt so, let's
use the sbt that is just before and available.
Author: Frederic Bonnard <frediz at linux.vnet.ibm.com>
+Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/project/build.properties
=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/sbt/launcher/issues
+Bug-Submit: https://github.com/sbt/launcher/issues/new
+Repository: https://github.com/sbt/launcher.git
+Repository-Browse: https://github.com/sbt/launcher
View it on GitLab: https://salsa.debian.org/java-team/sbt-launcher-interface/-/compare/0f99eaf983692cb580aa72064dd9ea454f53f1eb...f89b12a838ab5b0c69c99efb3578d7362c0296c6
--
View it on GitLab: https://salsa.debian.org/java-team/sbt-launcher-interface/-/compare/0f99eaf983692cb580aa72064dd9ea454f53f1eb...f89b12a838ab5b0c69c99efb3578d7362c0296c6
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/20211103/dec3de5f/attachment.htm>
More information about the pkg-java-commits
mailing list