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

[Hilko Bengen]

The following commit has been merged in the master branch:
commit 4d386393b7ccf0c893ad8aa0b7d1f36093b81935
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed Oct 31 20:39:13 2012 +0100

    Rebased patch queue, changed mode of message catalog files (*.mo) to 0644

diff --git a/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
index 13a0b62..da56c08 100644
--- a/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
@@ -9,7 +9,7 @@ The supermin appliance files are not installed to the multiarch lib directory.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index fb1f676..0a6fdde 100644
+index 6d8b74a..c6a48d9 100644
 --- a/appliance/Makefile.am
 +++ b/appliance/Makefile.am
 @@ -29,8 +29,8 @@ EXTRA_DIST = \
@@ -24,7 +24,7 @@ index fb1f676..0a6fdde 100644
  fs_DATA =
  superminfs_DATA = \
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 111e179..dd90c11 100644
+index bfd319b..7f4fb4d 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -161,7 +161,7 @@ noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
diff --git a/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch b/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
index 0df72cc..374e562 100644
--- a/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
+++ b/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
@@ -8,7 +8,7 @@ This reverts commit 82e3b7509dea41823c1ce58acd61d406d460c0ab.
  1 file changed, 9 deletions(-)
 
 diff --git a/src/launch.c b/src/launch.c
-index 54ba471..8993a5b 100644
+index 7447308..e4c4eaa 100644
 --- a/src/launch.c
 +++ b/src/launch.c
 @@ -775,15 +775,6 @@ launch_appliance (guestfs_h *g)
diff --git a/debian/patches/0008-message-catalogs-don-t-need-to-be-executable.patch b/debian/patches/0008-message-catalogs-don-t-need-to-be-executable.patch
new file mode 100644
index 0000000..7b9c97b
--- /dev/null
+++ b/debian/patches/0008-message-catalogs-don-t-need-to-be-executable.patch
@@ -0,0 +1,21 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Wed, 31 Oct 2012 20:34:10 +0100
+Subject: message catalogs don't need to be executable
+
+---
+ po/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/Makefile.am b/po/Makefile.am
+index 141896a..f401a6f 100644
+--- a/po/Makefile.am
++++ b/po/Makefile.am
+@@ -97,7 +97,7 @@ install-data-hook: $(GMOFILES)
+ 	for lang in $(linguas); do \
+ 	  d=$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \
+ 	  mkdir -p $$d; \
+-	  install -m 0755 $$lang.gmo $$d/$(DOMAIN).mo; \
++	  install -m 0644 $$lang.gmo $$d/$(DOMAIN).mo; \
+ 	done
+ 
+ .PRECIOUS: $(DOMAIN).pot $(POFILES)
diff --git a/debian/patches/series b/debian/patches/series
index 064ef69..429cc55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-ruby-install-to-vendor_ruby.patch
 0006-Fix-guestfs-supermin-appliance-path.patch
 0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
+0008-message-catalogs-don-t-need-to-be-executable.patch

-- 
Libguestfs Debian packaging