This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cairo-ocaml.

commit 76f59cf06d8ad3934557908ea7c6e9388eb73316
Author: Eric Dorland <e...@debian.org>
Date:   Mon Mar 3 00:59:13 2014 -0500

    Imported Debian patch 1:1.2.0-5.1
---
 .gitignore                  | 1 -
 debian/changelog            | 7 +++++++
 debian/control              | 2 +-
 debian/source/local-options | 2 --
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c269fa4..bc8bc8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,3 @@ config.log
 config.make
 config.status
 configure
-.pc
diff --git a/debian/changelog b/debian/changelog
index ee7b349..c020c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cairo-ocaml (1:1.2.0-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: Switch to automake1.11. (Closes: #724354)
+
+ -- Eric Dorland <e...@debian.org>  Mon, 03 Mar 2014 00:59:13 -0500
+
 cairo-ocaml (1:1.2.0-5) unstable; urgency=low
 
   [ Stéphane Glondu ]
diff --git a/debian/control b/debian/control
index a989479..ec0502e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  Stéphane Glondu <glo...@debian.org>
 Build-Depends:
  debhelper (>= 8),
- automake1.9,
+ automake1.11,
  autoconf,
  ocaml-findlib (>= 1.4),
  dh-ocaml (>= 0.9),
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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cairo-ocaml.git

_______________________________________________
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