[Pkg-ocaml-maint-commits] [SCM] easy-format packaging branch, master, updated. debian/1.0.0-1-5-gb5275ee

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 3f766aeb434328aa4b35ca1aa0b4c74d578dd7f7
Author: Hendrik Tews <hendrik at askra.de>
Date:   Fri May 31 16:44:22 2013 +0200

    fix watch and unapply debian patch

diff --git a/Makefile b/Makefile
index 09d38ba..c10111c 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ simple_example.out: simple_example
 
 doc: ocamldoc/index.html easy_format_example.html
 ocamldoc/index.html: easy_format.mli
-	-mkdir ocamldoc
 	ocamldoc -d ocamldoc -html $<
 easy_format_example.html: simple_example.out simple_example.ml
 	cat simple_example.ml > easy_format_example.ml
@@ -38,7 +37,6 @@ soft-clean:
 	rm -f *.cm[iox] *.o *.annot \
 		test_easy_format lambda_example simple_example \
 		bytecode nativecode
-	-$(RM) -r ocamldoc
 
 clean: soft-clean
 	rm -f *.out ocamldoc/* \
diff --git a/debian/changelog b/debian/changelog
index 0f654d5..5853d69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 easy-format (1.0.0-2) UNRELEASED; urgency=low
 
+  [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
- -- Sylvain Le Gall <gildor at debian.org>  Fri, 21 Sep 2012 01:13:51 +0000
+  [ Hendrik Tews ]
+  * fix watch file (thanks to Bart Martens)
+  * unapply debian changes patch in master
+
+ -- Hendrik Tews <hendrik at askra.de>  Fri, 31 May 2013 16:38:34 +0200
 
 easy-format (1.0.0-1) unstable; urgency=low
 
diff --git a/debian/watch b/debian/watch
index 006dbfa..28b5b30 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://martin.jambon.free.fr/easy-format.html easy-format-([\d\.]*)\.tar\.gz
+http://mjambon.com/releases/easy-format/easy-format-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))

-- 
easy-format packaging