[Pkg-ganeti-commits] r56 - trunk/instance-debootstrap/debian

Mon Jul 7 20:28:32 UTC 2008

Author: iustin-guest
Date: 2008-07-07 20:28:31 +0000 (Mon, 07 Jul 2008)
New Revision: 56

Added:
   trunk/instance-debootstrap/debian/ganeti-instance-debootstrap.dirs
Removed:
   trunk/instance-debootstrap/debian/ganeti-instance-debian-etch.dirs
Modified:
   trunk/instance-debootstrap/debian/changelog
   trunk/instance-debootstrap/debian/compat
   trunk/instance-debootstrap/debian/control
   trunk/instance-debootstrap/debian/copyright
   trunk/instance-debootstrap/debian/rules
Log:
Make the 0.5-1 version of the ganeti-instance-debootstrap

The patch also changes the build system from cdbs to dh, and updates the
policy to the latest, upgrade the debhelper compat level, etc.


Modified: trunk/instance-debootstrap/debian/changelog
===================================================================

--- trunk/instance-debootstrap/debian/changelog	2008-07-07 19:46:03 UTC (rev 55)
+++ trunk/instance-debootstrap/debian/changelog	2008-07-07 20:28:31 UTC (rev 56)
@@ -1,5 +1,5 @@
-ganeti-instance-debian-etch (0.4-1) unstable; urgency=low
+ganeti-instance-debootstrap (0.5-1) unstable; urgency=low
 
   * Initial release. (Closes: #466583)
 
- -- Iustin Pop <iusty at k1024.org>  Tue, 19 Feb 2008 20:19:22 +0100
+ -- Iustin Pop <iusty at k1024.org>  Mon, 07 Jul 2008 17:34:09 +0200

Modified: trunk/instance-debootstrap/debian/compat
===================================================================
--- trunk/instance-debootstrap/debian/compat	2008-07-07 19:46:03 UTC (rev 55)
+++ trunk/instance-debootstrap/debian/compat	2008-07-07 20:28:31 UTC (rev 56)
@@ -1 +1 @@
-5
+7

Modified: trunk/instance-debootstrap/debian/control
===================================================================
--- trunk/instance-debootstrap/debian/control	2008-07-07 19:46:03 UTC (rev 55)
+++ trunk/instance-debootstrap/debian/control	2008-07-07 20:28:31 UTC (rev 56)
@@ -1,20 +1,25 @@
-Source: ganeti-instance-debian-etch
+Source: ganeti-instance-debootstrap
 Section: admin
 Priority: extra
 Maintainer: Debian Ganeti Team <pkg-ganeti-devel at lists.alioth.debian.org>
-Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iusty at k1024.org>, Leonardo Rodrigues de Mello <l at lmello.eu.org>
-Build-Depends: cdbs, debhelper (>= 5)
-Standards-Version: 3.7.3
+Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iusty at k1024.org>,
+    Leonardo Rodrigues de Mello <l at lmello.eu.org>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.0
+Homepage: http://code.google.com/p/ganeti/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ganeti/trunk/instance-debootstrap
+Vcs-Svn: svn://svn.debian.org/pkg-ganeti/trunk/instance-debootstrap
 
-Package: ganeti-instance-debian-etch
+Package: ganeti-instance-debootstrap
 Architecture: all
 Depends: ${misc:Depends}, debootstrap, dump
 Enhances: ganeti
-Description: etch instance OS definition for ganeti
- Ganeti is a virtual server cluster management software tool built on top
- of the Xen virtual machine monitor and other Open Source software. After
- setting it up it will provide you with an automated environment to
- manage highly available virtual machine instances.
+Description: debootstrap-based instance OS definition for ganeti
+ Ganeti is a virtual server cluster management software tool built on
+ top of the Xen virtual machine monitor and other Open Source software.
+ After setting it up it will provide you with an automated environment
+ to manage highly available virtual machine instances.
  .
  This package provides an OS definition for ganeti that will allow
- installation of Debian Etch instances via debootstrap.
+ installation of Debian (and possibly Unbuntu) instances via
+ debootstrap.

Modified: trunk/instance-debootstrap/debian/copyright
===================================================================
--- trunk/instance-debootstrap/debian/copyright	2008-07-07 19:46:03 UTC (rev 55)
+++ trunk/instance-debootstrap/debian/copyright	2008-07-07 20:28:31 UTC (rev 56)
@@ -1,13 +1,14 @@
 This package was debianized by Iustin Pop <iusty at k1024.org> on
 Tue, 19 Feb 2008 19:53:48 +0100.
 
-It was then taken over for official Debian maintenance by the Debian Ganeti Team.
+It was then taken over for official Debian maintenance by the Debian Ganeti
+Team.
 
 It was downloaded from http://code.google.com/p/ganeti/
 
-Upstream Author:	iustinp, ultrotter, schreiberal, amishchenko, roman.marxer, imsnah, vylavera
+Upstream Author: Google Inc
 
-Copyright:  Copyright (C) 2006, 2007 Google Inc.
+Copyright: Copyright (C) 2006, 2007, 2008 Google Inc.
 
 License: GPL
 This  program is free software; you can redistribute it and/or modify
@@ -24,6 +25,9 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  02110-1301, USA.
 
-The Debian packaging is (C) 2007, Debian Ganeti Team
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is (C) 2007, 2008 Debian Ganeti Team
 <pkg-ganeti at lists.alioth.debian.org> and is licensed under the GPL, see
 `/usr/share/common-licenses/GPL'.

Deleted: trunk/instance-debootstrap/debian/ganeti-instance-debian-etch.dirs
===================================================================
--- trunk/instance-debootstrap/debian/ganeti-instance-debian-etch.dirs	2008-07-07 19:46:03 UTC (rev 55)
+++ trunk/instance-debootstrap/debian/ganeti-instance-debian-etch.dirs	2008-07-07 20:28:31 UTC (rev 56)
@@ -1,3 +0,0 @@
-usr/share/ganeti/os/debian-etch
-var/cache/ganeti-instance-debian-etch
-etc/ganeti/instance-debian-etch

Copied: trunk/instance-debootstrap/debian/ganeti-instance-debootstrap.dirs (from rev 52, trunk/instance-debootstrap/debian/ganeti-instance-debian-etch.dirs)
===================================================================
--- trunk/instance-debootstrap/debian/ganeti-instance-debootstrap.dirs	                        (rev 0)
+++ trunk/instance-debootstrap/debian/ganeti-instance-debootstrap.dirs	2008-07-07 20:28:31 UTC (rev 56)
@@ -0,0 +1,3 @@
+usr/share/ganeti/os/debootstrap
+var/cache/ganeti-instance-debootstrap
+etc/default


Property changes on: trunk/instance-debootstrap/debian/ganeti-instance-debootstrap.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: trunk/instance-debootstrap/debian/rules
===================================================================
--- trunk/instance-debootstrap/debian/rules	2008-07-07 19:46:03 UTC (rev 55)
+++ trunk/instance-debootstrap/debian/rules	2008-07-07 20:28:31 UTC (rev 56)
@@ -1,12 +1,25 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# Add here any variable or target overrides you need.
+build: build-stamp
+build-stamp:
+	dh build
+	touch build-stamp
 
-binary-install/ganeti-instance-debian-etch::
-	install --mode 0755 $(CURDIR)/create $(CURDIR)/debian/ganeti-instance-debian-etch/usr/share/ganeti/os/debian-etch/create
-	install --mode 0755 $(CURDIR)/export $(CURDIR)/debian/ganeti-instance-debian-etch/usr/share/ganeti/os/debian-etch/export
-	install --mode 0755 $(CURDIR)/import $(CURDIR)/debian/ganeti-instance-debian-etch/usr/share/ganeti/os/debian-etch/import
-	install --mode 0755 $(CURDIR)/rename $(CURDIR)/debian/ganeti-instance-debian-etch/usr/share/ganeti/os/debian-etch/rename
-	install --mode 0644 $(CURDIR)/ganeti_api_version $(CURDIR)/debian/ganeti-instance-debian-etch/usr/share/ganeti/os/debian-etch/ganeti_api_version
+clean:
+	dh clean
+	rm -f $(CURDIR)/debian/ganeti-instance-debootstrap.default
+
+install: build install-stamp
+install-stamp:
+	cp defaults $(CURDIR)/debian/ganeti-instance-debootstrap.default
+	dh install --until dh_auto_install
+	rm $(CURDIR)/debian/ganeti-instance-debootstrap/usr/share/doc/ganeti-instance-debootstrap/COPYING
+	dh install --after dh_auto_install
+	touch install-stamp
+
+binary-arch: install
+
+binary-indep: install
+	dh binary-indep
+
+binary: binary-arch binary-indep


