[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, bpo-lenny, updated. debian/2.1.6-1-8-g8c7c4d3

[Iustin Pop]

The following commit has been merged in the bpo-lenny branch:
commit e90aa5f98271998fe055312a3267649cf75807fe
Merge: e4373e90f0e88537f5d46fd9281e93a7f8bcb1c2 e2d377f9d1460fd239cdbdc8e7f524e11977b6cf
Author: Iustin Pop <iustin at debian.org>
Date:   Sun Aug 22 22:05:29 2010 +0200

    Merge branch 'master' into bpo-lenny
    
    Conflicts:
    	debian/changelog (trivial, merged the two changelogs)

diff --combined debian/changelog
index e47f457,9946b15..494d0bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,26 +1,33 @@@
+ ganeti (2.1.6-1) unstable; urgency=low
+ 
+   * New upstream version(s)
+   * Standard version 3.9.0 (no changes needed)
+ 
+  -- Iustin Pop <iustin at debian.org>  Sat, 17 Jul 2010 19:18:07 +0200
+ 
+ ganeti (2.1.2.1-2) unstable; urgency=low
+ 
+   * Ship the defaults file provided by upstream (Closes: #579452)
+   * Fix debian/rules clean target
+ 
+  -- Iustin Pop <iustin at debian.org>  Thu, 27 May 2010 00:24:33 +0200
+ 
+ ganeti (2.1.2.1-1) unstable; urgency=low
+ 
+   * New upstream version
+   * Remove a number of patches, integrated upstream (watcher hooks, check-man,
+     cfgupgrade12)
+   * Update recommends for new sid versions and package names
+ 
+  -- Iustin Pop <iustin at debian.org>  Sun, 23 May 2010 23:46:38 +0200
+ 
 +ganeti (2.1.1-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports
 +  * Add the debian/source/format file (1.0)
 +
 + -- Iustin Pop <iustin at debian.org>  Sat, 22 May 2010 14:12:15 +0200
 +
  ganeti (2.1.1-1) unstable; urgency=low
  
    * New upstream version
@@@ -28,12 -44,6 +51,12 @@@ ganeti (2.0.6-2) unstable; urgency=lo
  
   -- Iustin Pop <iustin at debian.org>  Thu, 11 Mar 2010 19:22:17 +0100
  
 +ganeti (2.0.6-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports (revert to source format 1.0)
 +
 + -- Iustin Pop <iustin at debian.org>  Mon, 01 Mar 2010 14:38:21 +0100
 +
  ganeti (2.0.6-1) unstable; urgency=low
  
    * New upstream version (Closes: #568105, thanks Elmar Hoffmann!)
diff --combined debian/control
index 2734108,371d7eb..5bece15
--- a/debian/control
+++ b/debian/control
@@@ -3,10 -3,10 +3,10 @@@ Section: admi
  Priority: extra
  Maintainer: Debian Ganeti Team <pkg-ganeti-devel at lists.alioth.debian.org>
  Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iustin at debian.org>
 -Build-Depends: debhelper (>= 7)
 +Build-Depends: debhelper (>= 7), quilt
  Build-Depends-Indep: python-simplejson, python-pyparsing, python-openssl,
   python-support (>= 0.6), socat, python-pyinotify
- Standards-Version: 3.8.4
+ Standards-Version: 3.9.0
  Homepage: http://code.google.com/p/ganeti/
  Vcs-Browser: http://git.debian.org/?p=pkg-ganeti/ganeti.git
  Vcs-Git: git://git.debian.org/pkg-ganeti/ganeti.git
@@@ -18,8 -18,9 +18,9 @@@ Depends: ${shlibs:Depends}, ${misc:Depe
   openssh-client, openssh-server, bridge-utils, iproute, iputils-arping,
   openssl, python-simplejson, python-pyparsing, python-openssl, python-pyinotify,
   socat, libjs-jquery
- Recommends: drbd8-utils (>= 8.0.7), kvm | xen-linux-system-2.6.26-2-xen-amd64 |
-  xen-linux-system-2.6.26-2-xen-686, ganeti-instance-debootstrap
+ Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
+  xen-linux-system-2.6.32-5-xen-amd64 | xen-linux-system-2.6.32-5-xen-686,
+  ganeti-instance-debootstrap
  Suggests: drbd8-module-source (>= 8.0.7)
  Provides: ${python:Provides}
  Description: Cluster-based virtualization management software
diff --combined debian/rules
index b570731,016ad43..2d469a8
--- a/debian/rules
+++ b/debian/rules
@@@ -6,10 -6,8 +6,10 @@@
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
  
 +include /usr/share/quilt/quilt.make
 +
  build: build-stamp
 -build-stamp:
 +build-stamp: $(QUILT_STAMPFN)
  	dh_testdir
  
  	# Add here commands to compile the package.
@@@ -26,17 -24,20 +26,20 @@@
  
  	touch $@
  
 -clean:
 +clean: unpatch
  	dh_testdir
  	dh_testroot
  	rm -f build-stamp
  
  	# Add here commands to clean up after the build process.
  	#$(MAKE) clean
- 	#$(MAKE) distclean
+ 	[ ! -f Makefile ] || $(MAKE) distclean
+ 	# this is not removed by make distclean :(
+ 	rm -f ganeti
  
- 	rm -f debian/ganeti2.init
+ 	rm -f debian/ganeti2.ganeti.init
  	rm -f debian/ganeti2.ganeti.cron.d
+ 	rm -f debian/ganeti2.ganeti.default
  
  	dh_clean
  
@@@ -50,6 -51,7 +53,7 @@@ install: buil
  	$(MAKE) install DESTDIR=$(CURDIR)/debian/`dh_listpackages`
  	cp $(CURDIR)/doc/examples/ganeti.initd $(CURDIR)/debian/ganeti2.ganeti.init
  	cp $(CURDIR)/doc/examples/ganeti.cron $(CURDIR)/debian/ganeti2.ganeti.cron.d
+ 	cp $(CURDIR)/doc/examples/ganeti.default $(CURDIR)/debian/ganeti2.ganeti.default
  	# No longer needed with ganeti 2.1
  	#mv $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti2
  	install -m 0755 $(CURDIR)/doc/examples/dumb-allocator \

-- 
Ganeti packaging