From 86d7dfa8dae0b53866462ce8e737309a40436402 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 25 Jun 2012 23:56:15 -0700 Subject: 1. Change these to be templates where possible. 2. Rename to be a debian subdir, matching the redhat subdir. --- packages/debian.trunk/changelog | 5 ---- packages/debian.trunk/compat | 1 - packages/debian.trunk/control | 31 ------------------------- packages/debian.trunk/copyright | 51 ----------------------------------------- packages/debian.trunk/dirs | 5 ---- packages/debian.trunk/pycompat | 1 - packages/debian.trunk/rules | 27 ---------------------- packages/debian/changelog | 5 ++++ packages/debian/compat | 1 + packages/debian/control | 29 +++++++++++++++++++++++ packages/debian/copyright | 51 +++++++++++++++++++++++++++++++++++++++++ packages/debian/dirs | 5 ++++ packages/debian/pycompat | 1 + packages/debian/rules | 27 ++++++++++++++++++++++ 14 files changed, 119 insertions(+), 121 deletions(-) delete mode 100644 packages/debian.trunk/changelog delete mode 100644 packages/debian.trunk/compat delete mode 100644 packages/debian.trunk/control delete mode 100644 packages/debian.trunk/copyright delete mode 100644 packages/debian.trunk/dirs delete mode 100644 packages/debian.trunk/pycompat delete mode 100755 packages/debian.trunk/rules create mode 100644 packages/debian/changelog create mode 100644 packages/debian/compat create mode 100644 packages/debian/control create mode 100644 packages/debian/copyright create mode 100644 packages/debian/dirs create mode 100644 packages/debian/pycompat create mode 100755 packages/debian/rules diff --git a/packages/debian.trunk/changelog b/packages/debian.trunk/changelog deleted file mode 100644 index a36d00d6..00000000 --- a/packages/debian.trunk/changelog +++ /dev/null @@ -1,5 +0,0 @@ -cloud-init (VERSION~REVNO-1) UNRELEASED; urgency=low - - * build - - -- Scott Moser Fri, 16 Dec 2011 11:50:25 -0500 diff --git a/packages/debian.trunk/compat b/packages/debian.trunk/compat deleted file mode 100644 index 7ed6ff82..00000000 --- a/packages/debian.trunk/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/packages/debian.trunk/control b/packages/debian.trunk/control deleted file mode 100644 index f0dcef6a..00000000 --- a/packages/debian.trunk/control +++ /dev/null @@ -1,31 +0,0 @@ -Source: cloud-init -Section: admin -Priority: extra -Maintainer: Scott Moser -Build-Depends: cdbs, - debhelper (>= 5.0.38), - python (>= 2.6.6-3~), - python-nose, - pyflakes, - pylint, - python-mocker, -XS-Python-Version: all -Standards-Version: 3.9.3 - -Package: cloud-init -Architecture: all -Depends: cloud-utils, - procps, - python, - python-boto (>=2.0), - python-cheetah, - python-configobj, - python-oauth, - python-software-properties, - python-yaml, - ${misc:Depends}, - ${python:Depends} -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. diff --git a/packages/debian.trunk/copyright b/packages/debian.trunk/copyright deleted file mode 100644 index dc993525..00000000 --- a/packages/debian.trunk/copyright +++ /dev/null @@ -1,51 +0,0 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: cloud-init -Maintainer: Scott Moser -Source: https://launchpad.net/cloud-init - -This package was debianized by Soren Hansen on -Thu, 04 Sep 2008 12:49:15 +0200 as ec2-init. It was later renamed to -cloud-utils by Scott Moser - -Upstream Author: Scott Moser - Soren Hansen - Chuck Short - -Copyright: 2010, Canonical Ltd. -License: GPL-3 - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License version 3, as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - The complete text of the GPL version 3 can be seen in - /usr/share/common-licenses/GPL-3. - -Files: cloudinit/boto_utils.py -Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/ -License: MIT - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, dis- - tribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the fol- - lowing conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- - ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT - SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - IN THE SOFTWARE. diff --git a/packages/debian.trunk/dirs b/packages/debian.trunk/dirs deleted file mode 100644 index f3de468d..00000000 --- a/packages/debian.trunk/dirs +++ /dev/null @@ -1,5 +0,0 @@ -var/lib/cloud -usr/bin -etc/init -usr/share/doc/cloud -etc/cloud diff --git a/packages/debian.trunk/pycompat b/packages/debian.trunk/pycompat deleted file mode 100644 index 0cfbf088..00000000 --- a/packages/debian.trunk/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/packages/debian.trunk/rules b/packages/debian.trunk/rules deleted file mode 100755 index a907b594..00000000 --- a/packages/debian.trunk/rules +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/make -f - -DEB_PYTHON2_MODULE_PACKAGES = cloud-init - -binary-install/cloud-init::cloud-init-fixups - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk - -DEB_DH_INSTALL_SOURCEDIR := debian/tmp - -cloud-init-fixups: - install -d $(DEB_DESTDIR)/etc/rsyslog.d - cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf - -# You only need to run this immediately after checking out the package from -# revision control. -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572204 -quilt-setup: - @[ ! -d .pc ] || { echo ".pc exists. remove it and re-run to start fresh"; exit 1; } - set -e; for patch in $$(quilt series | tac); do \ - patch -p1 -R --no-backup-if-mismatch <"debian/patches/$$patch"; \ - done - quilt push -a - -.PHONY: quilt-setup - diff --git a/packages/debian/changelog b/packages/debian/changelog new file mode 100644 index 00000000..ac5bcf98 --- /dev/null +++ b/packages/debian/changelog @@ -0,0 +1,5 @@ +cloud-init ({{version}}~{{revision}}-1) UNRELEASED; urgency=low + + * build + + -- Scott Moser Fri, 16 Dec 2011 11:50:25 -0500 diff --git a/packages/debian/compat b/packages/debian/compat new file mode 100644 index 00000000..7ed6ff82 --- /dev/null +++ b/packages/debian/compat @@ -0,0 +1 @@ +5 diff --git a/packages/debian/control b/packages/debian/control new file mode 100644 index 00000000..e00901af --- /dev/null +++ b/packages/debian/control @@ -0,0 +1,29 @@ +Source: cloud-init +Section: admin +Priority: extra +Maintainer: Scott Moser +Build-Depends: cdbs, + debhelper (>= 5.0.38), + python (>= 2.6.6-3~), + python-nose, + pyflakes, + pylint, + python-mocker, +XS-Python-Version: all +Standards-Version: 3.9.3 + +Package: cloud-init +Architecture: all +Depends: cloud-utils, + procps, + python, +{{for r in requires}} + {{r}}, +{{endfor}} + python-software-properties, + ${misc:Depends}, + ${python:Depends} +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. diff --git a/packages/debian/copyright b/packages/debian/copyright new file mode 100644 index 00000000..dc993525 --- /dev/null +++ b/packages/debian/copyright @@ -0,0 +1,51 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: cloud-init +Maintainer: Scott Moser +Source: https://launchpad.net/cloud-init + +This package was debianized by Soren Hansen on +Thu, 04 Sep 2008 12:49:15 +0200 as ec2-init. It was later renamed to +cloud-utils by Scott Moser + +Upstream Author: Scott Moser + Soren Hansen + Chuck Short + +Copyright: 2010, Canonical Ltd. +License: GPL-3 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License version 3, as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + The complete text of the GPL version 3 can be seen in + /usr/share/common-licenses/GPL-3. + +Files: cloudinit/boto_utils.py +Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/ +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, dis- + tribute, sublicense, and/or sell copies of the Software, and to permit + persons to whom the Software is furnished to do so, subject to the fol- + lowing conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- + ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT + SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. diff --git a/packages/debian/dirs b/packages/debian/dirs new file mode 100644 index 00000000..f3de468d --- /dev/null +++ b/packages/debian/dirs @@ -0,0 +1,5 @@ +var/lib/cloud +usr/bin +etc/init +usr/share/doc/cloud +etc/cloud diff --git a/packages/debian/pycompat b/packages/debian/pycompat new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/packages/debian/pycompat @@ -0,0 +1 @@ +2 diff --git a/packages/debian/rules b/packages/debian/rules new file mode 100755 index 00000000..a907b594 --- /dev/null +++ b/packages/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +DEB_PYTHON2_MODULE_PACKAGES = cloud-init + +binary-install/cloud-init::cloud-init-fixups + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk + +DEB_DH_INSTALL_SOURCEDIR := debian/tmp + +cloud-init-fixups: + install -d $(DEB_DESTDIR)/etc/rsyslog.d + cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf + +# You only need to run this immediately after checking out the package from +# revision control. +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572204 +quilt-setup: + @[ ! -d .pc ] || { echo ".pc exists. remove it and re-run to start fresh"; exit 1; } + set -e; for patch in $$(quilt series | tac); do \ + patch -p1 -R --no-backup-if-mismatch <"debian/patches/$$patch"; \ + done + quilt push -a + +.PHONY: quilt-setup + -- cgit v1.2.3