[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#772464: unblock: propellor/0.9.1.1 (pre-approval)



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi!

I'd like to upload propellor 0.9.1.1 (version pending approval from Joey
Hess) to testing-proposed-updates to fix #769452, and adopt the package
(#768634). It can't go via unstable, because that has 0.9.2 already,
with unrelated changes.

The source diff is attached.

unblock propellor/0.9.1.1

-- 
|8]

diff --git a/debian/changelog b/debian/changelog
index c580b3b..e1cac4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+propellor (0.9.1.1) testing-proposed-updates; urgency=medium
+
+  [ Joey Hess ]
+  * Docker: Stop using docker.io; that was a compat symlink in
+    the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.
+    (Closes: #769452)
+
+  [ Gergely Nagy ]
+  * New maintainer. (Closes: #768634)
+
+ -- Gergely Nagy <algernon@madhouse-project.org>  Sun, 07 Dec 2014 15:14:05 +0100
+
 propellor (0.9.1) unstable; urgency=medium
 
   * Docker: Add ability to control when containers restart.
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index d9d5f19..5a7a084 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -567,7 +567,7 @@ readIdentFile cid = fromMaybe (error "bad ident in identFile")
 	. readish <$> readFile (identFile cid)
 
 dockercmd :: String
-dockercmd = "docker.io"
+dockercmd = "docker"
 
 report :: [Bool] -> Result
 report rmed

Reply to: