[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/1%4.0.1-5-4-g622331f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit cdc72797174b4b5f652b6031f8b10c0f7b86119f
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed May 15 07:02:39 2013 -0500

    Imported Debian patch 1:4.0.1-6

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 224e7f0..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pc/
diff --git a/debian/changelog b/debian/changelog
index 6d80ad2..d9d250a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camlimages (1:4.0.1-6) unstable; urgency=low
+
+  * Also bump build-dep on libtiff to libtiff5-dev
+    in libcamlimages-ocaml-dev. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 15 May 2013 07:02:39 -0500
+
 camlimages (1:4.0.1-5) unstable; urgency=low
 
   [ Stéphane Glondu ]
diff --git a/debian/control b/debian/control
index 9bcf921..2c939a2 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Depends:
  ${ocaml:Depends},
  libpng12-dev,
  libjpeg-dev,
- libtiff4-dev,
+ libtiff5-dev,
  libxpm-dev,
  libfreetype6-dev,
  libgif-dev,
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index c4cf480..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-abort-on-upstream-changes
-unapply-patches

-- 
camlimages packaging