[Pkg-ocaml-maint-commits] [SCM] virt-top packaging branch, master, updated. debian/1.0.5-1-7-g5070a8a
The following commit has been merged in the master branch: commit 1214c05f9047716858dd82aaabece40dcfd57d2e Merge: a6545cd48b069d69139c2d45e18040ab1e83489b 7c3e6a1c1ed92ceecb3c9893578d07a62ab01aae Author: Laurent Léonard laur...@open-minds.org Date: Sun Aug 14 01:38:13 2011 +0200 Merge commit 'upstream/1.0.6' -- virt-top packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] virt-top packaging branch, master, updated. debian/1.0.5-1-7-g5070a8a
The following commit has been merged in the master branch: commit f0a771b3526c982eeb94252a9d7a43887868ad7a Author: Laurent Léonard laur...@open-minds.org Date: Sun Aug 14 01:40:08 2011 +0200 Redo patch 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 af872e6..61b2e7b 100644 --- a/debian/patches/0001-add-opt-and-byte-compile-targets.patch +++ b/debian/patches/0001-add-opt-and-byte-compile-targets.patch @@ -1,6 +1,6 @@ From: Guido Guenther a...@sigxcpu.org Date: Wed, 23 Jul 2008 17:30:49 -0400 -Subject: [PATCH] add opt and byte compile targets +Subject: add opt and byte compile targets --- Makefile.in |2 +- @@ -8,7 +8,7 @@ Subject: [PATCH] add opt and byte compile targets 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index c1a9f56..d7984e0 100644 +index beacf76..c2d2ff3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,7 +24,7 @@ MAKENSIS = @MAKENSIS@ @@ -21,10 +21,10 @@ index c1a9f56..d7984e0 100644 $(MAKE) -C $$d $@; \ if [ $$? -ne 0 ]; then exit 1; fi; \ diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in -index 2eedf89..ef318ad 100755 +index 34f1ad6..474eb08 100755 --- a/virt-top/Makefile.in +++ b/virt-top/Makefile.in -@@ -95,10 +95,16 @@ virt-top.txt: virt-top.pod +@@ -100,10 +100,16 @@ virt-top.txt: virt-top.pod pod2text $ $@ endif -- virt-top packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] virt-top packaging branch, master, updated. debian/1.0.5-1-7-g5070a8a
The following commit has been merged in the master branch: commit 66298560c8ff04633cf0e2df8ab7cf5b0c45148c Author: Laurent Léonard laur...@open-minds.org Date: Sun Aug 14 01:46:47 2011 +0200 Bump Standards-Version to 3.9.2 diff --git a/debian/control b/debian/control index 992549e..314b166 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: cdbs, libxml-light-ocaml-dev, dh-ocaml (= 0.9.1), libextlib-ocaml-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/virt-top.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/virt-top.git Homepage: http://et.redhat.com/~rjones/virt-top/ -- virt-top packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] virt-top packaging branch, master, updated. debian/1.0.5-1-7-g5070a8a
The following commit has been merged in the master branch: commit 930eafd93e25a48240e1ad852e1b6549e86da32d Author: Laurent Léonard laur...@open-minds.org Date: Mon Aug 15 23:04:33 2011 +0200 New patch 0002-Ensure-manpages-get-built-when-using-native-compiler.patch 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 new file mode 100644 index 000..aa6b67f --- /dev/null +++ b/debian/patches/0002-Ensure-manpages-get-built-when-using-native-compiler.patch @@ -0,0 +1,26 @@ +From: =?UTF-8?q?Laurent=20L=C3=A9onard?= laur...@open-minds.org +Date: Mon, 15 Aug 2011 22:58:10 +0200 +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 613bed4..046f2c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-add-opt-and-byte-compile-targets.patch +0002-Ensure-manpages-get-built-when-using-native-compiler.patch -- virt-top packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] virt-top packaging branch, master, updated. debian/1.0.5-1-7-g5070a8a
The following commit has been merged in the master branch: commit 5070a8a3a03ba1322a672da17c4c135cd4393996 Author: Laurent Léonard laur...@open-minds.org Date: Mon Aug 15 23:19:51 2011 +0200 Document changes and release 1.0.6-1 diff --git a/debian/changelog b/debian/changelog index 914ccbe..f6868d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +virt-top (1.0.6-1) unstable; urgency=low + + * [7c3e6a1] Imported Upstream version 1.0.6 + * [f0a771b] Redo patch + * [6629856] Bump Standards-Version to 3.9.2 + * [930eafd] New patch 0002-Ensure-manpages-get-built-when-using-native- +compiler.patch + + -- Laurent Léonard laur...@open-minds.org Mon, 15 Aug 2011 23:19:06 +0200 + virt-top (1.0.5-1) unstable; urgency=low * [ba445bb] Imported Upstream version 1.0.5 -- virt-top packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
