From 2188dc71be86b6c22d2c5522fb7ce41dee566903 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 5 Aug 2016 16:57:38 -0400 Subject: add debian directory from current yakkety --- debian/control | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 debian/control (limited to 'debian/control') diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..759f7750 --- /dev/null +++ b/debian/control @@ -0,0 +1,67 @@ +Source: cloud-init +Section: admin +Priority: extra +Maintainer: Scott Moser +Build-Depends: debhelper (>= 9), + dh-python, + dh-systemd, + iproute2, + pep8, + po-debconf, + pyflakes, + python3, + python3-configobj, + python3-httpretty, + python3-jinja2, + python3-jsonpatch, + python3-mock, + python3-nose, + python3-oauthlib, + python3-pep8, + python3-prettytable, + python3-pyflakes | pyflakes (<< 1.1.0-2), + python3-requests, + python3-serial, + python3-setuptools, + python3-six, + python3-unittest2, + python3-yaml +XS-Python-Version: all +Standards-Version: 3.9.6 + +Package: cloud-init +Architecture: all +Depends: cloud-guest-utils | cloud-utils, + ifupdown (>= 0.6.10ubuntu5), + procps, + python3, + python3-requests (>= 0.8.2), + ${misc:Depends}, + ${python3:Depends} +Recommends: eatmydata, gdisk, software-properties-common +Provides: ec2-init +Replaces: ec2-init (<<0.5.3) +Conflicts: ec2-init (<<0.5.3) +XB-Python-Version: ${python:Versions} +Description: Init scripts for cloud instances + Cloud instances need special scripts to run during initialisation + to retrieve and install ssh keys and to let the user run various scripts. + +Package: grub-legacy-ec2 +Depends: debconf (>= 1.5.19) | cdebconf, + ucf, + util-linux (>= 2.15-1), + ${misc:Depends} +Conflicts: grub +Suggests: grub-legacy-doc +Architecture: all +Description: Handles update-grub for ec2 instances + EC2 instances that use grub-legacy as a bootloader need a way to keep + /boot/grub/menu.lst up to date while not conflicting with grub-pc. + This package provides that. + +Package: ec2-init +Depends: cloud-init, ${misc:Depends} +Architecture: all +Description: package renamed -> cloud-init + This package has been renamed to 'cloud-init'. -- cgit v1.2.3 From 81731f13d03ab54b6a31d6e949c46589f0ad6c6d Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 5 Aug 2016 17:01:49 -0400 Subject: debian/control: update Standards-Version to 3.9.8 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 759f7750..6d221cc3 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 9), python3-unittest2, python3-yaml XS-Python-Version: all -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Package: cloud-init Architecture: all -- cgit v1.2.3 From 638f0183265f7345656075d997963de75c0bd1dd Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 19 Aug 2016 12:06:42 -0400 Subject: debian/control: drop very old meta-package ec2-init --- debian/control | 9 --------- 1 file changed, 9 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 6d221cc3..c3e5447d 100644 --- a/debian/control +++ b/debian/control @@ -39,9 +39,6 @@ Depends: cloud-guest-utils | cloud-utils, ${misc:Depends}, ${python3:Depends} Recommends: eatmydata, gdisk, software-properties-common -Provides: ec2-init -Replaces: ec2-init (<<0.5.3) -Conflicts: ec2-init (<<0.5.3) XB-Python-Version: ${python:Versions} Description: Init scripts for cloud instances Cloud instances need special scripts to run during initialisation @@ -59,9 +56,3 @@ Description: Handles update-grub for ec2 instances EC2 instances that use grub-legacy as a bootloader need a way to keep /boot/grub/menu.lst up to date while not conflicting with grub-pc. This package provides that. - -Package: ec2-init -Depends: cloud-init, ${misc:Depends} -Architecture: all -Description: package renamed -> cloud-init - This package has been renamed to 'cloud-init'. -- cgit v1.2.3 From f0e9dcce1b7ac248fcadf5576e63cee92f0e578e Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 24 Aug 2016 10:46:35 -0400 Subject: debian/control, debian/README.source: update to reference git. --- debian/README.source | 50 +++++++++++++++----------------------------------- debian/control | 2 ++ 2 files changed, 17 insertions(+), 35 deletions(-) (limited to 'debian/control') diff --git a/debian/README.source b/debian/README.source index 5e4319fb..86bcf530 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,43 +1,23 @@ === General Info === -Development packaging branch is at - lp:ubuntu//cloud-init -alternatively, if you're on the development release: - lp:ubuntu/cloud-init +Packaging branches for the Ubuntu development release are maintained in +upstream git under ubuntu/devel branch. -Patches in debian/patches are also stored applied in bzr. + git clone git://git.launchpad.net/cloud-init -b ubuntu/devel -To cherry pick revisions 391 to tip from from trunk, do something like: - s=391; e=; - b=../trunk; - [ -n "${e}" ] || e=$(cd ${b} && bzr revno) - pfile=catchup-${s}${e:+-${e}}.patch - [ "$s" = "$e" ] && pfile=catchup-${s}.patch - ( cd ../trunk && bzr log -r$s..$e && - bzr diff -p1 -r$(($s-1))..$e ) > ../$pfile.full - mkdir -p debian/patches - filterdiff --exclude "*/ChangeLog" < ../$pfile.full > debian/patches/$pfile - echo "$pfile" >> debian/patches/series - quilt push - quilt refresh - files="$(quilt files ${pfile}) debian/patches/series debian/patches/${pfile}" - files="$files .pc/${pfile} .pc/applied-patches" - bzr add $files +Stable release branches are also available in ubuntu/ + $ git clone git://git.launchpad.net/cloud-init + $ cd cloud-init + $ git branch -r + origin/HEAD -> origin/master + origin/master + origin/ubuntu/devel + origin/ubuntu/precise + origin/ubuntu/trusty + origin/ubuntu/xenial - # now add an entry - dch --append "${pfile} (sync to $e)" - dch --edit # improve the entry - debcommit $files - - ../$pfile.full will have the full diff. See 'ChangeLog' entries there - and debian/patches/$pfile for help writing debian/changelog entry - -You can set 'e' (end) to not go to tip. - -== Cherry pick single patch == -There is a utility in debian/cherry-pick-rev that will -help to cherry pick a single commit from trunk. +Patches in debian/patches are stored un-applied. == New snapshot == -To pull a new upstream snapshot, given lp:cloud-init in ../trunk: +To pull a new upstream snapshot: ./debian/new-upstream-snapshot ../trunk diff --git a/debian/control b/debian/control index c3e5447d..e9926e40 100644 --- a/debian/control +++ b/debian/control @@ -27,6 +27,8 @@ Build-Depends: debhelper (>= 9), python3-unittest2, python3-yaml XS-Python-Version: all +Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel +Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel Standards-Version: 3.9.8 Package: cloud-init -- cgit v1.2.3 From 77b7d7cf922a06360065d6787681f3b2dd8ac29b Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 9 Sep 2016 21:21:17 -0400 Subject: debian/control: fix missing dependency on python3-serial Add python3-serial to Depends. This is not resolved by ${python3:Depends} because it is commented out in requirements.txt. pyserial is problematic both because it is not pure python and because it is not available for python2.6. The commit 26ea813d2 removed pyserial and thus lost the automatic dependency. This makes SmartOS datasource work. --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index e9926e40..10b8370d 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,7 @@ Depends: cloud-guest-utils | cloud-utils, procps, python3, python3-requests (>= 0.8.2), + python3-serial, ${misc:Depends}, ${python3:Depends} Recommends: eatmydata, gdisk, software-properties-common -- cgit v1.2.3