[Pkg-ocaml-maint-commits] [SCM] virt-top packaging branch, master, updated. debian/1.0.6-1-10-g5f9ccd2

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 0eb6b4ec99712dec7aedf3342ac73a2abeaa7854
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Sat Apr 21 23:45:48 2012 +0200

    Drop patch
    
    0002-Ensure-manpages-get-built-when-using-native-compiler.patch - fixed upstream http://git.annexia.org/?p=virt-top.git;a=commitdiff;h=671a014d3e61c300a26f7d5a5a3e344d7a7ac0ef

diff --git a/debian/patches/0001-add-opt-and-byte-compile-targets.patch b/debian/patches/0001-add-opt-and-byte-compile-targets.patch
index 61b2e7b..9f0cc50 100644
--- a/debian/patches/0001-add-opt-and-byte-compile-targets.patch
+++ b/debian/patches/0001-add-opt-and-byte-compile-targets.patch
@@ -8,7 +8,7 @@ Subject: add opt and byte compile targets
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index beacf76..c2d2ff3 100644
+index 32e0b66..64d4fb7 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -24,7 +24,7 @@ MAKENSIS	= @MAKENSIS@
@@ -21,10 +21,10 @@ index beacf76..c2d2ff3 100644
  	  $(MAKE) -C $$d $@; \
  	  if [ $$? -ne 0 ]; then exit 1; fi; \
 diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
-index 34f1ad6..474eb08 100755
+index 5aa0c35..eed98ef 100755
 --- a/virt-top/Makefile.in
 +++ b/virt-top/Makefile.in
-@@ -100,10 +100,16 @@ virt-top.txt: virt-top.pod
+@@ -101,10 +101,16 @@ virt-top.txt: virt-top.pod
  	pod2text $< > $@
  endif
  
@@ -42,4 +42,3 @@ index 34f1ad6..474eb08 100755
 +	fi
 +
  include ../Make.rules
--- 
diff --git a/debian/patches/0002-Ensure-manpages-get-built-when-using-native-compiler.patch b/debian/patches/0002-Ensure-manpages-get-built-when-using-native-compiler.patch
deleted file mode 100644
index 5da4972..0000000
--- a/debian/patches/0002-Ensure-manpages-get-built-when-using-native-compiler.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Mon, 15 Aug 2011 11:18:03 +0100
-Subject: =?UTF-8?q?Ensure=20manpages=20get=20built=20when=20using=20native=20?=
- =?UTF-8?q?compiler=20(thanks=20Laurent=20L=C3=A9onard).?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Origin: upstream, http://git.annexia.org/?p=virt-top.git;a=commitdiff;h=671a014d3e61c300a26f7d5a5a3e344d7a7ac0ef
----
- virt-top/Makefile.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
-index 474eb08..eed98ef 100755
---- a/virt-top/Makefile.in
-+++ b/virt-top/Makefile.in
-@@ -76,6 +76,7 @@ OPT_TARGETS	:= virt-top.opt
- 
- ifeq ($(HAVE_PERLDOC),perldoc)
- BYTE_TARGETS	+= virt-top.1 virt-top.txt
-+OPT_TARGETS	+= virt-top.1 virt-top.txt
- endif
- 
- all: $(BYTE_TARGETS)
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 046f2c1..613bed4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-add-opt-and-byte-compile-targets.patch
-0002-Ensure-manpages-get-built-when-using-native-compiler.patch

-- 
virt-top packaging