please merge docker.io from debian

Thanks! Changes are minor, intended for a freeze exception, regression
potential is minimal!
On Jan 4, 2015 6:20 AM, "LocutusOfBorg" <email address hidden>
wrote:

> ** Attachment added: "debdiff"
>
> https://bugs.launchpad.net/ubuntu/+source/docker.io/+bug/1407408/+attachment/4291913/+files/debdiff
>
> --
> You received this bug notification because you are a member of Docker
> Ubuntu Maintainers, which is subscribed to docker.io in Ubuntu.
> https://bugs.launchpad.net/bugs/1407408
>
> Title:
> please merge docker.io from debian
>
> Status in docker.io package in Ubuntu:
> New
>
> Bug description:
> .
>
> To manage notifications about this bug go to:
>
> https://bugs.launchpad.net/ubuntu/+source/docker.io/+bug/1407408/+subscriptions
>

Yes, Paul, thanks for the feedback!

However I'm confused about this commit

http://anonscm.debian.org/cgit/docker/docker.io.git/commit/?id=71be0e3cf56cf7718a574c1a6524f364b07f5a46

shouldn't the override also call the clean?

override_dh_auto_clean:
 # bundles is created by hack/make.sh
 # docs/man/man*/ is created by docs/man/md2man-all.sh
 rm -rf bundles docs/man/man*/

I would like to see dh_auto_clean at the end...

Yeah, you're right - that looks like an oversight, I missed looking
closely. I think it's not a super huge deal, since this covers all
upstream artifacts (we don't have a standard build process -- so
auto_clean isn't doing anything right now)

Worth fixing for sure, but I don't think it'll lead to bugs as far as I can see

On Mon, Jan 5, 2015 at 9:49 AM, LocutusOfBorg
<email address hidden> wrote:
> Yes, Paul, thanks for the feedback!
>
> However I'm confused about this commit
>
> http://anonscm.debian.org/cgit/docker/docker.io.git/commit/?id=71be0e3cf56cf7718a574c1a6524f364b07f5a46
>
> shouldn't the override also call the clean?
>
> override_dh_auto_clean:
> # bundles is created by hack/make.sh
> # docs/man/man*/ is created by docs/man/md2man-all.sh
> rm -rf bundles docs/man/man*/
>
> I would like to see dh_auto_clean at the end...
>
> --
> You received this bug notification because you are a member of Docker
> Ubuntu Maintainers, which is subscribed to docker.io in Ubuntu.
> https://bugs.launchpad.net/bugs/1407408
>
> Title:
> please merge docker.io from debian
>
> Status in docker.io package in Ubuntu:
> New
>
> Bug description:
> .
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/ubuntu/+source/docker.io/+bug/1407408/+subscriptions

--
All programmers are playwrights, and all computers are lousy actors.

#define sizeof(x) rand()
:wq

Paul can't take all the credit for that being missing. :)

I left it out because we leave out "dh_auto_build" in our
"override_dh_auto_build", so I figured whatever future behavior
"dh_auto_clean" might include we probably want to choose to include
here manually, since the "Docker build system" likely won't ever be
one debhelper automatically detects.

Thanks for your contribution! However, there is a small issue in debian/changelog: Merge-o-Matic adds a blank line at the end of that file.

@@ -216,3 +273,4 @@
     alteholz.

  -- Paul Tagliamonte <email address hidden> Tue, 07 Jan 2014 21:06:10 -0500
+

It's a bug in MoM and you have to delete that line if exists. I done that already and I'm uploading your merge.

This bug was fixed in the package docker.io - 1.3.3~dfsg1-2ubuntu1

---------------
docker.io (1.3.3~dfsg1-2ubuntu1) vivid; urgency=low

  * Merge from Debian unstable (LP: #1407408). Remaining changes:
    - d/p/sync-apparmor-with-lxc.patch: Update AppArmor policy to be
      in sync with LXC.
 -- Gianfranco Costamagna <email address hidden> Sun, 04 Jan 2015 12:06:00 +0100

Thanks for the merge and the hint!

You're welcome. Go ahead and keep going!