The following commit has been merged in the master branch:
commit 0d80f98d8a1d98768632d6600fb525e5d80bfe0b
Author: Romain Beauxis <to...@rastageeks.org>
Date:   Tue May 14 20:29:35 2013 -0500

    Switch build-dep on libtiff5-dev from libtiff4-dev,
    added pending patch.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..224e7f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc/
diff --git a/debian/changelog b/debian/changelog
index 14394bb..6d80ad2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-camlimages (1:4.0.1-5) UNRELEASED; urgency=low
+camlimages (1:4.0.1-5) unstable; urgency=low
 
+  [ St├ęphane Glondu ]
   * Build-Depend on libpng-dev instead of libpng12-dev (Closes: #662281)
 
- -- St├ęphane Glondu <glo...@debian.org>  Mon, 05 Mar 2012 21:23:56 +0100
+  [ Romain Beauxis ]
+  * Build-depend on libtiff5-dev instead of libtiff4-dev
+  * Patched src/META.in file to remove mention
+    of non-existant camlimages.cm{a,xa}
+  Closes: #636167:
+  * Bumped standards version to 3.9.4
+
+ -- Romain Beauxis <to...@rastageeks.org>  Tue, 14 May 2013 20:28:42 -0500
 
 camlimages (1:4.0.1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 191427c..9bcf921 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  ocaml-findlib (>> 1.2.5),
  libpng-dev,
  libjpeg-dev,
- libtiff4-dev,
+ libtiff5-dev,
  libxpm-dev,
  libfreetype6-dev (>= 2.1.7),
  libgif-dev,
@@ -20,7 +20,7 @@ Build-Depends:
  ghostscript,
  dh-ocaml (>= 0.9),
  omake
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlimages.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlimages.git
 Homepage: http://gallium.inria.fr/camlimages/
diff --git a/debian/patches/0003-fix-META.patch 
b/debian/patches/0003-fix-META.patch
new file mode 100644
index 0000000..0ed94c5
--- /dev/null
+++ b/debian/patches/0003-fix-META.patch
@@ -0,0 +1,16 @@
+Remove mentions of non-existant archives.
+
+Index: camlimages/src/META.in
+===================================================================
+--- camlimages.orig/src/META.in        2011-08-04 22:11:48.000000000 -0500
++++ camlimages/src/META.in     2011-08-04 22:12:00.000000000 -0500
+@@ -2,9 +2,6 @@
+ version = "@PACKAGE_VERSION@"
+ description = "Objective Caml image processing library"
+ 
+-archive(byte) = "camlimages.cma"
+-archive(native) = "camlimages.cmxa"
+-
+ package "core" (
+   archive(byte) = "camlimages_core.cma"
+   archive(native) = "camlimages_core.cmxa"
diff --git a/debian/patches/series b/debian/patches/series
index c862d85..cc67441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-missing-cclib-in-ocamlc-a.patch
 0002-remove-use-of-sort.patch
+0003-fix-META.patch

-- 
camlimages packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to