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

Hilko Bengen bengen at debian.org
Mon Apr 1 18:12:15 UTC 2013 

The following commit has been merged in the master branch:
commit c72fb50fa2efc25fe625e250902ec8266058e794
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Mar 7 00:09:51 2013 +0100

    Added localized manpages (po4a build-dependency, out-of-tree build fix)

diff --git a/debian/control b/debian/control
index 8a7ff04..f819f92 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Build-Depends: debhelper (>= 9~), autotools-dev, aptitude,
   libsys-virt-perl, libwin-hivex-perl,
   libfuse-dev, fuse,
   libglib2.0-dev, gjs, gobject-introspection, libgirepository1.0-dev, gtk-doc-tools,
-  netpbm, icoutils
+  netpbm, icoutils,
+  po4a,
 Homepage: http://libguestfs.org
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-libvirt/libguestfs.git
diff --git a/debian/erlang-guestfs.install b/debian/erlang-guestfs.install
index ce4b44c..2252468 100644
--- a/debian/erlang-guestfs.install
+++ b/debian/erlang-guestfs.install
@@ -1,3 +1,4 @@
 /usr/bin/erl-guestfs
 /usr/lib/erlang
 /usr/share/man/man3/guestfs-erlang.3*
+/usr/share/man/*/man3/guestfs-erlang.3*
diff --git a/debian/guestfish.install b/debian/guestfish.install
index 732e852..bcc9680 100644
--- a/debian/guestfish.install
+++ b/debian/guestfish.install
@@ -1,4 +1,5 @@
 usr/bin/guestfish
 usr/share/man/man1/guestfish*
+usr/share/man/*/man1/guestfish*
 
 etc/bash_completion.d/guestfish-bash-completion.sh
diff --git a/debian/guestmount.install b/debian/guestmount.install
index 35f65be..63629cd 100644
--- a/debian/guestmount.install
+++ b/debian/guestmount.install
@@ -1,2 +1,3 @@
 usr/bin/guestmount
 usr/share/man/man1/guestmount*
+usr/share/man/*/man1/guestmount*
diff --git a/debian/libguestfs-dev.install b/debian/libguestfs-dev.install
index 9e43e7c..e0b4c34 100644
--- a/debian/libguestfs-dev.install
+++ b/debian/libguestfs-dev.install
@@ -5,5 +5,7 @@ usr/lib/*-*/libguestfs.la
 usr/lib/*-*/pkgconfig/*
 
 usr/share/man/man3/guestfs.3*
+usr/share/man/*/man3/guestfs.3*
 usr/share/man/man3/libguestfs.3*
 usr/share/man/man3/guestfs-examples.3*
+usr/share/man/*/man3/guestfs-examples.3*
diff --git a/debian/libguestfs-java.install b/debian/libguestfs-java.install
index 61d0caa..80e9969 100644
--- a/debian/libguestfs-java.install
+++ b/debian/libguestfs-java.install
@@ -3,3 +3,4 @@ usr/share/java
 usr/lib/*-*/*jni*
 
 usr/share/man/man3/guestfs-java.3*
+usr/share/man/*/man3/guestfs-java.3*
diff --git a/debian/libguestfs-ocaml-dev.install b/debian/libguestfs-ocaml-dev.install
index 325c54f..967d5c5 100644
--- a/debian/libguestfs-ocaml-dev.install
+++ b/debian/libguestfs-ocaml-dev.install
@@ -4,3 +4,4 @@ usr/lib/ocaml/guestfs/*guestfs*.cm*
 usr/lib/ocaml/guestfs/*guestfs*.ml*
 
 usr/share/man/man3/guestfs-ocaml.3*
+usr/share/man/*/man3/guestfs-ocaml.3*
diff --git a/debian/libguestfs-perl.install b/debian/libguestfs-perl.install
index 04ba6c3..0a4c954 100644
--- a/debian/libguestfs-perl.install
+++ b/debian/libguestfs-perl.install
@@ -1,4 +1,5 @@
 usr/share/man/man3/*.3pm
 usr/share/man/man3/guestfs-perl.3*
+usr/share/man/*/man3/guestfs-perl.3*
 
 usr/lib/perl5
diff --git a/debian/libguestfs-tools.install b/debian/libguestfs-tools.install
index 802518a..720a2db 100644
--- a/debian/libguestfs-tools.install
+++ b/debian/libguestfs-tools.install
@@ -1,9 +1,11 @@
 usr/bin/virt-*
 usr/share/man/man1/virt-*
+usr/share/man/*/man1/virt-*
 etc/libguestfs-tools.conf
 
 usr/bin/libguestfs-test-tool
 usr/share/man/man1/libguestfs-test-tool*
+usr/share/man/*/man1/libguestfs-test-tool*
 
 usr/lib/guestfs
 debian/update-guestfs-appliance usr/sbin
diff --git a/debian/libguestfs0.install b/debian/libguestfs0.install
index 7402d1d..e137637 100644
--- a/debian/libguestfs0.install
+++ b/debian/libguestfs0.install
@@ -1,3 +1,4 @@
 usr/lib/*-*/libguestfs.so.*
 usr/share/man/man1/guestfs-*
+usr/share/man/*/man1/guestfs-*
 usr/share/locale/*/LC_MESSAGES/libguestfs.mo
diff --git a/debian/lua-guestfs.install b/debian/lua-guestfs.install
index 09270af..da0bcdf 100644
--- a/debian/lua-guestfs.install
+++ b/debian/lua-guestfs.install
@@ -1,2 +1,3 @@
 /usr/lib/*-*/lua/*/*.so
 /usr/share/man/man3/guestfs-lua.3*
+/usr/share/man/*/man3/guestfs-lua.3*
diff --git a/debian/patches/0010-out-of-tree-build-Fix-localized-manpages.patch b/debian/patches/0010-out-of-tree-build-Fix-localized-manpages.patch
new file mode 100644
index 0000000..0d820e7
--- /dev/null
+++ b/debian/patches/0010-out-of-tree-build-Fix-localized-manpages.patch
@@ -0,0 +1,129 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 7 Mar 2013 00:08:23 +0100
+Subject: out-of-tree build: Fix localized manpages
+
+---
+ po-docs/Makefile.am    |    6 +++---
+ po-docs/ja/Makefile.am |   16 ++++++++--------
+ po-docs/uk/Makefile.am |   16 ++++++++--------
+ 3 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/po-docs/Makefile.am b/po-docs/Makefile.am
+index b532683..1b1da88 100644
+--- a/po-docs/Makefile.am
++++ b/po-docs/Makefile.am
+@@ -51,15 +51,15 @@ libguestfs-docs.pot: po4a.conf
+ 	  --msgid-bugs-address libguestfs at redhat.com \
+ 	  --copyright-holder "Red Hat Inc." \
+ 	  po4a.conf
+-	for f in `find $(linguas) -name '*.pod' -o -name '*.pl'`; do \
++	for f in `cd $(srcdir); find $(linguas) -name '*.pod' -o -name '*.pl'`; do \
+ 	  echo '=encoding utf8' > $$f.new; \
+-	  awk 'FNR >= 14 { print }' < $$f >> $$f.new; \
++	  awk 'FNR >= 14 { print }' < $(srcdir)/$$f >> $$f.new; \
+ 	  mv $$f.new $$f; \
+ 	done
+ 
+ po4a.conf: podfiles
+ 	rm -f $@-t
+-	echo "[po_directory] ." >> $@-t
++	echo "[po_directory] $(srcdir)" >> $@-t
+ 	echo >> $@-t
+ 	for f in `cat podfiles`; do \
+ 	  b=`basename -- $$f`; \
+diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
+index d3413ec..f4fb3a8 100644
+--- a/po-docs/ja/Makefile.am
++++ b/po-docs/ja/Makefile.am
+@@ -65,7 +65,7 @@ MANPAGES = \
+ 	virt-tar-out.1 \
+ 	virt-win-reg.1
+ 
+-podfiles := $(shell for f in `cat ../podfiles`; do basename $$f; done)
++podfiles := $(shell for f in `cat $(top_srcdir)/po-docs/podfiles`; do basename $$f; done)
+ 
+ # Ship the POD files and the translated manpages in the tarball.  This
+ # just simplifies building from the tarball, at a small cost in extra
+@@ -82,9 +82,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru
+ 	  --man $@ \
+ 	  --section 3 \
+ 	  --license LGPLv2+ \
+-	  --insert $(srcdir)/guestfs-actions.pod:__ACTIONS__ \
+-	  --insert $(srcdir)/guestfs-availability.pod:__AVAILABILITY__ \
+-	  --insert $(srcdir)/guestfs-structs.pod:__STRUCTS__ \
++	  --insert $(builddir)/guestfs-actions.pod:__ACTIONS__ \
++	  --insert $(builddir)/guestfs-availability.pod:__AVAILABILITY__ \
++	  --insert $(builddir)/guestfs-structs.pod:__STRUCTS__ \
+ 	  $<
+ 
+ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod
+@@ -92,8 +92,8 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod
+ 	  --no-strict-checks \
+ 	  --man $@ \
+ 	  --license GPLv2+ \
+-	  --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \
+-	  --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \
++	  --insert $(builddir)/guestfish-actions.pod:__ACTIONS__ \
++	  --insert $(builddir)/guestfish-commands.pod:__FISH_COMMANDS__ \
+ 	  $<
+ 
+ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod
+@@ -101,8 +101,8 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po
+ 	  --no-strict-checks \
+ 	  --man $@ \
+ 	  --license GPLv2+ \
+-          --insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
+-          --insert sysprep-operations.pod:__OPERATIONS__ \
++          --insert $(builddir)/sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
++          --insert $(builddir)/sysprep-operations.pod:__OPERATIONS__ \
+ 	  $<
+ 
+ %.1: %.pod
+diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
+index d3413ec..f4fb3a8 100644
+--- a/po-docs/uk/Makefile.am
++++ b/po-docs/uk/Makefile.am
+@@ -65,7 +65,7 @@ MANPAGES = \
+ 	virt-tar-out.1 \
+ 	virt-win-reg.1
+ 
+-podfiles := $(shell for f in `cat ../podfiles`; do basename $$f; done)
++podfiles := $(shell for f in `cat $(top_srcdir)/po-docs/podfiles`; do basename $$f; done)
+ 
+ # Ship the POD files and the translated manpages in the tarball.  This
+ # just simplifies building from the tarball, at a small cost in extra
+@@ -82,9 +82,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru
+ 	  --man $@ \
+ 	  --section 3 \
+ 	  --license LGPLv2+ \
+-	  --insert $(srcdir)/guestfs-actions.pod:__ACTIONS__ \
+-	  --insert $(srcdir)/guestfs-availability.pod:__AVAILABILITY__ \
+-	  --insert $(srcdir)/guestfs-structs.pod:__STRUCTS__ \
++	  --insert $(builddir)/guestfs-actions.pod:__ACTIONS__ \
++	  --insert $(builddir)/guestfs-availability.pod:__AVAILABILITY__ \
++	  --insert $(builddir)/guestfs-structs.pod:__STRUCTS__ \
+ 	  $<
+ 
+ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod
+@@ -92,8 +92,8 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod
+ 	  --no-strict-checks \
+ 	  --man $@ \
+ 	  --license GPLv2+ \
+-	  --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \
+-	  --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \
++	  --insert $(builddir)/guestfish-actions.pod:__ACTIONS__ \
++	  --insert $(builddir)/guestfish-commands.pod:__FISH_COMMANDS__ \
+ 	  $<
+ 
+ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod
+@@ -101,8 +101,8 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po
+ 	  --no-strict-checks \
+ 	  --man $@ \
+ 	  --license GPLv2+ \
+-          --insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
+-          --insert sysprep-operations.pod:__OPERATIONS__ \
++          --insert $(builddir)/sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
++          --insert $(builddir)/sysprep-operations.pod:__OPERATIONS__ \
+ 	  $<
+ 
+ %.1: %.pod
diff --git a/debian/patches/series b/debian/patches/series
index c9686fd..86b7c16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0007-out-of-tree-build-Fix-Ruby-bindings.patch
 0008-ruby-Don-t-compile-with-Werror.patch
 0009-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
+0010-out-of-tree-build-Fix-localized-manpages.patch
diff --git a/debian/python-guestfs.install b/debian/python-guestfs.install
index 9d3fc4d..c60b4b0 100644
--- a/debian/python-guestfs.install
+++ b/debian/python-guestfs.install
@@ -1,3 +1,4 @@
 usr/lib/python*
 
 usr/share/man/man3/guestfs-python.3*
+usr/share/man/*/man3/guestfs-python.3*
diff --git a/debian/ruby-guestfs.install b/debian/ruby-guestfs.install
index 37547b6..faaf0bc 100644
--- a/debian/ruby-guestfs.install
+++ b/debian/ruby-guestfs.install
@@ -1,3 +1,4 @@
 usr/lib/ruby
 
 usr/share/man/man3/guestfs-ruby.3*
+usr/share/man/*/man3/guestfs-ruby.3*
diff --git a/debian/rules b/debian/rules
index 59e5ef9..5f05b65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,7 +139,7 @@ override_dh_install:
 # Workarounds for:
 # W: libguestfs-perl: script-not-executable usr/lib/perl5/Sys/bindtests.pl
 # E: libguestfs-dev: non-empty-dependency_libs-in-la-file
-	dh_install -X.la -Xbindtests -X.so.owner --fail-missing
+	dh_install -X.la -Xbindtests.pl -X.so.owner -Xlibguestfs-make-fixed-appliance --fail-missing
 
 # Workaround for python3-defaults < 3.2~b2-1
 # ("do not rename .so files outside dist-packages directory")

-- 
Libguestfs Debian packaging

More information about the Pkg-libvirt-commits mailing list