[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.7-1

[Hilko Bengen]

The following commit has been merged in the master branch:
commit ff29ecd03a2f84613fce196e0d0124f91a9fded0
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun Mar 4 13:23:04 2012 +0100

    Rebased patch queue

diff --git a/debian/patches/0008-ruby-install-to-vendor_ruby.patch b/debian/patches/0008-ruby-install-to-vendor_ruby.patch
index cfe16c8..2fbf425 100644
--- a/debian/patches/0008-ruby-install-to-vendor_ruby.patch
+++ b/debian/patches/0008-ruby-install-to-vendor_ruby.patch
@@ -7,17 +7,17 @@ Subject: ruby: install to vendor_ruby.
  1 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/ruby/Makefile.am b/ruby/Makefile.am
-index 361277e..4c5b5e6 100644
+index c4b680f..db6ec9e 100644
 --- a/ruby/Makefile.am
 +++ b/ruby/Makefile.am
 @@ -54,13 +54,13 @@ all: $(generator_built)
  	$(RAKE) build
  	$(RAKE) rdoc
  
--RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
--RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-+RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
-+RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
+-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
++RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
++RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
  
  install:
 -	$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
diff --git a/debian/patches/0009-autoreconf.patch b/debian/patches/0009-autoreconf.patch
index bec54c7..5befcb7 100644
--- a/debian/patches/0009-autoreconf.patch
+++ b/debian/patches/0009-autoreconf.patch
@@ -969,7 +969,7 @@ index 2a55a50..30fdca8 100755
  		;;
  	*-wec)
 diff --git a/configure b/configure
-index 956ef10..7ad60c5 100755
+index 39e091c..e620fdb 100755
 --- a/configure
 +++ b/configure
 @@ -45929,6 +45929,7 @@ fi
@@ -1301,17 +1301,17 @@ index 3a43d17..aff8e8d 100644
 -tools/virt-tar.pl
 -tools/virt-win-reg.pl
 diff --git a/ruby/Makefile.in b/ruby/Makefile.in
-index bdfc6f4..b2f39fd 100644
+index 97073ff..c4ac6b4 100644
 --- a/ruby/Makefile.in
 +++ b/ruby/Makefile.in
 @@ -1251,8 +1251,8 @@ CLEANFILES = \
  @HAVE_RUBY_TRUE@	RUBY=$(RUBY) \
  @HAVE_RUBY_TRUE@	$(top_builddir)/run
  
-- at HAVE_RUBY_TRUE@RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-- at HAVE_RUBY_TRUE@RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-+ at HAVE_RUBY_TRUE@RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
-+ at HAVE_RUBY_TRUE@RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
+- at HAVE_RUBY_TRUE@RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+- at HAVE_RUBY_TRUE@RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
++ at HAVE_RUBY_TRUE@RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
++ at HAVE_RUBY_TRUE@RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
  all: all-am
  
  .SUFFIXES:

-- 
Libguestfs Debian packaging