[cminpack] 11/19: Fix conflict with minpack-dev

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository cminpack.

commit 3c75a2f73935f55e1c470971a2cebd3927f14940
Author: malat <malat at 7ca82aff-d165-4cda-a4f1-7f280d66a853>
Date:   Fri Apr 13 11:59:32 2012 +0000

    Fix conflict with minpack-dev
    
    git-svn-id: svn://svn.debian.org/debian-science/packages/cminpack/trunk@44703 7ca82aff-d165-4cda-a4f1-7f280d66a853
---
 debian/changelog                | 8 ++++++++
 debian/control                  | 1 +
 debian/libcminpack-dev.manpages | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5814894..ae1d80b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cminpack (1.1.4-3) unstable; urgency=low
+
+  * Remove manpages, conflicts with minpack-dev. Closes: #668551
+  * Add recommends on minpack-dev
+
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 13 Apr 2012 13:59:12 +0200
+
 cminpack (1.1.4-2) unstable; urgency=low
 
   * Use my @d.o alias
@@ -5,6 +12,7 @@ cminpack (1.1.4-2) unstable; urgency=low
   * Make multiarch
   * Use hardening flags
   * Make sure to link to math lib
+  * Bump Std-Vers to 3.9.3, no changes needed
 
  -- Mathieu Malaterre <malat at debian.org>  Wed, 11 Apr 2012 18:35:17 +0200
 
diff --git a/debian/control b/debian/control
index 0817a7f..dc1ac14 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Package: libcminpack-dev
 Section: libdevel
 Architecture: any
 Depends: libcminpack1.0.90 (= ${binary:Version}), ${misc:Depends}
+Recommends: minpack-dev
 Description: Nonlinear equations and nonlinear least squares problems - development
  Minpack includes software for solving nonlinear equations and nonlinear least
  squares problems. Five algorithmic paths each include a core subroutine and an
diff --git a/debian/libcminpack-dev.manpages b/debian/libcminpack-dev.manpages
deleted file mode 100644
index abc4b13..0000000
--- a/debian/libcminpack-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/*.3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cminpack.git