[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging branch, master, updated. debian/0.4-2-2-g182de34

Tue Aug 25 23:42:31 UTC 2009

The following commit has been merged in the master branch:
commit a24e659c3e33c47f92629cae22dc72682f218a0a
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Tue Jun 2 18:21:36 2009 +0200

    Imported Debian patch 0.4-2

diff --git a/debian/changelog b/debian/changelog
index 184f16d..df00a4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+camlpdf (0.4-2) unstable; urgency=low
+
+  * Removed unused modules io, istring and unzip.
+    Thanks to Guillaume Yziquel for reporting and
+    upstream for instructions on how to fix properly.
+  Closes: #531360
+  * Changed section to non-free/ocaml.
+  * Updated standards-version to 3.8.1
+
+ -- Romain Beauxis <toots at rastageeks.org>  Tue, 02 Jun 2009 18:21:36 +0200
+
 camlpdf (0.4-1) unstable; urgency=low
 
   [ Mehdi Dogguy ]
diff --git a/debian/control b/debian/control
index 074c8fe..e5f7f79 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ 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 (>= 0.4.23-1.1), debhelper (>= 7), ocaml-nox (>= 3.11), 
-               ocaml-findlib (>= 1.2.4), libzip-ocaml-dev (>= 1.04-2), 
-               quilt, dh-ocaml
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.1), ocaml-nox, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), 
+               ocaml-findlib (>= 1.2.4), libzip-ocaml-dev (>= 1.04-2),
+               dh-ocaml
+Standards-Version: 3.8.1
 XS-Autobuild: yes
 Homepage: http://www.coherentgraphics.co.uk/camlpdf.html 
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git
@@ -14,8 +14,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git
 
 Package: libcamlpdf-ocaml-dev
 Architecture: any
-Section: non-free/libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libzip-ocaml-dev
+Section: non-free/ocaml
+Depends: ocaml-nox-${F:OCamlABI}, libzip-ocaml-dev, ${misc:Depends}
 Recommends: ocaml-findlib
 Description: library for reading, writing and manipulating PDF files and data
  CamlPDF consists of a set of low level modules for representing,
diff --git a/debian/control.in b/debian/control.in
index 1bbaf94..90b08d6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,7 @@ Uploaders: Romain Beauxis <toots at rastageeks.org>
 Build-Depends: @cdbs@, 
                ocaml-findlib (>= 1.2.4), libzip-ocaml-dev (>= 1.04-2),
                dh-ocaml
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 XS-Autobuild: yes
 Homepage: http://www.coherentgraphics.co.uk/camlpdf.html 
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git
@@ -14,8 +14,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git
 
 Package: libcamlpdf-ocaml-dev
 Architecture: any
-Section: non-free/libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libzip-ocaml-dev
+Section: non-free/ocaml
+Depends: ocaml-nox-${F:OCamlABI}, libzip-ocaml-dev, ${misc:Depends}
 Recommends: ocaml-findlib
 Description: library for reading, writing and manipulating PDF files and data
  CamlPDF consists of a set of low level modules for representing,
diff --git a/debian/copyright b/debian/copyright
index 29f9d5f..46c1058 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ It was downloaded from <http://www.coherentgraphics.co.uk/camlpdf.html>
 
 Upstream Author:   John Whitington <camlpdf at coherentgraphics.co.uk>
 
-Copyright: Copyright (c) 2006-2007, Coherent Graphics Ltd and Xara Group Limited.
+Copyright: Copyright © 2006-2007, Coherent Graphics Ltd and Xara Group Limited.
 
 License:
 
@@ -40,5 +40,5 @@ END OF LICENCE
 
 This license allows automatic building of the module.
 
-The Debian packaging is (C) 2008, Romain Beauxis <toots at rastageeks.org> and
+The Debian packaging is © 2008, Romain Beauxis <toots at rastageeks.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/debian/patches/disable_zlib_build.patch b/debian/patches/makefile_fix.patch
similarity index 57%
rename from debian/patches/disable_zlib_build.patch
rename to debian/patches/makefile_fix.patch
index cd789f4..373017e 100644
--- a/debian/patches/disable_zlib_build.patch
+++ b/debian/patches/makefile_fix.patch
@@ -1,9 +1,16 @@
+* Remove unused modules (avoid name clashes)
+* Build on packaged zlib
 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 \
+--- camlpdf.orig/makefile	2009-06-02 18:17:24.000000000 +0200
++++ camlpdf/makefile	2009-06-02 18:19:12.000000000 +0200
+@@ -3,13 +3,8 @@
+ # and dllcamlpdf_stubs.so, libcamlpdf_stubs.a or similar 
+ # OCaml and C source and interface files. Order matters.
+ SOURCES = utility.ml utility.mli \
+-	  istring.ml istring.mli \
+-	  io.ml io.mli \
+-	  unzip.ml unzip.mli \
  	  pdfio.ml pdfio.mli \
  	  cgenlex.ml cgenlex.mli \
 -	  zlib.ml zlib.mli \
@@ -11,7 +18,7 @@ Index: camlpdf/makefile
  	  transform.ml transform.mli \
  	  units.ml units.mli \
  	  paper.ml paper.mli \
-@@ -36,7 +34,7 @@
+@@ -36,7 +31,7 @@
  TRASH = tl prog.tex camlpdf.tex camlpdf.aux camlpdf.log camlpdf.toc 
  
  # ML Libraries
@@ -20,7 +27,7 @@ Index: camlpdf/makefile
  
  CLIBS = z
  
-@@ -44,6 +42,8 @@
+@@ -44,6 +39,8 @@
  #OCAMLNCFLAGS = -g
  #OCAMLBCFLAGS = -g
  #CAMLLDFLAGS = -g
diff --git a/debian/patches/remove_custom.patch b/debian/patches/remove_custom.patch
new file mode 100644
index 0000000..ec1a470
--- /dev/null
+++ b/debian/patches/remove_custom.patch
@@ -0,0 +1,16 @@
+Force linking in standard mode (might be unnecessary here since the 
+compilation of the C code has been disabled, but..)
+Index: camlpdf/makefile
+===================================================================
+--- camlpdf.orig/makefile	2009-06-02 18:34:18.000000000 +0200
++++ camlpdf/makefile	2009-06-02 18:35:15.000000000 +0200
+@@ -28,6 +28,9 @@
+ 
+ RESULT = camlpdf
+ 
++# Avoid custom binary
++NO_CUSTOM = yes
++
+ TRASH = tl prog.tex camlpdf.tex camlpdf.aux camlpdf.log camlpdf.toc 
+ 
+ # ML Libraries
diff --git a/debian/patches/series b/debian/patches/series
index d8a5f71..c0901e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-disable_zlib_build.patch
+makefile_fix.patch
+remove_custom.patch

-- 
camlpdf packaging

