[Pkg-ocaml-maint-commits] [SCM] perl4caml packaging branch, master, updated. debian/0.9.5-2-5-g55dd47d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 95687377b3e73eda2f8c757cf7b1ac4968a72ba6
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Oct 9 13:34:31 2009 +0200

    Remove dependency to libnet-google-perl (Closes: #550329)

diff --git a/debian/control b/debian/control
index 8ae5186..59119db 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,6 @@ Suggests:
  libtimedate-perl,
  libwww-mechanize-perl
 Depends:
- libnet-google-perl,
  libhtml-tree-perl,
  liburi-perl,
  libtemplate-perl,
diff --git a/debian/patches/0002-Disable-libnet-google-perl-wrappers.patch b/debian/patches/0002-Disable-libnet-google-perl-wrappers.patch
new file mode 100644
index 0000000..f53108e
--- /dev/null
+++ b/debian/patches/0002-Disable-libnet-google-perl-wrappers.patch
@@ -0,0 +1,55 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 9 Oct 2009 12:10:20 +0200
+Subject: [PATCH] Disable libnet-google-perl wrappers
+
+As a consequence of #550329, see also #409163.
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile |   16 +++++++---------
+ 1 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f79b054..298451d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,11 +55,6 @@ WRAPPERS := \
+ 	wrappers/pl_Date_Calc.cmo \
+ 	wrappers/pl_Date_Format.cmo \
+ 	wrappers/pl_Date_Parse.cmo \
+-	wrappers/pl_Net_Google_Cache.cmo \
+-	wrappers/pl_Net_Google_Response.cmo \
+-	wrappers/pl_Net_Google_Search.cmo \
+-	wrappers/pl_Net_Google_Spelling.cmo \
+-	wrappers/pl_Net_Google.cmo \
+ 	wrappers/pl_HTML_Element.cmo \
+ 	wrappers/pl_HTML_Parser.cmo \
+ 	wrappers/pl_HTML_TreeBuilder.cmo \
+@@ -88,11 +83,11 @@ perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx)
+ 	$(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
+ 
+ ifdef HASOCAMLOPT
+-all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \
+-	examples/test.opt examples/loadpage.opt examples/google.opt \
++all-examples: examples/test.bc examples/loadpage.bc \
++	examples/test.opt examples/loadpage.opt \
+ 	examples/parsedate.bc examples/parsedate.opt
+ else
+-all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \
++all-examples: examples/test.bc examples/loadpage.bc \
+ 	examples/parsedate.bc
+ endif
+ 
+@@ -238,7 +233,10 @@ dpkg:
+ 
+ html:	html/index.html
+ 
+-html/index.html: $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml)
++DOCUMENTED_FILES := $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml)
++DOCUMENTED_FILES := $(patsubst wrappers/pl_Net_Google%,,$(DOCUMENTED_FILES))
++
++html/index.html: $(DOCUMENTED_FILES)
+ 	rm -rf html
+ 	mkdir html
+ 	-$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 34cd41f..e62ac54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-Makefile-to-detect-ocamlopt.patch
+0002-Disable-libnet-google-perl-wrappers.patch
diff --git a/debian/rules b/debian/rules
index 0768179..7cd486d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,3 +12,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -Rf html
 
+.PHONY: override_dh_installexamples
+override_dh_installexamples:
+	dh_installexamples -Xgoogle.ml

-- 
perl4caml packaging