[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, bpo-lenny, updated. debian/2.1.1-1-6-ge4373e9

[Iustin Pop]

The following commit has been merged in the bpo-lenny branch:
commit 0a88873ebebca0718c91cf4ad2d11ce1a9d4064c
Merge: ed6a95f9256f177bab742b65061e70a8c88e3454 7fef7257fcb2fd40679ad1a8d068a5d589591109
Author: Iustin Pop <iustin at debian.org>
Date:   Sat May 22 13:43:58 2010 +0200

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

diff --combined debian/changelog
index bc5a7c0,e781fbf..513fd6d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,32 @@@
+ ganeti (2.1.1-1) unstable; urgency=low
+ 
+   * New upstream version
+   * Remove patches imported upstream
+   * Import cfgupgrade12 from upstream git
+   * Add patch to remove old ssconf file on upgrade
+   * Import a new patch for check-man issues
+   * Import watcher warnings patch from upstream
+   * Update doc-base for 2.1's sphinx documentation
+   * Replace embedded jquery with external dependency
+   * Update NEWS file for 1.2 to 2.1 upgrade
+ 
+  -- Iustin Pop <iustin at debian.org>  Sat, 17 Apr 2010 21:36:59 +0200
+ 
+ ganeti (2.0.6-2) unstable; urgency=low
+ 
+   * Cherry-pick three patches from upstream:
+   * Fix two potentially endless loops in http library
+   * KVM: Fix unintended qemu-level bridging of nics
+   * Fix python 2.6.5 compatibility
+ 
+  -- 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 9beef80,b49b6b6..2734108
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,9 +3,9 @@@ 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)
+ Build-Depends-Indep: python-simplejson, python-pyparsing, python-openssl,
+  python-support (>= 0.6), socat, python-pyinotify
  Standards-Version: 3.8.4
  Homepage: http://code.google.com/p/ganeti/
  Vcs-Browser: http://git.debian.org/?p=pkg-ganeti/ganeti.git
@@@ -13,8 -14,12 +14,12 @@@ Vcs-Git: git://git.debian.org/pkg-ganet
  Package: ganeti2
  Architecture: all
  Conflicts: ganeti
- Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2, openssh-client, openssh-server, bridge-utils, iproute, iputils-arping, openssl, python-simplejson, python-pyparsing, python-openssl, socat
- 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
+ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
+  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
  Suggests: drbd8-module-source (>= 8.0.7)
  Provides: ${python:Provides}
  Description: Cluster-based virtualization management software
diff --combined debian/rules
index 27f82d1,408b9ce..b570731
--- 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.
@@@ -22,11 -20,11 +22,11 @@@
  	  --with-os-search-path=/srv/ganeti/os,/usr/local/lib/ganeti/os,/usr/lib/ganeti/os,/usr/share/ganeti/os \
  	  --docdir=/usr/share/doc/ganeti2
  
- 	#$(MAKE)
+ 	$(MAKE)
  
  	touch $@
  
 -clean:
 +clean: unpatch
  	dh_testdir
  	dh_testroot
  	rm -f build-stamp
@@@ -50,13 -48,18 +50,18 @@@ 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
- 	mv $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti2
+ 	# 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 \
  	  $(CURDIR)/debian/ganeti2/usr/lib/ganeti/iallocators/dumb
  	install -m 0644 $(CURDIR)/doc/examples/bash_completion \
  	  $(CURDIR)/debian/ganeti2/etc/bash_completion.d/ganeti
  	install -m 0644 $(CURDIR)/debian/ganeti2.overrides \
  	  $(CURDIR)/debian/ganeti2/usr/share/lintian/overrides/ganeti2
+ 
+ 	# remove embedded copy of jquery
+ 	rm -f $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti2/html/_static/jsquery.js
+ 
  	rmdir debian/ganeti2/var/run/ganeti
  	rmdir debian/ganeti2/var/run
  
@@@ -87,7 -90,8 +92,8 @@@ binary-indep: build instal
  #	dh_undocumented
  	dh_installman
  	dh_link
- 	dh_compress
+ 	# Note: no compression on the html docs, since it will break navigation
+ 	dh_compress -Xganeti2/html/
  	dh_fixperms
  #	dh_perl
  	dh_installdeb

-- 
Ganeti packaging