debian: move the packaging out into package/$id-$version_id #2709

Merged
merged 8 commits into from Jan 25, 2017

Conversation

Projects
None yet
3 participants
Collaborator

mvo5 commented Jan 25, 2017

This moves the packaging into package/$id-$version_id. It also keeps a compatibility symlink to the current ./debian dir based on the 16.04 packaging. This is to ensure that tools like gbp and autopkgtest continue working. Without a debian/ dir they fail.

mvo5 added some commits Jan 25, 2017

Just one comment. I didn't review the actual changelogs/rules but I trust they are from the 14.04 branch.

generate-packaging-dir
-fi
+# update symlink
+rm -f debian
+ln -s packaging/${ID}-${VERSION_ID} debian
@zyga

zyga Jan 25, 2017

Contributor

I think we should only do this if we're on a debian-like system. Also note that sid has no VERSION_ID so I think we should check for it as well.

@mvo5

mvo5 Jan 25, 2017

Collaborator

I will add FIXMEs - as soon as we add debian or a non-debian system we can fix this script easily.

zyga approved these changes Jan 25, 2017

LGTM

@mvo5 mvo5 added this to the 2.22 milestone Jan 25, 2017

@@ -0,0 +1 @@
+debian/tmp/usr/bin/uboot-go
@chipaca

chipaca Jan 25, 2017

Member

I didn't know about not-installed. Assuming it flags things to not warn about not installing, we might be able to drop a couple of rm's from the override_dh_install rule

@mvo5

mvo5 Jan 25, 2017

Collaborator

Very good point, I think we want a followup with that cleanup.

@mvo5 mvo5 merged commit f75f1eb into snapcore:master Jan 25, 2017

5 of 6 checks passed

yakkety-amd64 autopkgtest finished (failure)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
xenial-amd64 autopkgtest finished (success)
Details
xenial-i386 autopkgtest finished (success)
Details
xenial-ppc64el autopkgtest finished (success)
Details
zesty-amd64 autopkgtest finished (success)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment