[Pkg-ocaml-maint-commits] [SCM] numerix packaging branch, master, updated. debian/0.22-6

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 2c64ec6320c4399d66abe92c004c1fbb4f460bf1
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Dec 15 22:01:08 2009 +0000

    Fix 15_doc_Makefile.dpatch (Closes: #560579)

diff --git a/debian/changelog b/debian/changelog
index 81bdd92..5beacbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-numerix (0.22-6) UNRELEASED; urgency=low
+numerix (0.22-6) unstable; urgency=low
 
   * Use dh-ocaml 0.9.1 features
   * Upgrade Standards-Version to 3.8.3 (section ocaml, README.source)
   * Shorten Uploaders field
+  * Fix 15_doc_Makefile.dpatch (Closes: #560579)
 
- -- Sylvain Le Gall <gildor at debian.org>  Tue, 15 Dec 2009 21:23:16 +0000
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 15 Dec 2009 22:00:18 +0000
 
 numerix (0.22-5) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
index 920af23..e17491f 100644
--- a/debian/clean
+++ b/debian/clean
@@ -24,3 +24,13 @@ exemples/ocaml/simple
 exemples/ocaml/simple-opt
 exemples/ocaml/sqrt-163
 exemples/ocaml/sqrt-163-opt
+doc/english/numerix.dvi
+doc/english/numerix.en.pdf
+doc/english/numerix.en.ps
+doc/english/numerix.maf
+doc/english/numerix.mtc0
+doc/francais/numerix.dvi
+doc/francais/numerix.fr.pdf
+doc/francais/numerix.fr.ps
+doc/francais/numerix.maf
+doc/francais/numerix.mtc0
diff --git a/debian/patches/15_doc_Makefile.dpatch b/debian/patches/15_doc_Makefile.dpatch
index 08baf54..2689cb4 100755
--- a/debian/patches/15_doc_Makefile.dpatch
+++ b/debian/patches/15_doc_Makefile.dpatch
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./doc/Makefile /tmp/dpep-work.NgjSc1/numerix-0.21/doc/Makefile
---- ./doc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep-work.NgjSc1/numerix-0.21/doc/Makefile	2005-09-05 14:25:40.482140496 -0400
+diff -urNad numerix~/doc/Makefile numerix/doc/Makefile
+--- numerix~/doc/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ numerix/doc/Makefile	2009-12-15 21:55:11.546509824 +0000
 @@ -0,0 +1,21 @@
 +
 +FILES = \
@@ -30,9 +30,9 @@ diff -urNad --exclude=CVS --exclude=.svn ./doc/Makefile /tmp/dpep-work.NgjSc1/nu
 +clean:
 +	make -C english clean
 +	make -C francais clean
-diff -urNad --exclude=CVS --exclude=.svn ./doc/english/Makefile /tmp/dpep-work.NgjSc1/numerix-0.21/doc/english/Makefile
---- ./doc/english/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep-work.NgjSc1/numerix-0.21/doc/english/Makefile	2005-09-05 14:25:56.163079434 -0400
+diff -urNad numerix~/doc/english/Makefile numerix/doc/english/Makefile
+--- numerix~/doc/english/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ numerix/doc/english/Makefile	2009-12-15 21:55:11.546509824 +0000
 @@ -0,0 +1,19 @@
 +
 +all: numerix.en.pdf numerix.en.ps
@@ -53,9 +53,9 @@ diff -urNad --exclude=CVS --exclude=.svn ./doc/english/Makefile /tmp/dpep-work.N
 +	latex $<
 +	latex $<
 +	latex $<
-diff -urNad --exclude=CVS --exclude=.svn ./doc/francais/Makefile /tmp/dpep-work.NgjSc1/numerix-0.21/doc/francais/Makefile
---- ./doc/francais/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep-work.NgjSc1/numerix-0.21/doc/francais/Makefile	2005-09-05 14:26:05.052910960 -0400
+diff -urNad numerix~/doc/francais/Makefile numerix/doc/francais/Makefile
+--- numerix~/doc/francais/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ numerix/doc/francais/Makefile	2009-12-15 21:55:11.546509824 +0000
 @@ -0,0 +1,20 @@
 +
 +all: numerix.fr.pdf numerix.fr.ps

-- 
numerix packaging