File tree Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,15 @@ object ScalaDist {
40
40
mappings in upload += uploadMapping(packageZipTarball in UniversalDocs ).value,
41
41
mappings in upload += uploadMapping(packageXzTarball in UniversalDocs ).value,
42
42
mappings in upload += uploadMapping(packageBin in Rpm ).value,
43
- mappings in upload += uploadMapping(packageBin in Debian ).value
43
+ // Debian needs special handling because the value sbt-native-packager
44
+ // gives us for `packageBin in Debian` (coming from the archiveFilename
45
+ // method) includes the debian version and arch information,
46
+ // which we historically have not included. I don't see a way to
47
+ // override the filename on disk, so we re-map at upload time
48
+ mappings in upload += Def .task {
49
+ (packageBin in Debian ).value ->
50
+ s " scala/ ${version.value}/ ${(name in Debian ).value}- ${version.value}.deb "
51
+ }.value
44
52
)
45
53
46
54
def settings : Seq [Setting [_]] =
Original file line number Diff line number Diff line change @@ -93,10 +93,7 @@ object Unix {
93
93
94
94
linuxPackageMappings in Debian += (packageMapping(
95
95
(sourceDirectory.value / " debian" / " changelog" ) -> " /usr/share/doc/scala/changelog.gz"
96
- ) withUser " root" withGroup " root" withPerms " 0644" gzipped) asDocs(),
97
-
98
- // Hack so we use regular version, rather than debian version.
99
- target in Debian := target.value / s " ${(name in Debian ).value}- ${version.value}"
96
+ ) withUser " root" withGroup " root" withPerms " 0644" gzipped) asDocs()
100
97
101
98
)
102
99
}
You can’t perform that action at this time.
0 commit comments