[Pkg-ocaml-maint-commits] [SCM] ounit packaging branch, master, updated. debian/1.0.3-4

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 2d1c43679f16fdc45255b381dee2fb1dcd6c368d
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Mon Dec 14 23:38:48 2009 +0000

    Fix ocaml:Provides and clean docbook generation

diff --git a/debian/README.source b/debian/README.source
index 62605d2..5dde0bf 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,58 @@
-This package use dpatch for patching the source. 
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
 
-Please consider reading dpatch manpage to patch the source.
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
 
- -- Sylvain Le Gall <gildor at debian.org>  Sun, 22 Jun 2008 23:26:52 +0200
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/changelog b/debian/changelog
index 874d5e1..6807b89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ounit (1.0.3-4) unstable; urgency=low
+
+  * Add Provides field for dh-ocaml
+  * Use quilt to apply patch valid-docbook
+
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 14 Dec 2009 23:37:32 +0000
+
 ounit (1.0.3-3) unstable; urgency=low
 
   [ Sylvain Le Gall ]
diff --git a/debian/control b/debian/control
index 067cc5a..c9598ea 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: cdbs (>= 0.4),
  ocaml-nox (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.5),
  docbook-utils,
- dh-ocaml (>= 0.9)
+ dh-ocaml (>= 0.9.1),
+ quilt
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ounit.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ounit.git
@@ -22,6 +23,7 @@ Depends:
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: Unit testing framework for Objective Caml
  OUnit is a unit testing framework for Objective Caml, imspired
  by the JUnit tool for JAva and the HUnit tool for Haskell.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fe16a07
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+valid-docbook
diff --git a/debian/patches/valid-docbook b/debian/patches/valid-docbook
new file mode 100644
index 0000000..ae0f2be
--- /dev/null
+++ b/debian/patches/valid-docbook
@@ -0,0 +1,42 @@
+Index: ounit/doc/manual/src/OUnit.xml
+===================================================================
+--- ounit.orig/doc/manual/src/OUnit.xml	2009-12-14 23:31:45.000000000 +0000
++++ ounit/doc/manual/src/OUnit.xml	2009-12-14 23:31:59.000000000 +0000
+@@ -1,4 +1,6 @@
+-<!DOCTYPE book PUBLIC "-//Davenport//DTD DocBook V3.0//EN">
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
++"/usr/share/xml/schema/dtd/4.3/docbookx.dtd" []>
+ 
+ <book>
+ 
+@@ -43,12 +45,10 @@
+   <legalnotice>
+     <title>License</title>
+ 
+-    <para>
+-    
+     <orderedlist>
+       <listitem>
+         <para>
+-          The package OUnit is Copyright &copy; 2002, 2003, 2004, 2005 by
++          The package OUnit is (C) 2002, 2003, 2004, 2005 by
+           Maas-Maarten Zeeman.
+         </para>
+       </listitem>
+@@ -114,6 +114,7 @@
+     The next section helps you to get started using OUnit in simple
+     ways.
+   </para>
++</chapter>
+ 
+ <chapter>
+ <title>Getting Started</title>
+@@ -236,6 +237,7 @@
+   side-effects. 
+     
+ </para>
++</chapter>
+ 
+ </book>
+     
diff --git a/debian/rules b/debian/rules
index 502c3c6..610d1a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
+include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 PACKAGE_DEV := libounit-ocaml-dev
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)

-- 
ounit packaging