[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging branch, master, updated. debian/0.3-3-6-g8eb2d39

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 8eb2d39c439a3f0f4d8f3e8b158fd57de1666e4f
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Mar 9 03:44:40 2009 +0100

    Updated packaging..

diff --git a/debian/changelog b/debian/changelog
index 4dbedb2..184f16d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-camlpdf (0.3-4) UNRELEASED; urgency=low
+camlpdf (0.4-1) unstable; urgency=low
 
+  [ Mehdi Dogguy ]
   * Fix watch file and debian/control: Update webpage link
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Thu, 19 Feb 2009 14:28:12 +0100
+  [ Romain Beauxis ]
+  * New upstream release.
+  * Updated packaging:
+    + Use dh-ocaml
+    + Bumped compat to 7 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 09 Mar 2009 03:28:20 +0100
 
 camlpdf (0.3-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index d198013..a42ffa6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,13 @@ Section: non-free/devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
-Build-Depends: debhelper (>= 5), ocaml-nox, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ocaml-findlib, libzip-ocaml-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7), ocaml-nox (>= 3.11), 
+               ocaml-findlib (>= 1.2.4), libzip-ocaml-dev (>= 1.04-2), quilt
 Standards-Version: 3.8.0
 XS-Autobuild: yes
-Homepage: http://www.coherentpdf.com/ocaml-libraries.html
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk/
+Homepage: http://www.coherentgraphics.co.uk/camlpdf.html 
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git
 
 Package: libcamlpdf-ocaml-dev
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 3a911d3..9f75075 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,12 +3,13 @@ Section: non-free/devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
-Build-Depends: @cdbs@, ocaml-findlib, libzip-ocaml-dev
+Build-Depends: @cdbs@, 
+               ocaml-findlib (>= 1.2.4), libzip-ocaml-dev (>= 1.04-2)
 Standards-Version: 3.8.0
 XS-Autobuild: yes
 Homepage: http://www.coherentgraphics.co.uk/camlpdf.html 
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlpdf/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git
 
 Package: libcamlpdf-ocaml-dev
 Architecture: any
diff --git a/debian/libcamlpdf-ocaml-dev.install.in b/debian/libcamlpdf-ocaml-dev.install.in
index b597f7b..6bf0a7d 100644
--- a/debian/libcamlpdf-ocaml-dev.install.in
+++ b/debian/libcamlpdf-ocaml-dev.install.in
@@ -1 +1 @@
-debian/META *.a *.cm* usr/lib/ocaml/@OCamlABI@/camlpdf
+debian/META *.a *.cm* @OCamlStdlibDir@/camlpdf
diff --git a/debian/patches/disable_zlib_build.patch b/debian/patches/disable_zlib_build.patch
index 2f29fa3..cd789f4 100644
--- a/debian/patches/disable_zlib_build.patch
+++ b/debian/patches/disable_zlib_build.patch
@@ -1,15 +1,17 @@
---- camlpdf-0.3/makefile	2008-03-02 14:08:09.000000000 +0100
-+++ camlpdf-0.3.wozip/makefile	2008-06-12 14:54:57.000000000 +0200
-@@ -4,8 +4,6 @@
- 
- # OCaml and C source and interface files. Order matters.
- SOURCES = utility.ml utility.mli io.ml io.mli \
+Index: camlpdf/makefile
+===================================================================
+--- camlpdf.orig/makefile	2009-03-09 03:27:34.000000000 +0100
++++ camlpdf/makefile	2009-03-09 03:37:29.000000000 +0100
+@@ -8,8 +8,6 @@
+ 	  unzip.ml unzip.mli \
+ 	  pdfio.ml pdfio.mli \
+ 	  cgenlex.ml cgenlex.mli \
 -	  zlib.ml zlib.mli \
 -	  zlibstubs.c \
  	  transform.ml transform.mli \
  	  units.ml units.mli \
  	  paper.ml paper.mli \
-@@ -27,7 +25,7 @@
+@@ -36,7 +34,7 @@
  TRASH = tl prog.tex camlpdf.tex camlpdf.aux camlpdf.log camlpdf.toc 
  
  # ML Libraries
@@ -18,12 +20,12 @@
  
  CLIBS = z
  
-@@ -35,6 +33,8 @@
+@@ -44,6 +42,8 @@
  #OCAMLNCFLAGS = -g
  #OCAMLBCFLAGS = -g
  #CAMLLDFLAGS = -g
 +OCAMLFLAGS=-I $(shell ocamlfind query zip)
 +OCAMLLDFLAGS=-I $(shell ocamlfind query zip)
  
- all : native-code-library byte-code-library
- 
+ #Uncomment if you have these compilers
+ #OCAMLOPT = ocamlopt.opt
diff --git a/debian/svn-deblayout b/debian/svn-deblayout
deleted file mode 100644
index 40036ab..0000000
--- a/debian/svn-deblayout
+++ /dev/null
@@ -1 +0,0 @@
-tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/camlpdf

-- 
camlpdf packaging