This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch experimental/master
in repository dose3.

commit 972f5886b59cd899f0f12a3a46cef47d280684b7
Author: Ralf Treinen <trei...@free.fr>
Date:   Tue Apr 29 22:34:13 2014 +0200

    drop patch doc-makefile-html
---
 debian/changelog                 |  3 ++-
 debian/patches/doc-makefile-html | 17 -----------------
 debian/patches/series            |  1 -
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65ef0fe..c8bf774 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,12 @@ dose3 (3.2-rc1-1) UNRELEASED; urgency=low
     - libocamlgraph-ocaml-dev: >= 1.8.5
     - replace libpcre-ocaml-dev by libre-ocaml-dev
     - bump libcudf to >= 0.7
-  * Drop debian patches integrated by upstream:
+  * Drop debian patches that have become obsolete:
     - pod2man-5.18
     - configure-dynlink
     - ocaml-4.1
     - ocaml-4.1-zip
+    - doc-makefile-html
   * Refreshed patches:
     - binaries-prefix-edos
 
diff --git a/debian/patches/doc-makefile-html b/debian/patches/doc-makefile-html
deleted file mode 100644
index 9141067..0000000
--- a/debian/patches/doc-makefile-html
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ralf Treinen
-Description: skip generation of html versions of manpages which is broken
-Upstream-bug: 
https://gforge.inria.fr/tracker/index.php?func=detail&aid=14983&group_id=4395&atid=13808
-
-Index: dose3/doc/manpages/Makefile
-===================================================================
---- dose3.orig/doc/manpages/Makefile   2012-10-17 12:08:15.000000000 +0200
-+++ dose3/doc/manpages/Makefile        2012-10-17 13:21:21.000000000 +0200
-@@ -14,7 +14,7 @@
- # manpages in HTML to be generated
- HTMLA = $(patsubst %.pod,%.html,$(PODA))
- 
--all: man html
-+all: man
- 
- man: $(MANA)
- 
diff --git a/debian/patches/series b/debian/patches/series
index df664a1..3afdf61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 binaries-prefix-edos
-doc-makefile-html
 # ocaml-4.1-zip

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

_______________________________________________
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

Reply via email to