[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit 5140612caa9e1f4621f0f6a0436233ab493a57f8 Author: Mehdi Dogguy Date: Tue Jun 5 22:51:41 2012 +0200 Release to unstable diff --git a/debian/changelog b/debian/changelog index acb7f6b..4d8d39b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -ocaml-batteries (1.4.3-1) UNRELEASED; urgency=low +ocaml-batteries (1.4.3-1) unstable; urgency=low * New upstream release (Closes: 668027) - add 0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch - add 0003-Fix-doc-batteries-html-extensions.html.patch - -- Mehdi Dogguy Tue, 05 Jun 2012 21:31:12 +0200 + -- Mehdi Dogguy Tue, 05 Jun 2012 22:51:41 +0200 ocaml-batteries (1.4.1-1) unstable; urgency=low -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit dbfc9efec3542b253ed85358250e669ddd2811e3 Author: Mehdi Dogguy Date: Tue Jun 5 22:35:55 2012 +0200 Add two patches to fix minor issues diff --git a/debian/changelog b/debian/changelog index cb08171..acb7f6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ocaml-batteries (1.4.3-1) UNRELEASED; urgency=low * New upstream release (Closes: 668027) +- add 0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch +- add 0003-Fix-doc-batteries-html-extensions.html.patch -- Mehdi Dogguy Tue, 05 Jun 2012 21:31:12 +0200 diff --git a/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch b/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch new file mode 100644 index 000..7ab0ef9 --- /dev/null +++ b/debian/patches/0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch @@ -0,0 +1,23 @@ +From: Mehdi Dogguy +Date: Tue, 5 Jun 2012 22:21:14 +0200 +Subject: Use mirror of ocaml-tutorial.org, which is dead + +--- + doc/batteries/language.idex |4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/batteries/language.idex b/doc/batteries/language.idex +index 0eedbf7..78af91b 100644 +--- a/doc/batteries/language.idex b/doc/batteries/language.idex +@@ -1,7 +1,7 @@ + "the tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html"; + "The tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html"; + "The Tutorial": "http://www.cs.jhu.edu/~scott/pl/lectures/caml-intro.html"; +-"For programmers": "http://www.ocaml-tutorial.org"; +-"for programmers": "http://www.ocaml-tutorial.org"; ++"For programmers": "http://mirror.ocamlcore.org/ocaml-tutorial.org/"; ++"for programmers": "http://mirror.ocamlcore.org/ocaml-tutorial.org/"; + "directives": "html/toplevel.html#directives" + "batteries":"html/index.html" +-- diff --git a/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch b/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch new file mode 100644 index 000..d836579 --- /dev/null +++ b/debian/patches/0003-Fix-doc-batteries-html-extensions.html.patch @@ -0,0 +1,33 @@ +From: Mehdi Dogguy +Date: Tue, 5 Jun 2012 22:34:22 +0200 +Subject: Fix doc/batteries/html/extensions.html + +--- + doc/batteries/html/extensions.html |7 +-- + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/doc/batteries/html/extensions.html b/doc/batteries/html/extensions.html +index 1f19e2f..cca8cbd 100644 +--- a/doc/batteries/html/extensions.html b/doc/batteries/html/extensions.html +@@ -111,7 +111,7 @@ Again, immutable latin-1 strings are automatically optimized. + + The same syntax may be used to pattern-match against ropes, UTF-8 strings and string with capabilities. + +- Lazy List syntax ++ Lazy List syntax + + A few new constructs are added to make using lazy lists easier. As an expression, [%] is a shortcut for lazy BatLazyList.Nil, the empty lazy list. + +@@ -123,10 +123,5 @@ BatLazyList.Cons(a,b). + + + +-Summary of new keywords +- +-where, defined by pa_where +- +- + + +-- diff --git a/debian/patches/series b/debian/patches/series index 98d1f0e..cc47de0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001-Do-not-enforce-sanity-check-rules.patch +0002-Use-mirror-of-ocaml-tutorial.org-which-is-dead.patch +0003-Fix-doc-batteries-html-extensions.html.patch -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit e1aeed3ae0fce5def71bafdd7f1374890bbf9d09 Author: Mehdi Dogguy Date: Tue Jun 5 22:20:08 2012 +0200 Rebase local patches (git update) diff --git a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch index 60e5f2b..a7fa9b6 100644 --- a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch +++ b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch @@ -1,16 +1,16 @@ From: Mehdi Dogguy Date: Wed, 14 Jul 2010 22:22:08 +0200 -Subject: [PATCH] Do not enforce sanity-check rules +Subject: Do not enforce sanity-check rules --- Makefile |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 0e186d5..f59c7e9 100644 +index f359e95..29fc6e3 100644 --- a/Makefile +++ b/Makefile -@@ -71,7 +71,7 @@ clean: +@@ -72,7 +72,7 @@ clean: $(OCAMLBUILD) -clean doc: -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit c17c479f73433e1cc699c246efb2bf560498b824 Author: Mehdi Dogguy Date: Tue Jun 5 21:52:01 2012 +0200 Set DOCROOT when building diff --git a/debian/rules b/debian/rules index d13cc96..db5286d 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ export BATTERIES_NATIVE_SHLIB=false endif override_dh_auto_build: - make all + make DOCROOT=$(BATTERIES_DOCROOT) all ifneq (,$(findstring $(DOC_PKG),$(shell dh_listpackages))) make doc endif -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit 05ced90ed3af9c74b5a110ae250a2ac802d076e4 Author: Mehdi Dogguy Date: Tue Jun 5 21:31:16 2012 +0200 New upstream release (Closes: 668027) diff --git a/debian/changelog b/debian/changelog index 6f11053..cb08171 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-batteries (1.4.3-1) UNRELEASED; urgency=low + + * New upstream release (Closes: 668027) + + -- Mehdi Dogguy Tue, 05 Jun 2012 21:31:12 +0200 + ocaml-batteries (1.4.1-1) unstable; urgency=low * New upstream release. -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit f2c3c0b6f14ddb8f61a9c3c18fe4e906788e9914 Merge: d79001972e14a50a95225e0061da901aaf60b974 7bc9541a02fc4c5e231bec52f7ff488ad22046ef Author: Mehdi Dogguy Date: Tue Jun 5 21:28:21 2012 +0200 Merge tag 'upstream/1.4.3' Upstream version 1.4.3 -- ocaml-batteries 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] ocaml-batteries packaging branch, master, updated. debian/1.4.1-1-9-g5140612
The following commit has been merged in the master branch: commit d79001972e14a50a95225e0061da901aaf60b974 Merge: c520b2777ccbcb353780547489077a4bf199c540 cbb86997d27b057b0f3e7e1bdc9fc99fce72b54b Author: Mehdi Dogguy Date: Tue Jun 5 21:28:09 2012 +0200 Merge tag 'upstream/1.4.2' Upstream version 1.4.2 -- ocaml-batteries 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
