[Pkg-ganeti-devel] [SCM] Instance debootstrap packaging branch, bpo-lenny, updated. debian/0.9-1-4-g3f105ad

[Iustin Pop]

The following commit has been merged in the bpo-lenny branch:
commit 3aa93f138cb5f587f71a525d61374dac6fd6b585
Merge: d7144d9f67f51601a6fd05d33128e9c7b40ea438 d17ee7a6b9bbfd84ca136d55c4270b8b5595ed5e
Author: Iustin Pop <iustin at debian.org>
Date:   Sun May 23 00:20:56 2010 +0200

    Merge branch 'master' into bpo-lenny
    
    Conflicts (all trivial):
    	debian/changelog
    	debian/control
    	debian/rules

diff --combined debian/changelog
index 96b8061,47db2e5..bbd2f35
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ ganeti-instance-debootstrap (0.9-1) unstable; urgency=low
+ 
+   * New Upstream version
+   * Include the /etc hooks dir in the package
+   * Include the example hooks in the package
+   * Move the variants.list file to /etc
+   * Add a warning to NEWS for the changed hooks dir
+ 
+  -- Iustin Pop <iustin at debian.org>  Sun, 18 Apr 2010 13:38:10 +0200
+ 
+ ganeti-instance-debootstrap (0.8-1) unstable; urgency=low
+ 
+   * New upstream release
+ 
+  -- Iustin Pop <iustin at debian.org>  Wed, 03 Mar 2010 01:49:42 +0100
+ 
 +ganeti-instance-debootstrap (0.7-2~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports (switch back to source format 1.0)
 +
 + -- Iustin Pop <iusty at k1024.org>  Mon, 01 Mar 2010 14:23:07 +0100
 +
  ganeti-instance-debootstrap (0.7-2) unstable; urgency=low
  
    * Convert source format to 3.0 (quilt)
diff --combined debian/control
index b8c844e,05e3d55..8d76253
--- a/debian/control
+++ b/debian/control
@@@ -2,13 -2,12 +2,12 @@@ Source: ganeti-instance-debootstra
  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>
+ Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iustin at debian.org>
 -Build-Depends: debhelper (>= 7)
 +Build-Depends: debhelper (>= 7), quilt
- Standards-Version: 3.8.3
+ Standards-Version: 3.8.4
  Homepage: http://code.google.com/p/ganeti/
  Vcs-Browser: http://git.debian.org/?p=pkg-ganeti/instance-debootstrap.git
  Vcs-Git: git://git.debian.org/pkg-ganeti/instance-debootstrap.git
- DM-Upload-Allowed: yes
  
  Package: ganeti-instance-debootstrap
  Architecture: all
diff --combined debian/rules
index 6224968,6a90502..af7c986
--- a/debian/rules
+++ b/debian/rules
@@@ -1,13 -1,13 +1,15 @@@
  #!/usr/bin/make -f
  
 +include /usr/share/quilt/quilt.make
 +
+ INSTDIR=$(CURDIR)/debian/ganeti-instance-debootstrap
+ 
  build: build-stamp
 -build-stamp:
 +build-stamp: $(QUILT_STAMPFN)
  	dh build
  	touch build-stamp
  
 -clean:
 +clean: unpatch
  	dh clean
  	rm -f $(CURDIR)/debian/ganeti-instance-debootstrap.default
  
@@@ -15,7 -15,9 +17,9 @@@ install: build install-stam
  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
+ 	rm $(INSTDIR)/usr/share/doc/ganeti-instance-debootstrap/COPYING
+ 	mv $(INSTDIR)/usr/share/ganeti/os/debootstrap/variants.list \
+ 	  $(INSTDIR)/etc/ganeti/instance-debootstrap/variants.list
  	dh install --after dh_auto_install
  	touch install-stamp
  

-- 
Instance debootstrap packaging