diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-06-20 16:24:24 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-06-20 16:24:24 -0400 |
| commit | 25403168cea7b0ece56bc98a0b3ed05043182c91 (patch) | |
| tree | 502141445529815e1aceb625444d101d9b9c5fd1 | |
| parent | eeb7328ddb83e26b1163d2d40590498a971397c5 (diff) | |
| download | vyos-cloud-init-25403168cea7b0ece56bc98a0b3ed05043182c91.tar.gz vyos-cloud-init-25403168cea7b0ece56bc98a0b3ed05043182c91.zip | |
update tools/bddeb and debian.trunk packaging
* debian.trunk/changelog: increase debian version to '1' to avoid lintian
error
* debian.trunk/control: bump standards version
* debian.trunk/rules: remove cloud-init-run-module symlink (been deprecated
for some time)
* tools/bddeb: read version from ChangeLog rather than setup.py
| -rw-r--r-- | debian.trunk/changelog | 2 | ||||
| -rw-r--r-- | debian.trunk/control | 2 | ||||
| -rwxr-xr-x | debian.trunk/rules | 1 | ||||
| -rwxr-xr-x | setup.py | 3 | ||||
| -rwxr-xr-x | tools/bddeb | 6 |
5 files changed, 6 insertions, 8 deletions
diff --git a/debian.trunk/changelog b/debian.trunk/changelog index 53e3678c..a36d00d6 100644 --- a/debian.trunk/changelog +++ b/debian.trunk/changelog @@ -1,4 +1,4 @@ -cloud-init (VERSION~REVNO-0) UNRELEASED; urgency=low +cloud-init (VERSION~REVNO-1) UNRELEASED; urgency=low * build diff --git a/debian.trunk/control b/debian.trunk/control index f2eec1e4..f0dcef6a 100644 --- a/debian.trunk/control +++ b/debian.trunk/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, pylint, python-mocker, XS-Python-Version: all -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Package: cloud-init Architecture: all diff --git a/debian.trunk/rules b/debian.trunk/rules index 19384687..0f79136c 100755 --- a/debian.trunk/rules +++ b/debian.trunk/rules @@ -13,7 +13,6 @@ cloud-init-fixups: for x in $(DEB_DESTDIR)/usr/bin/*.py; do mv "$$x" "$${x%.py}"; done install -d $(DEB_DESTDIR)/etc/rsyslog.d cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf - ln -sf cloud-init-per $(DEB_DESTDIR)/usr/bin/cloud-init-run-module # You only need to run this immediately after checking out the package from # revision control. @@ -70,8 +70,7 @@ setup(name='cloud-init', author_email='scott.moser@canonical.com', url='http://launchpad.net/cloud-init/', packages=find_packages(), - scripts=['bin/cloud-init.py', - 'bin/cloud-init-cfg.py', + scripts=['bin/cloud-init', 'tools/cloud-init-per', ], data_files=[('/etc/cloud', glob('config/*.cfg')), diff --git a/tools/bddeb b/tools/bddeb index 598f71bb..b162b06f 100755 --- a/tools/bddeb +++ b/tools/bddeb @@ -8,8 +8,8 @@ set -e trap "rm -Rf '${TEMP_D}'" exit files=$(bzr ls --versioned) revno=$(bzr revno) -version=$(awk \ - -F= '$1 ~ /version$/ { gsub("[^0-9.]","",$2); print $2; }' setup.py) +version=$(awk -F: \ + '$1 ~ /[0-9][.][0-9]+[.][0-9]+/ { print $1 ; exit(0); }' ChangeLog ) mkdir "${TEMP_D}/cloud-init" otar="$TEMP_D/cloud-init_$version~bzr${revno}.orig.tar.gz" tar -czf - ${files} > "$otar" @@ -25,7 +25,7 @@ debuild "$@" #for x in ../*.deb; do # echo wrote ${x##*/} #done -debname="cloud-init_${version}~bzr${revno}-0_all.deb" +debname="cloud-init_${version}~bzr${revno}-1_all.deb" mv "../$debname" "$start" link="$start/cloud-init_all.deb" echo "wrote $debname" |