[Pkg-ocaml-maint-commits] r3499 - in /trunk/packages/camomile/trunk/debian: README changelog control control.in copyright rules watch xml-man/Makefile xml-man/camomilecharmap.xml xml-man/camomilelocaledef.xml

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Sun Jan 7 22:55:00 CET 2007 

Author: gildor
Date: Sun Jan  7 22:54:59 2007
New Revision: 3499

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3499
Log:
[copy and paste changelog]
* Upgrade debian/watch version to 3,
* Use ocaml.mk for CDBS,
* Add extra double quote to protect the variable inside the
  Makefile,
* Modify debian/xml-man/Makefile to disable result output
  of xmllint command,
* Modify debian/xml-man/*.xml to remove some comments,
* Remove ocaml-nox depends in debian/control.in (added through
  ocaml.mk),
* Remove libcamomile-ocaml-dev.dirs when cleaning (generated by
  ocaml.mk),
-- SLG

Modified:
    trunk/packages/camomile/trunk/debian/README
    trunk/packages/camomile/trunk/debian/changelog
    trunk/packages/camomile/trunk/debian/control
    trunk/packages/camomile/trunk/debian/control.in
    trunk/packages/camomile/trunk/debian/copyright
    trunk/packages/camomile/trunk/debian/rules
    trunk/packages/camomile/trunk/debian/watch
    trunk/packages/camomile/trunk/debian/xml-man/Makefile
    trunk/packages/camomile/trunk/debian/xml-man/camomilecharmap.xml
    trunk/packages/camomile/trunk/debian/xml-man/camomilelocaledef.xml

Modified: trunk/packages/camomile/trunk/debian/README
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/README?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/README (original)
+++ trunk/packages/camomile/trunk/debian/README Sun Jan  7 22:54:59 2007
@@ -6,4 +6,4 @@
 
 Please have a look to /usr/share/doc/libcamomile-ocaml-data.
 
- -- Sylvain LE GALL <sylvain.le-gall at polytechnique.org>  Tue, 16 Mar 2004 23:31:16 +0100
+ -- Sylvain LE GALL <gildor at debian.org>  Tue, 16 Mar 2004 23:31:16 +0100

Modified: trunk/packages/camomile/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/changelog?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/changelog (original)
+++ trunk/packages/camomile/trunk/debian/changelog Sun Jan  7 22:54:59 2007
@@ -1,3 +1,19 @@
+camomile (0.7.1-2) UNRELEASED; urgency=low
+
+  * Upgrade debian/watch version to 3,
+  * Use ocaml.mk for CDBS,
+  * Add extra double quote to protect the variable inside the 
+    Makefile,
+  * Modify debian/xml-man/Makefile to disable result output 
+    of xmllint command,
+  * Modify debian/xml-man/*.xml to remove some comments,
+  * Remove ocaml-nox depends in debian/control.in (added through
+    ocaml.mk),
+  * Remove libcamomile-ocaml-dev.dirs when cleaning (generated by 
+    ocaml.mk),
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu,  9 Nov 2006 23:39:10 +0100
+
 camomile (0.7.1-1) unstable; urgency=low
 
   * New upstream release, ship with META.in (Closes: #389470)

Modified: trunk/packages/camomile/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/control?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/control (original)
+++ trunk/packages/camomile/trunk/debian/control Sun Jan  7 22:54:59 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2), ocaml-findlib, dpkg-dev (>= 1.13.19), 
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), ocaml-findlib, dpkg-dev (>= 1.13.19),
  xsltproc, docbook-xsl ( >= 1.64.1.0-1 ), docbook-xml
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camomile

Modified: trunk/packages/camomile/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/control.in?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/control.in (original)
+++ trunk/packages/camomile/trunk/debian/control.in Sun Jan  7 22:54:59 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2), ocaml-findlib, dpkg-dev (>= 1.13.19), 
+Build-Depends: @cdbs@, ocaml-findlib, dpkg-dev (>= 1.13.19),
  xsltproc, docbook-xsl ( >= 1.64.1.0-1 ), docbook-xml
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camomile

Modified: trunk/packages/camomile/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/copyright?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/copyright (original)
+++ trunk/packages/camomile/trunk/debian/copyright Sun Jan  7 22:54:59 2007
@@ -1,4 +1,4 @@
-This package was debianized by Sylvain LE GALL <sylvain.le-gall at polytechnique.org> on
+This package was debianized by Sylvain LE GALL <gildor at debian.org> on
 Wed, 20 Sep 2003 17:50:39 +0200.
 
 It was downloaded from :

Modified: trunk/packages/camomile/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/rules?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/rules (original)
+++ trunk/packages/camomile/trunk/debian/rules Sun Jan  7 22:54:59 2007
@@ -23,32 +23,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
-
-OCAMLABI               := $(shell ocamlc -version)
-DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAMLABI)"
-OCAML_STDLIB_DIR       := $(shell ocamlc -where)
-
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-
-ocamlinit:
-	echo -n > $(CURDIR)/ocamlinit-stamp; \
-	for f in $(OFILES); do \
-	  sed -e 's/@OCamlStdlibDir@/$(subst /,\/,$(OCAML_STDLIB_DIR))/g' \
-	  $$f.in > $$f; \
-	  echo $$f >> $(CURDIR)/ocamlinit-stamp; \
-	done
-
-clean::
-	if [ -e $(CURDIR)/ocamlinit-stamp ]; then \
-	  for f in `cat $(CURDIR)/ocamlinit-stamp`; do \
-	    if [ -e $$f.in ] && [ -e $$f ]; then \
-	      $(RM) $$f; \
-	    fi; \
-	  done; \
-	  $(RM) $(CURDIR)/ocamlinit-stamp; \
-	fi
-
-common-configure-indep common-configure-arch:: ocamlinit
+include /usr/share/cdbs/1/class/ocaml.mk
 
 PACKAGE_DEV := libcamomile-ocaml-dev
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
@@ -60,11 +35,13 @@
 DEB_MAKE_BUILD_TARGET    := all dochtml
 DEB_MAKE_INSTALL_TARGET  := install \
                             OCAMLFIND_INSTALL_FLAGS="-ldconf  ignore \
-                               -destdir $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" \
+                               -destdir \"$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)\"" \
                             DATADIR="$(DESTDIR_COMMON)/usr/share/" \
                             BINDIR="$(DESTDIR_DEV)/usr/bin/"
 
 DEB_CONFIGURE_EXTRA_FLAGS := --datadir=/usr/share
+
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
 
 clean::
 	-$(RM) config.* Makefile
@@ -73,7 +50,8 @@
 	-$(RM) internal/uReStrParser.output
 	-$(RM) META
 	-$(RM) camomileDefaultConfig.ml
-	-$(DEB_MAKE_ENVVARS) $(MAKE) -C debian/xml-man clean
+	-$(RM) debian/libcamomile-ocaml-dev.dirs 
+	-$(DEB_MAKE_ENVVARS) $(MAKE) -C $(CURDIR)/debian/xml-man clean
 
 build/libcamomile-ocaml-dev::
-	$(DEB_MAKE_ENVVARS) $(MAKE) -C debian/xml-man all
+	$(DEB_MAKE_ENVVARS) $(MAKE) -C $(CURDIR)/debian/xml-man all

Modified: trunk/packages/camomile/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/watch?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/watch (original)
+++ trunk/packages/camomile/trunk/debian/watch Sun Jan  7 22:54:59 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://prdownloads.sourceforge.net/camomile/camomile-([0-9].*)\.tar\.bz2

Modified: trunk/packages/camomile/trunk/debian/xml-man/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/xml-man/Makefile?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/xml-man/Makefile (original)
+++ trunk/packages/camomile/trunk/debian/xml-man/Makefile Sun Jan  7 22:54:59 2007
@@ -1,3 +1,5 @@
+# Makefile for building camomile manpages.
+# GNU Copyright 2006, by Sylvain Le Gall <gildor at debian.org>.
 
 all: camomilecharmap.1 camomilelocaledef.1
 
@@ -6,7 +8,7 @@
 
 %.1: %.xml
 	# Verification
-	-xmllint --nonet --postvalid --xinclude $^
+	-xmllint --nonet --noout --postvalid --xinclude $^
 	# Compilation
 	xsltproc --nonet --xinclude \
 	  /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \

Modified: trunk/packages/camomile/trunk/debian/xml-man/camomilecharmap.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/xml-man/camomilecharmap.xml?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/xml-man/camomilecharmap.xml (original)
+++ trunk/packages/camomile/trunk/debian/xml-man/camomilecharmap.xml Sun Jan  7 22:54:59 2007
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" 
 "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
-  <!ENTITY debian      "<!--productname-->Debian GNU/Linux<!--/productname-->">
+  <!ENTITY debian      "Debian GNU/Linux">
   <!ENTITY dhprg       "<command>camomilecharmap</command>">
-  <!ENTITY camomile    "<!--productname-->camomile<!--/productname-->">
+  <!ENTITY camomile    "camomile">
 ]>
 
 <!--**********************************************************************-->
@@ -113,14 +113,14 @@
   </refsect1>
 
   <refsect1>
-          <title>SEE ALSO</title>
+    <title>SEE ALSO</title>
 
-          <para>
-            <citerefentry>
-              <refentrytitle>camomilelocaledef</refentrytitle>
-              <manvolnum>1</manvolnum>
-            </citerefentry>
-          </para>
+    <para>
+      <citerefentry>
+        <refentrytitle>camomilelocaledef</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>
+    </para>
   </refsect1>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="license.xml"/>

Modified: trunk/packages/camomile/trunk/debian/xml-man/camomilelocaledef.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/xml-man/camomilelocaledef.xml?rev=3499&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/xml-man/camomilelocaledef.xml (original)
+++ trunk/packages/camomile/trunk/debian/xml-man/camomilelocaledef.xml Sun Jan  7 22:54:59 2007
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" 
 "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
-  <!ENTITY debian      "<!--productname-->Debian GNU/Linux<!--/productname-->">
+  <!ENTITY debian      "Debian GNU/Linux">
   <!ENTITY dhprg       "<command>camomilelocaledef</command>">
-  <!ENTITY camomile    "<!--productname-->camomile<!--/productname-->">
+  <!ENTITY camomile    "camomile">
 ]>
 
 <!--**********************************************************************-->

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