[Pkg-ocaml-maint-commits] [SCM] xmlm packaging branch, master, updated. debian/1.0.1-1-2-g349d2e4

Sun Aug 30 16:33:53 UTC 2009

The following commit has been merged in the master branch:
commit 349d2e4e02bfe356086ea13f88363770a9301de9
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Sun Aug 30 11:35:50 2009 -0500

    Prepared new upload

diff --git a/debian/changelog b/debian/changelog
index d53607c..1ca19c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xmlm (1.0.1-2) unstable; urgency=low
+
+  * Removed custom patch, now shipping .cmo files. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sun, 30 Aug 2009 11:22:33 -0500
+
 xmlm (1.0.1-1) unstable; urgency=low
 
   * Initial upload to unstable (Closes: #528436)
diff --git a/debian/control b/debian/control
index 3c446a5..6fdee3c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
-Build-Depends: debhelper (>= 7.0.1), quilt, patchutils (>= 0.2.25), 
-               cdbs (>= 0.4.27), ocaml-nox, ocaml-findlib (>= 1.2.4), dh-ocaml
-Standards-Version: 3.8.1
+Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, ocaml-findlib (>= 1.2.4), dh-ocaml
+Standards-Version: 3.8.3
 Homepage: http://erratique.ch/software/xmlm
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xmlm.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xmlm.git
diff --git a/debian/control.in b/debian/control.in
index 210a929..7f212cb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
 Build-Depends: @cdbs@, ocaml-findlib (>= 1.2.4), dh-ocaml
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://erratique.ch/software/xmlm
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xmlm.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xmlm.git
diff --git a/debian/libxmlm-ocaml-dev.doc-base b/debian/libxmlm-ocaml-dev.doc-base
new file mode 100644
index 0000000..fd2e949
--- /dev/null
+++ b/debian/libxmlm-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: libxmlm-ocaml-dev
+Title: OCaml xml manipulation module
+Author: Daniel C. Bünzli
+Abstract: Documentation of the OCaml Xmlm module
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libxmlm-ocaml-dev/doc/index.html
+Files: /usr/share/doc/libxmlm-ocaml-dev/doc/*
diff --git a/debian/libxmlm-ocaml-dev.install.in b/debian/libxmlm-ocaml-dev.install.in
index 9564cdb..569e6b0 100644
--- a/debian/libxmlm-ocaml-dev.install.in
+++ b/debian/libxmlm-ocaml-dev.install.in
@@ -1,4 +1,3 @@
 @OCamlStdlibDir@/xmlm/META
 @OCamlStdlibDir@/xmlm/*.cm*
 @OCamlStdlibDir@/xmlm/*.ml*
-OPT: @OCamlStdlibDir@/xmlm/*.a 
diff --git a/debian/patches/fix_build_script.patch b/debian/patches/fix_build_script.patch
deleted file mode 100644
index 0cc3df2..0000000
--- a/debian/patches/fix_build_script.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: xmlm/build
-===================================================================
---- xmlm.orig/build	2009-05-14 20:29:27.000000000 +1100
-+++ xmlm/build	2009-05-14 20:29:31.000000000 +1100
-@@ -8,7 +8,8 @@
- SHORTDESCRIPTION="Streaming XML input\/output for OCaml"
- EMAIL="daniel.buenzl i\\\@erratique.ch"
- 
--INSTALLDIR=${INSTALLDIR:="`ocamlc -where`/$PROJECTNAME"}
-+#INSTALLDIR=${INSTALLDIR:="`ocamlc -where`/$PROJECTNAME"}
-+INSTALLDIR=$INSTALLDIR
- DOCDIR=${DOCDIR:="doc"}
- 
- # Caml tools
-@@ -27,28 +28,29 @@
- {
-   case $1 in
-     module-byte)
--      ocb $PROJECTNAME.cmo ;;
-+      ocb $PROJECTNAME.cma 
-+      ocb $PROJECTNAME.cmi ;;
-     module-native) 
--      ocb $PROJECTNAME.cmx ;;
-+      ocb $PROJECTNAME.cmx 
-+      ocb $PROJECTNAME.cmxa ;;
-     module)
-       action module-byte
-       action module-native ;;
-     xmltrip) 
-       ocb xmltrip.native ;;
-     doc)
--      ocb $PROJECTNAME.cmi
-       $OCAMLDOC -html -I src -colorize-code -d $DOCDIR src/$PROJECTNAME.mli ;;
-     distrib) distrib ;;
-     install-byte)
-       action module-byte
-       $MKDIR -p $INSTALLDIR
-       F="_build/src/$PROJECTNAME"
--      $CP $F.ml $F.mli $F.cmi $F.cmo src/META $INSTALLDIR ;;
-+      $CP $F.mli $F.cmi $F.cma src/META $INSTALLDIR ;;
-     install)
-       action module
-       $MKDIR -p $INSTALLDIR
-       F="_build/src/$PROJECTNAME"
--      $CP $F.ml $F.mli $F.cmi $F.cmo $F.cmx $F.o src/META $INSTALLDIR ;;
-+      $CP $F.mli $F.cmi $F.cma $F.cmx $F.cmxa $F.a src/META $INSTALLDIR ;;
-     clean) 
-       ocb -clean ;;
-     clean-all) 
-Index: xmlm/src/META
-===================================================================
---- xmlm.orig/src/META	2009-05-14 20:29:35.000000000 +1100
-+++ xmlm/src/META	2009-05-14 20:30:07.000000000 +1100
-@@ -1,5 +1,5 @@
- version = "1.0.1"
- description = "Streaming XML input/output for OCaml"
--archive(byte) = "xmlm.cmo"
--archive(native) = "xmlm.cmx"
-+archive(byte) = "xmlm.cma"
-+archive(native) = "xmlm.cmxa"
- directory = "+xmlm"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4e71319..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_build_script.patch
diff --git a/debian/rules b/debian/rules
index c2def0a..271aad4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ocaml.mk
 
 # In order to regenerate 'debian/control' :

-- 
xmlm packaging

