[Pkg-ocaml-maint-commits] [SCM] virt-top packaging branch, master, updated. f3f1f480c80c76d7c18726db3cf1c92b80e822de

[Guido Guenther]

The following commit has been merged in the master branch:
commit 0ea43a3527bda78c79da1b1886ecb85c2c4593ac
Author: Guido Guenther <agx at sigxcpu.org>
Date:   Wed Jul 23 17:38:34 2008 -0400

    adjust add-opt-and-byte targets to new upstream version

diff --git a/debian/patches/0001-add-opt-and-byte-compile-targets.patch b/debian/patches/0001-add-opt-and-byte-compile-targets.patch
new file mode 100644
index 0000000..05f0b27
--- /dev/null
+++ b/debian/patches/0001-add-opt-and-byte-compile-targets.patch
@@ -0,0 +1,48 @@
+From e798f0eee739f2e173a8cb50bb6482a9da03e1ae Mon Sep 17 00:00:00 2001
+From: Guido Guenther <agx at sigxcpu.org>
+Date: Wed, 23 Jul 2008 17:30:49 -0400
+Subject: [PATCH] add opt and byte compile targets
+
+---
+ Makefile.in          |    2 +-
+ virt-top/Makefile.in |    8 +++++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1793bfc..4ef167a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -24,7 +24,7 @@ MAKENSIS	= @MAKENSIS@
+ 
+ SUBDIRS		= virt-top
+ 
+-all opt depend install:
++all opt depend install-opt install-byte:
+ 	for d in $(SUBDIRS); do \
+ 	  $(MAKE) -C $$d $@; \
+ 	  if [ $$? -ne 0 ]; then exit 1; fi; \
+diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
+index e471f93..ed6f57c 100755
+--- a/virt-top/Makefile.in
++++ b/virt-top/Makefile.in
+@@ -95,10 +95,16 @@ virt-top.txt: virt-top.pod
+ 	pod2text $< > $@
+ endif
+ 
+-install:
++install-opt:
+ 	if [ -x virt-top.opt ]; then \
+ 	  mkdir -p $(DESTDIR)$(bindir); \
+ 	  $(INSTALL) -m 0755 virt-top.opt $(DESTDIR)$(bindir)/virt-top; \
+ 	fi
+ 
++install-byte:
++	if [ -x virt-top ]; then \
++	  mkdir -p $(DESTDIR)$(bindir); \
++	  $(INSTALL) -m 0755 virt-top $(DESTDIR)$(bindir)/virt-top; \
++	fi
++
+ include ../Make.rules
+-- 
+1.5.6.3
+
diff --git a/debian/patches/add_byte_and_opt_targets.patch b/debian/patches/add_byte_and_opt_targets.patch
deleted file mode 100644
index a1ab115..0000000
--- a/debian/patches/add_byte_and_opt_targets.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 83fc0cb..30b21da 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -24,7 +24,7 @@ MAKENSIS	= @MAKENSIS@
- 
- SUBDIRS		= virt-top
- 
--all opt depend install:
-+all opt depend install-opt install-byte:
- 	for d in $(SUBDIRS); do \
- 	  $(MAKE) -C $$d $@; \
- 	  if [ $$? -ne 0 ]; then exit 1; fi; \
-@@ -76,4 +76,4 @@ check-manifest:
- 	exit $$rv
- 
- .PHONY: all opt depend install clean distclean configure dist check-manifest \
--	release release_stage_2 release_stage_3 force
-\ No newline at end of file
-+	release release_stage_2 release_stage_3 force
-diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
-index e471f93..ad1799c 100755
---- a/virt-top/Makefile.in
-+++ b/virt-top/Makefile.in
-@@ -95,7 +95,7 @@ virt-top.txt: virt-top.pod
- 	pod2text $< > $@
- endif
- 
--install:
-+install-opt:
- 	if [ -x virt-top.opt ]; then \
- 	  mkdir -p $(DESTDIR)$(bindir); \
- 	  $(INSTALL) -m 0755 virt-top.opt $(DESTDIR)$(bindir)/virt-top; \
diff --git a/debian/patches/series b/debian/patches/series
index c4bd284..613bed4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-add_byte_and_opt_targets.patch
+0001-add-opt-and-byte-compile-targets.patch

-- 
virt-top packaging