[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9-2-8-gcdd5af2

[Ralf Treinen]

The following commit has been merged in the master branch:
commit ab30aa3b54c19f8464d219036585a4e44ba9f572
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Mar 23 21:39:07 2010 +0100

    note that patches have been sent upstream

diff --git a/debian/patches/cache-dir-tilde-expansion b/debian/patches/cache-dir-tilde-expansion
index ee24512..b1634b3 100644
--- a/debian/patches/cache-dir-tilde-expansion
+++ b/debian/patches/cache-dir-tilde-expansion
@@ -1,14 +1,8 @@
-From 58b19deb965baee4c325f6aacb91d736b5931a04 Mon Sep 17 00:00:00 2001
 From: Stefano Zacchiroli <zack at debian.org>
 Date: Fri, 24 Apr 2009 00:11:24 +0200
 Subject: [PATCH] Cache dir
+Sent-to-upstream: Didier Remy <Didier.Remy at inria.fr>, 2010/03/17
 
----
- userfile.ml |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/userfile.ml b/userfile.ml
-index 7701d84..d4521dd 100644
 --- a/src/userfile.ml
 +++ b/src/userfile.ml
 @@ -224,6 +224,12 @@ let get_user_advi_cache_dir () =
diff --git a/debian/patches/manpage b/debian/patches/manpage
index ad3fcd1..8784731 100644
--- a/debian/patches/manpage
+++ b/debian/patches/manpage
@@ -2,6 +2,7 @@ Author: Helge Kreutzmann <kreutzm at itp.uni-hannover.de>
 Description: numerous improvements for the man page (though more are possible)
   including a Debian-specific reference to zadvi
 Debian-bug: #286456
+Sent-to-upstream: Didier Remy <Didier.Remy at inria.fr> 2010/03/17
 
 --- a/doc/advi.1
 +++ b/doc/advi.1

-- 
advi packaging