[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.6.0-13-62-g0a6f1ff

[Ralf Treinen]

The following commit has been merged in the experimental branch:
commit eb6d14672ce778bad0181600fb896ae0c38e4b4b
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Mar 8 20:19:24 2010 +0100

    apply Helhe Kreutzmann's patch of the manpage

diff --git a/debian/changelog b/debian/changelog
index c179ecf..e8c534a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
 advi (1.8-1) experimental; urgency=low
 
   [ Ralf Treinen ]
-  * New upstream release
+  * New upstream release (closes: Bug#368830).
   * /etc/advi/jpfonts.conf: use new symlinks for Japanese fonts. Thanks to
     Junichi Uekawa for the patch (closes: Bug#506047).
-  * Added Homepage field to debian/control file
-  * Cleaned up Uploaders field in debian/control.
-  * Rewrote debian/rules from scratch
+  * Applied Helge Kreutzmann's patch to the manpage. Thanks, Helge!
+    (closes: Bug#286456).
+  * Miscellaneous in debian/control:
+    - Added Homepage field to debian/control file
+    - Cleaned up Uploaders field in debian/control.
+    - Replaced dependency on gs by ghostscript
+    - Removed suggestion of xbase-clients from advi-examples
+    - Standards-Version 3.8.4 (no change)
+  * Rewrote debian/rules from scratch, using dh
   * DH compatibility level 7
   * Build-dependency:
     - remove ocaml-best-compilers: normal ocaml compilers are sufficient
@@ -19,10 +25,7 @@ advi (1.8-1) experimental; urgency=low
   * Remove debian/post{inst,rm}, use dh_installtex instead
   * Do not try to install the documentation file "Announce"
   * rename debian/docs to debian/advi.docs, links into advi.links
-  * Replaced dependency on gs by ghostscript
-  * Removed suggestion of xbase-clients from advi-examples
   * debian/copyright: added INRIA as copyright holder
-  * Standards-Version 3.8.4 (no change)
   * Source format 3.0 (quilt)
   * The directories examples/ and test/ are gone from upstream. We put
     these directories from advi-1.6 into debian/examples-source. This
@@ -31,6 +34,7 @@ advi (1.8-1) experimental; urgency=low
     - 0004-Japanese-fonts: jpfonts.config is no longer in upstream, put it
       into debian/. Patch renamed to japanese-fonts
     - 0005-Cache-dir.patch: renamed to cache-dir-tilde-expansion
+    - 0015-Manpage-update.patch: renamed to manpage
     - The following patches are no longe relevant, and have been removed:
         0001-Pull-CVS-HEAD-as-of-20060103 (now integrated in upstream)
         0002-Makefile-.depend-workaround-for-buggy-make-behavior
@@ -61,7 +65,7 @@ advi (1.8-1) experimental; urgency=low
   * Replace obsolete build-dep on x-dev (Closes: #515364)
   * Switch packaging to git
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 07 Mar 2010 14:32:24 +0100
+ -- Ralf Treinen <treinen at debian.org>  Mon, 08 Mar 2010 20:14:16 +0100
 
 advi (1.6.0-13) unstable; urgency=low
 
diff --git a/debian/patches/0015-Manpage-update.patch b/debian/patches/manpage
similarity index 95%
rename from debian/patches/0015-Manpage-update.patch
rename to debian/patches/manpage
index b836a9e..ad3fcd1 100644
--- a/debian/patches/0015-Manpage-update.patch
+++ b/debian/patches/manpage
@@ -1,18 +1,10 @@
-From 607d8e4362b2e41b4a9735b6497568b77a6ab7a0 Mon Sep 17 00:00:00 2001
-From: Helge Kreutzmann <kreutzm at itp.uni-hannover.de>
-Date: Fri, 24 Apr 2009 00:21:50 +0200
-Subject: [PATCH] Manpage update
+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
 
-numerous improvements for the man page (though more are possible)
-including a Debian-specific reference to zadvi
----
- doc_src/advi.man |  144 ++++++++++++++++++++++++++++++++++--------------------
- 1 files changed, 91 insertions(+), 53 deletions(-)
-
-diff --git a/doc_src/advi.man b/doc_src/advi.man
-index 7edb3fc..a9874ff 100644
---- a/doc_src/advi.man
-+++ b/doc_src/advi.man
+--- a/doc/advi.1
++++ b/doc/advi.1
 @@ -15,11 +15,11 @@
  .\" .br        insert line break
  .\" .sp <n>    insert n+1 empty lines
diff --git a/debian/patches/series b/debian/patches/series
index a055f5b..41f2a86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 japanese-fonts
 cache-dir-tilde-expansion
 # byte-compilation-no-custom
+manpage

-- 
advi packaging