From fa4c2e3c369bd9b2a458626f801d7be07fb34a8f Mon Sep 17 00:00:00 2001 From: Alan Parkinson Date: Sun, 5 Jan 2014 21:51:36 +0000 Subject: [PATCH 1/2] Fixed lintian error 'file-in-etc-not-marked-as-conffile' for Upstart and SystemV files --- .../sbt/packager/archetypes/JavaServerApplication.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala index 7cebe30fb..0b79ea888 100644 --- a/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala +++ b/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala @@ -61,7 +61,7 @@ object JavaServerAppPackaging { for { s <- script.toSeq - } yield LinuxPackageMapping(Seq(s -> path)).withPerms(permissions) + } yield LinuxPackageMapping(Seq(s -> path)).withPerms(permissions).withConfig() }, // TODO should we specify daemonGroup in configs? linuxPackageMappings in Debian <+= (normalizedName, defaultLinuxLogsLocation, target in Debian, daemonUser in Debian) map { From facd5e3e72309a5142dc5e83554200ea4d360be0 Mon Sep 17 00:00:00 2001 From: Alan Parkinson Date: Mon, 6 Jan 2014 00:26:15 +0000 Subject: [PATCH 2/2] Fixed lintian warning 'symlink-should-be-relative' for the symlinks between /usr/bin/.. and /usr/share//bin/.. files --- .../com/typesafe/sbt/packager/GenericPackageSettings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala b/src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala index f9e7d0e9c..80a8b5868 100644 --- a/src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala +++ b/src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala @@ -88,7 +88,7 @@ trait GenericPackageSettings if !file.isDirectory if name startsWith "bin/" if !(name endsWith ".bat") // IGNORE windows-y things. - } yield LinuxSymlink("/usr/" + name, installLocation+"/"+pkg+"/"+name) + } yield LinuxSymlink("/usr/" + name, installLocation.stripPrefix("/usr/")+"/"+pkg+"/"+name) }, // Map configuration files linuxPackageSymlinks <++= (normalizedName in Universal, mappings in Universal, defaultLinuxInstallLocation) map { (pkg, mappings, installLocation) =>