[Pkg-ocaml-maint-commits] r3268 - in /trunk/packages/ocaml/branches/etch-3.09.2+cdbs: ./ debian/ debian/cdbs/ debian/patches/ debian/policy/

zack at users.alioth.debian.org zack at users.alioth.debian.org
Tue Oct 24 15:31:48 UTC 2006


Author: zack
Date: Tue Oct 24 15:31:46 2006
New Revision: 3268

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3268
Log:
branch for the next upload of 3.09.2 to etch/unstable, merged here all the changes from trunk not related to ocaml 3.09.3 nor ocaml-md5sum/dh_ocaml

Added:
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/
      - copied from r3267, tags/packages/ocaml/3.09.2-6/
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/
      - copied from r3158, trunk/packages/ocaml/trunk/debian/cdbs/
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/ocaml-nox.install
      - copied unchanged from r3158, trunk/packages/ocaml/trunk/debian/ocaml-nox.install
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/00dpatch.conf
      - copied unchanged from r3158, trunk/packages/ocaml/trunk/debian/patches/00dpatch.conf
Modified:
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/ocaml-vars.mk
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/ocaml.mk
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/changelog
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/control
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/ocaml-base-nox.docs
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/   (props changed)
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/Makefile
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/appendix-svn.xml
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-generalities.xml
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-libpack.xml
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-progpack.xml
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/ocaml_packaging_policy.xml
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/rules

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/ocaml-vars.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/cdbs/ocaml-vars.mk?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/ocaml-vars.mk Tue Oct 24 15:31:46 2006
@@ -26,11 +26,13 @@
 _cdbs_class_ocaml = 1
 
 # current OCaml ABI version (ATM 3.09.2).
-# Used internally by ocaml.mk, may be useful to debian/rules writers as well
+# Used internally by ocaml.mk (substituted for @OCamlABI@ in $(OCAML_IN_FILES)
+# below), may be useful to debian/rules writers as well
 OCAML_ABI := $(shell /usr/bin/ocamlc -version)
 
 # OCaml standard library location.
-# For debian/rules writers.
+# Used internally by ocaml.mk (substituted for @OCamlStdlibDir@ in
+# $(OCAML_IN_FILES) below), may be useful to debian/rules writers as well
 OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
 
 # list of .in files contained (non-recursively) in debian/ that requires
@@ -46,8 +48,22 @@
 
 # space separated list of Debian architectures supporting OCaml native code
 # compilation.
-# Used internally by ocaml.mk, may be useful to debian/rules writers as well
+# Used internally by ocaml.mk and substituted in debian/control.in for the
+# @OCamlNativeArchs@ marker; may be useful to debian/rules writers as well
 OCAML_NATIVE_ARCHS := $(shell cat $(OCAML_STDLIB_DIR)/native-archs)
+
+# comma separated list of members of the OCaml team.
+# Substituted in debian/control.in for the @OCamlTeam@ marker
+OCAML_TEAM =
+
+OCAML_TEAM += Julien Cristau <julien.cristau at ens-lyon.org>,
+OCAML_TEAM += Ralf Treinen <treinen at debian.org>,
+OCAML_TEAM += Remi Vanicat <vanicat at debian.org>,
+OCAML_TEAM += Samuel Mimram <smimram at debian.org>,
+OCAML_TEAM += Stefano Zacchiroli <zack at debian.org>,
+OCAML_TEAM += Sven Luther <luther at debian.org>,
+OCAML_TEAM += Sylvain Le Gall <gildor at debian.org>
+# no trailing "," (comma) on the last name
 
 endif
 

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/ocaml.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/cdbs/ocaml.mk?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/cdbs/ocaml.mk Tue Oct 24 15:31:46 2006
@@ -46,7 +46,10 @@
 ocamlinit: ocamlinit-stamp
 ocamlinit-stamp:
 	for f in $(OCAML_IN_FILES) ; do \
-		sed -e 's/@OCamlABI@/$(OCAML_ABI)/g' $$f.in > $$f ; \
+		sed \
+			-e 's/@OCamlABI@/$(OCAML_ABI)/g' \
+			-e 's/@OCamlStdlibDir@/$(OCAML_STDLIB_DIR)/g' \
+			$$f.in > $$f ; \
 	done
 	touch $@
 clean::
@@ -58,7 +61,10 @@
 ifneq ($(DEB_AUTO_UPDATE_DEBIAN_CONTROL),)
 debian/control::
 	if test -f debian/control && test -f debian/control.in ; then \
-		sed -i -e "s/@OCamlNativeArchs@/$(OCAML_NATIVE_ARCHS)/g" $@ ; \
+		sed -i \
+			-e "s/@OCamlNativeArchs@/$(OCAML_NATIVE_ARCHS)/g" \
+			-e "s/@OCamlTeam@/$(OCAML_TEAM)/g" \
+			$@ ; \
 	fi
 endif
 

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/changelog?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/changelog (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/changelog Tue Oct 24 15:31:46 2006
@@ -1,3 +1,27 @@
+ocaml (3.09.2-7) UNRELEASED; urgency=low
+
+  [ Julien Cristau ]
+  * Fix typo in ocaml-base description (Closes: #390224).
+
+  [ Stefano Zacchiroli ]
+  * debian/control
+    - added XS-Vcs-Svn field to let users know where our svn repository is
+  * Added .txt suffix to the textual version of the policy
+  * Ship CDBS class for building OCaml related packages in
+    /usr/share/cdbs/1/ (permission granted by the CDBS maintainers to
+    ship files there, see #387299), closes: #387299.
+  * Updated policy (now at version 0.7.1); changes:
+    - added a best-practice section about using the XS-Vcs-Svn field in
+      debian/control of OCaml related packages
+    - fixed typo in the suggested debian/rules line to fill the OFILES
+      variable
+
+  [ Samuel Mimram ]
+  * Updated policy (section 2.3) to explain how to add a conditional
+    dependency on ocaml-base-nox-VERSION for native/bytecode packages.
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 24 Oct 2006 17:31:02 +0200
+
 ocaml (3.09.2-6) unstable; urgency=low
 
   * Correct /usr/include/caml symbolic link, closes: #379271.

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/control?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/control (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/control Tue Oct 24 15:31:46 2006
@@ -5,6 +5,7 @@
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>
 Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
 Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml
 
 Package: ocaml-nox
 Architecture: any
@@ -92,7 +93,7 @@
  This package contains only the runtime system needed to run bytecode
  executables. The `ocaml' package contains the full development suite of
  Objective Caml.  You may wish to install the 'ocaml-base-nox' package if
- you do not require any graphical capilities for your runtime.
+ you do not require any graphical capabilities for your runtime.
 
 Package: ocaml-native-compilers
 Architecture: alpha amd64 arm hurd-i386 i386 ia64 kfreebsd-i386 powerpc sparc

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/ocaml-base-nox.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/ocaml-base-nox.docs?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/ocaml-base-nox.docs (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/ocaml-base-nox.docs Tue Oct 24 15:31:46 2006
@@ -1,4 +1,4 @@
 Changes
 README
-debian/policy/ocaml_packaging_policy
+debian/policy/ocaml_packaging_policy.txt
 debian/policy/ocaml_packaging_policy.html

Propchange: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 24 15:31:46 2006
@@ -1,0 +1,2 @@
+ocaml_packaging_policy.html
+ocaml_packaging_policy.txt

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/policy/Makefile?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/Makefile (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/Makefile Tue Oct 24 15:31:46 2006
@@ -1,14 +1,25 @@
+NULL =
+INSTALL_STUFF =				\
+	ocaml_packaging_policy.html/	\
+	ocaml_packaging_policy.txt	\
+	$(NULL)
+
 all: html text
 
-html:
-	docbook2html ocaml_packaging_policy.xml -o ocaml_packaging_policy.html
+# to be used on alioth for updating policy linked by pkg-ocaml-maint home page
+install: all
+	cp -r $(INSTALL_STUFF) ~/pkg-ocaml-maint/htdocs/
 
-text:
-	docbook2txt ocaml_packaging_policy.xml
-	mv ocaml_packaging_policy.txt ocaml_packaging_policy
+html: ocaml_packaging_policy.html/index.html
+text: ocaml_packaging_policy.txt
+
+ocaml_packaging_policy.html/index.html: ocaml_packaging_policy.xml *.xml
+	docbook2html $< -o $(dir $@)
+ocaml_packaging_policy.txt: ocaml_packaging_policy.xml *.xml
+	docbook2txt $<
 
 clean:
-	$(RM) -rf ocaml_packaging_policy.html ocaml_packaging_policy
+	$(RM) -rf ocaml_packaging_policy.html/ ocaml_packaging_policy.txt
 
 upload_web: all
 	scp -rC ocaml_packaging_policy ocaml_packaging_policy.html alioth.debian.org:/org/alioth.debian.org/chroot/home/groups/pkg-ocaml-maint/htdocs/

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/appendix-svn.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/policy/appendix-svn.xml?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/appendix-svn.xml (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/appendix-svn.xml Tue Oct 24 15:31:46 2006
@@ -1,20 +1,74 @@
-<section>
-    <title>How to obtain a copy of the SVN archive</title>
-    <para>
-      You can obtain a copy of debian-ocaml-maint SVN archive by
+
+<section>
+  <title>Use SVN and let your users know about it</title>
+  <para>
+    (Hopefully) All OCaml-related Debian packages are maintained using a
+    centralized <ulink url="http://subversion.tigris.org/">Subversion</ulink>
+    (<acronym>SVN</acronym> for short) repository. This practice reduce the
+    efforts needed to contribute work inside &ocaml-force; and, in case of
+    need, provides a place where to massively perform changes to all
+    OCaml-related Debian packages.
+  </para>
+  <para>
+    Nonetheless, Debian users can benefit knowing we are using a SVN
+    repository (they can for instance subscribe to the RSS feed for changes
+    or have a place where to look for finding patches corresponding to bugs
+    tagged "pending" in the BTS).
+  </para>
+  <para>
+    For this reason <emphasis>it is recommended to add the
+    <code>XS-Vcs-Svn</code> field to the <filename>debian/control</filename>
+    of packages maintained in &ocaml-force; SVN repository</emphasis>. Its name
+  specifies that we are using Subversion as our Version Control System
+  (<acronym>VCS</acronym>); its value is the URL pointing to the package's
+  trunk directory.
+  </para>
+  <para>
+    The general scheme for using the field is thus:
+    <programlisting>
+  XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/<emphasis>PACKAGE_NAME</emphasis>
+    </programlisting>
+    <example>
+      <title>Usage example of the XS-Vcs-Svn field, from the
+        <application>findlib</application> package
+      </title>
       <programlisting>
-svn co svn+ssh://svn.debian.org/svn/pkg-ocaml-maint
+  Source: findlib
+  Section: devel
+  Priority: optional
+  Maintainer: Stefano Zacchiroli &lt;zack at debian.org&gt;
+  Build-Depends: debhelper (>> 4.0.0), ocaml (>= 3.09.2), m4, gawk | awk, dpatch, cdbs
+  Standards-Version: 3.7.2
+  <emphasis>XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/findlib</emphasis>
+
+  Package: ocaml-findlib
+  Section: devel
+  Architecture: any
+  Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+  Description: Management tool for OCaml programming language libraries
+  ...
+      </programlisting>
+    </example>
+  </para>
+</section>
+
+<section>
+    <title>How to obtain a copy of the SVN repository</title>
+    <para>
+      You can obtain a copy of debian-ocaml-maint SVN repository by
+      <programlisting>
+  svn co svn+ssh://svn.debian.org/svn/pkg-ocaml-maint
       </programlisting>
       You must be member of the
       <ulink url="http://pkg-ocaml-maint.alioth.debian.org/">Debian
-      OCaml Task Force</ulink> in order to have write access to this archive. 
-    </para>
-</section>
-
-<section>
-    <title>Structure of the SVN archive</title>
-    <para>
-        We keep all files of the debian subdirectory under svn control, and
+      OCaml Task Force</ulink> in order to have write access to the repository. 
+    </para>
+</section>
+
+<section>
+    <title>Structure of the SVN repository</title>
+    <para>
+        We keep all files of the debian subdirectory under SVN control, and
         upstream only as a compressed tarball. The rationale behind this is
         that changes to upstream files should be managed by the <application>dpatch</application> patch
         manager. Hence, all the diffs to upstream files are kept in a
@@ -23,7 +77,7 @@
     </para>
 
     <para>
-        The structure of the pkg-ocaml-maint svn archive is as follows, where
+        The structure of the pkg-ocaml-maint SVN repository is as follows, where
         generic names are indicated in square brackets <varname>[ .. ]</varname>, and where the
         contents of subdirectories not directly relevant for package management
         are not detailed:
@@ -59,10 +113,10 @@
 </section>
 
 <section>
-    <title>How to add a new package to the SVN archive</title>
+    <title>How to add a new package to the SVN repository</title>
     <para>
         Place yourself in the directory <filename>trunk/packages</filename> of your working copy of
-        the svn repository. Create a directory with the same name as your
+        the SVN repository. Create a directory with the same name as your
         source package (let's say, my-package), and subdirectories <filename>upstream</filename>
         and <filename>trunk</filename>.  Put the current upstream tarball in <filename>upstream</filename>, and the
         current debian directory with all its relevant files in <filename>trunk</filename>. This
@@ -105,7 +159,7 @@
             </listitem>
             <listitem>
                 <para>
-                    The structure of our svn repository is not among the default structures
+                    The structure of our SVN repository is not among the default structures
                     of <application>svn-buildpackage</application>. Hence, we have to override the default location of some
                     directories.
                 </para>
@@ -117,8 +171,8 @@
         Place yourself in <filename>trunk/packages/my_packages/trunk</filename>, and do the following:
         <command>svn propset mergeWithUpstream 1 debian</command>.
         This registers the property "mergeWithUpstream" with the current
-        directory, such that svn-buildpackage knows that it has to use merge
-        mode as explained above.
+	directory, such that <application>svn-buildpackage</application> knows
+	that it has to use merge mode as explained above.
     </para>
 
     <para>
@@ -159,10 +213,11 @@
     </para>
 
     <para>
-        svn-buildpackage will complain when your copy of the debian directory
-        is not in sync with the repository. You may use the option
-        <option>--svn-ignore-new</option> to override this behaviour. The package will be
-        build in the directory <filename>../build-area</filename>.
+      <application>svn-buildpackage</application> will complain when your copy
+      of the debian directory is not in sync with the repository. You may use
+      the option <option>--svn-ignore-new</option> to override this behaviour.
+      The package will be build in the directory
+      <filename>../build-area</filename>.
     </para>
 
     <para>
@@ -173,12 +228,13 @@
         Provided you have commited all your changes to the svn repository, this
         will after a successful build of the package create a tag for the current
         version in <filename>tags/packages/my_package</filename>. The tagging is done directly in the
-        svn repository.
+        SVN repository.
     </para>
 
     <tip>
         <para>
-            Some useful aliases taken from the svn-buildpackage HOWTO:
+	  Some useful aliases taken from the
+	  <application>svn-buildpackage</application> HOWTO:
             <programlisting>
 alias svn-b='svn-buildpackage -rfakeroot --svn-dont-clean -us -uc --svn-ignore'
 alias svn-bt='svn-buildpackage -rfakeroot --svn-lintian --svn-dont-clean --svn-tag'
@@ -206,7 +262,7 @@
     <title>dpatch</title>
 
     <para>
-        dpatch will work properly at package build time with the svn
+        dpatch will work properly at package build time with the SVN
         structure described above since all of the build process will be
         carried out in a fresh directory. However, invoking
         <filename>debian/rules</filename> with the "clean" target in
@@ -227,3 +283,4 @@
         </programlisting>
     </para>
 </section>
+

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-generalities.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/policy/chapter-generalities.xml?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-generalities.xml (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-generalities.xml Tue Oct 24 15:31:46 2006
@@ -112,8 +112,10 @@
 
   <para>
       At the time of this writing, the latest version of OCaml in
-  Debian is &ocaml-version;.  </para>
-
+      Debian is &ocaml-version;.  </para>
+
+  <section>
+      <title>Packages for OCaml</title>
     <para>
     The <filename>ocaml</filename> package depends on all the basic
     packages needed to develop programs with OCaml. More specifically,
@@ -175,7 +177,8 @@
     <filename>ocaml-nox-&ocaml-version;</filename>,
     <filename>ocaml-base-&ocaml-version;</filename>,
     <filename>ocaml-base-nox-&ocaml-version;</filename>.
-    </para>
+</para>
+</section>
 
     <section>
       <title>OCaml Location</title>

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-libpack.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/policy/chapter-libpack.xml?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-libpack.xml (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-libpack.xml Tue Oct 24 15:31:46 2006
@@ -92,7 +92,7 @@
         The string <varname>@OCamlABI@</varname> is substituted at build-time by the version of OCaml. Here are the relevant parts of the <filename>debian/rules</filename> file:
         <programlisting>
 	OCAMLABI := $(shell ocamlc -version)
-	OFILES := $(filter-out debian/control,(patsubst %.in,%,$(wildcard debian/*.in)))
+	OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
 
 	ocamlinit:
 		for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-progpack.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/policy/chapter-progpack.xml?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-progpack.xml (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/chapter-progpack.xml Tue Oct 24 15:31:46 2006
@@ -73,6 +73,10 @@
 version constraints can be used. However, this should be justified by
 the requirements of the compilation of the program.
 </para>
+
+<para>
+    Bytecode programs which are compiled by <code>ocamlc -custom</code> must not be stripped. In particular, their package should be excluded from the <filename>dh_strip</filename> script. When compiled this way, an elf executable is generated containing the ocaml interpreter, and the bytecode of the program in a section which is removed when the program is stripped. For more information, see the bug <ulink url="http://bugs.debian.org/256900">256900</ulink>. An override for the lintian warning is considered as acceptable in this situation.
+</para>
 </section>
 
 <section id="bytecode-native-prog">
@@ -124,6 +128,25 @@
 	binary-indep: build install
 	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
       </programlisting>
-    </para>
+  </para>
+
+  <para>
+      In the case where there is only one package, which provides either a native version where available or a bytecode version otherwise, the dependency on <varname>ocaml-base-nox-&ocaml-version;</varname> should be added only when the package is built in native mode. For example, the <filename>debian/control</filename> of <filename>approx</filename> contains:
+      <programlisting>
+	Package: approx
+	Architecture: any
+	Depends: ${shlibs:Depends}, ${F:OCamlRun}, adduser, bzip2, curl
+      </programlisting>
+      and the corresponding <filename>debian/rules</filename> contains:
+      <programlisting>
+	OCAMLABI = $(shell ocamlc -version)
+	BYTECODE = $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
+	OCAMLRUN = $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
+	...
+	binary-arch:
+		...
+		dh_gencontrol -- -VF:OCamlRun="$(OCAMLRUN)"
+      </programlisting>
+  </para>
 
 </section>

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/ocaml_packaging_policy.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/policy/ocaml_packaging_policy.xml?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/ocaml_packaging_policy.xml (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/policy/ocaml_packaging_policy.xml Tue Oct 24 15:31:46 2006
@@ -33,7 +33,7 @@
 <book>
     <bookinfo>
         <title>&debian-name; &ocaml-name; Packaging Policy for OCaml &ocaml-version;</title>
-        <releaseinfo>Revision 0.7</releaseinfo>
+        <releaseinfo>Revision 0.7.1</releaseinfo>
         &authors;
         &legal;
     </bookinfo>

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/rules?rev=3268&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/rules (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/rules Tue Oct 24 15:31:46 2006
@@ -254,19 +254,19 @@
 		ln -sf ../ocaml-base-nox/Changes.gz .; \
 		ln -sf ../ocaml-base-nox/README.gz .; \
 		ln -sf ../ocaml-base-nox/README.Debian .; \
-		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz .; \
 		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.html .
 	cd debian/ocaml-nox/usr/share/doc/ocaml-nox; \
 		ln -sf ../ocaml-base-nox/Changes.gz .; \
 		ln -sf ../ocaml-base-nox/README.gz .; \
 		ln -sf ../ocaml-base-nox/README.Debian .; \
-		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz .; \
 		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.html .
 	cd debian/ocaml-base/usr/share/doc/ocaml-base; \
 		ln -sf ../ocaml-base-nox/Changes.gz .; \
 		ln -sf ../ocaml-base-nox/README.gz .; \
 		ln -sf ../ocaml-base-nox/README.Debian .; \
-		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz .; \
 		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.html .
 
 	dh_install -a




More information about the Pkg-ocaml-maint-commits mailing list