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

treinen pushed a commit to branch master
in repository dose3.

commit 3c8778659964e38c8c19109647fb7a5d8003cb8c
Author: Ralf Treinen <trei...@free.fr>
Date:   Tue Oct 21 20:29:02 2014 +0200

    fix doc target of main Makefile
---
 debian/changelog          |  5 ++++-
 debian/patches/doc-target | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series     |  1 +
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0f63ffe..329cd10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dose3 (3.3~beta1-1) UNRELEASED; urgency=low
       buildcheck-redirect-output
     - dropped patches that were integrated upstream: buildcheck-manpage,
       buildcheck-manpage-native-arch, multiarch-accept-value-no
+  * new patches, cherry-picked from upstream git:
+    - doc-target (fix doc target of Makefile)
+    - installcudf-target (restore that target which was accidentially dropped)
   * add rudimentary as-installed package tests for dose-debcheck,
     dose-builddebcheck, dose-outdated
   * debian/control: replace Conflicts: by Breaks:
@@ -23,7 +26,7 @@ dose3 (3.3~beta1-1) UNRELEASED; urgency=low
   * d/control: s/debian/Debian/ to avoid capitalization-error-in-description
   * dropped buildcheck-redirect-output because it was integrated upstream
 
- -- Ralf Treinen <trei...@debian.org>  Mon, 20 Oct 2014 19:59:11 +0200
+ -- Ralf Treinen <trei...@debian.org>  Tue, 21 Oct 2014 20:28:45 +0200
 
 dose3 (3.2.2-3) unstable; urgency=medium
 
diff --git a/debian/patches/doc-target b/debian/patches/doc-target
new file mode 100644
index 0000000..4293d33
--- /dev/null
+++ b/debian/patches/doc-target
@@ -0,0 +1,55 @@
+Author: Pietro Abate <pietro.ab...@pps.jussieu.fr>
+Description: fix doc target
+Upstream commit: d55cf3a0902b1b50e14a9a2dd714029cf6a9e2f4 (partially)
+
+diff --git a/Makefile b/Makefile
+index 866604a..b4f4957 100644
+--- a/Makefile
++++ b/Makefile
+@@ -216,8 +216,8 @@ changelog:
+ credits:
+       @git log --pretty=format:'%aN        %aE' | LC_ALL=C sort -u | awk 
-F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';
+ 
+-doc: fast
+-      $(OCAMLBUILD) $(OBFLAGS) dose3.docdir/index.html dose3.docdir/index.dot
++doc: all
++      $(OCAMLBUILD) dose3.docdir/index.html dose3.docdir/index.dot
+       dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
+       (cd doc && $(MAKE) all)
+ 
+@@ -230,4 +230,4 @@ upload: doc
+ 
+ .PHONY: \
+       common algo debian eclipse rpm cws doseparseNoRpm doseparse \
+-      all fast opt clean top-level headers test tags install uninstall dist 
doc man
++      all clean top-level headers test tags install uninstall dist doc man
+diff --git a/doc/apt-external-solvers.primer/apt-external-solvers.tex 
b/doc/apt-external-solvers.primer/apt-external-solvers.tex
+index 726595f..3597ada 100644
+--- a/doc/apt-external-solvers.primer/apt-external-solvers.tex
++++ b/doc/apt-external-solvers.primer/apt-external-solvers.tex
+@@ -11,7 +11,7 @@
+ 
+ \documentclass{article}
+ \usepackage[utf8]{inputenc}
+-%\usepackage{hevea}
++\usepackage{hevea}
+ \usepackage{alltt}
+ 
+ \input{version}
+diff --git a/dose3.odocl.in b/dose3.odocl.in
+index d24bd73..7f1a3ec 100644
+--- a/dose3.odocl.in
++++ b/dose3.odocl.in
+@@ -22,7 +22,10 @@ applications/Ceve
+ applications/Apt-cudf
+ applications/Outdated
+ applications/Challenged
+-doseparse/BoilerplateNoRpm
+-doseparse/Boilerplate
++doseparse/StdDebian
++doseparse/StdDebug
++doseparse/StdLoaders
++doseparse/StdOptions
++doseparse//StdUtils
+ @DOC_OCAMLGRAPH@
+ @DOC_RPM@
diff --git a/debian/patches/series b/debian/patches/series
index 2e270a6..db4cc20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 binaries-prefix-edos
 coinstall-binary-name
+doc-target

-- 
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