[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.2-9-3-gbcb49d9

[Ralf Treinen]

The following commit has been merged in the master branch:
commit e61f6d84bc64f7977ae77640d2fc13017dabac22
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Mar 21 13:15:41 2010 +0100

    better clean, fix xml escaping

diff --git a/debian/changelog b/debian/changelog
index 997bd78..60b94ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ pkglab (1.4.2-9) UNRELEASED; urgency=low
   * distcheck/common.ml: escape < and > in version numbers in order to
     produce valid xml output even when the Packages file contains rubbish
     version numbers.
+  * debian/rules: add to clean targets removals of some leftover files
 
  -- Ralf Treinen <treinen at debian.org>  Sun, 21 Mar 2010 12:36:53 +0100
 
diff --git a/debian/rules b/debian/rules
index ba63aa8..acefc46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,5 +32,9 @@ else
 	cp distcheck/distcheck $(DISTCHECK_INST)/usr/lib/edos-distcheck/distcheck
 endif
 
+clean::
+	cd distcheck && rm -f common.cmi common.cmx common.o distcheck.opt
+	cd doc && rm -rf pkglab.haux pkglab.html
+
 DEB_MAKE_INSTALL_TARGET = \
  install DESTDIR=$(PKGLAB_INST)/usr MANDIR=$(PKGLAB_INST)/usr/share/man
diff --git a/distcheck/common.ml b/distcheck/common.ml
index 2321186..17c9dbd 100644
--- a/distcheck/common.ml
+++ b/distcheck/common.ml
@@ -129,7 +129,7 @@ let pkg_xml_of p_id =
 (* xmlesc escapes some special caracters into XML *)
 let xmlesc s =
   global_replace (regexp_string ">") "&gt;"
-    (global replace (regexp_string "<")y "&lt;" s)
+    (global_replace (regexp_string "<") "&lt;" s)
 ;;
 
 let spec_string s =

-- 
pkglab packaging