Skip to content

Commit 5f4ced3

Browse files
committed
Merge pull request #700 from kardapoltsev/wip/fix-default-jdeb-dependencies
Removed default-jre | java6-runtime dependency in jdeb packaging
2 parents 301dea4 + 8eb0352 commit 5f4ced3

File tree

5 files changed

+32
-4
lines changed

5 files changed

+32
-4
lines changed

src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ object JDebPackaging extends AutoPlugin with DebianPluginLike {
8888
fileAndDirectoryProducers(mappings, targetDir) ++ linkProducers(symlinks),
8989
conffileProducers(mappings, targetDir)
9090
)
91+
debMaker setDepends ""
9192
debMaker setDeb debianFile
9293
debMaker setControl (targetDir / Names.Debian)
9394

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
enablePlugins(JavaServerAppPackaging, JDebPackaging)
2+
3+
name := "debian-test"
4+
5+
version := "0.1.0"
6+
7+
maintainer := "Josh Suereth <[email protected]>"
8+
9+
packageSummary := "Test debian package"
10+
11+
packageDescription := """A fun package description of our software,
12+
with multiple lines."""
13+
14+
debianPackageDependencies in Debian := Seq()
15+
16+
TaskKey[Unit]("check-dependencies") <<= (target, streams) map { (target, out) =>
17+
val extracted = target / "extracted"
18+
Seq("dpkg-deb", "-R", (target / "debian-test_0.1.0_all.deb").absolutePath, extracted.absolutePath).!
19+
20+
val control = IO.read(extracted / "DEBIAN" / "control")
21+
assert(!control.contains("Depends:"))
22+
23+
out.log.success("Successfully tested systemV control files")
24+
()
25+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Run the debian packaging.
2+
$ mkdir src/resources/empty
3+
> debian:package-bin
4+
$ exists target/debian-test_0.1.0_all.deb
5+
> check-dependencies

src/sphinx/formats/debian.rst

-4
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ If you want to use the java based implementation, enable the following plugin.
7272
7373
enablePlugins(JDebPackaging)
7474
75-
Note that JDeb will add `default-jre` and `java6-runtime` as dependencies if
76-
they are not explicitly specified using ``debianPackageDependencies`` (
77-
`jdeb#208 <https://github.com/tcurdt/jdeb/issues/208>`_).
78-
7975
0.8 or lower
8076
~~~~~~~~~~~~
8177

0 commit comments

Comments
 (0)