[cminpack] 09/19: rework on cminpack

Tue May 13 10:34:53 UTC 2014

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

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

commit e0f2c1835d6ef4078231866a2c69c85b793ce0b3
Author: malat <malat at 7ca82aff-d165-4cda-a4f1-7f280d66a853>
Date:   Wed Apr 11 16:04:09 2012 +0000

    rework on cminpack
    
    git-svn-id: svn://svn.debian.org/debian-science/packages/cminpack/trunk@44696 7ca82aff-d165-4cda-a4f1-7f280d66a853
---
 debian/changelog                 |  9 +++++++++
 debian/compat                    |  2 +-
 debian/control                   | 14 +++++++-------
 debian/copyright                 |  4 ++--
 debian/libcminpack-dev.install   |  4 ++--
 debian/libcminpack1.0.90.install |  2 +-
 debian/patches/lib64.patch       | 13 -------------
 debian/patches/multiarch.patch   | 19 +++++++++++++++++++
 debian/patches/series            |  2 +-
 debian/rules                     | 16 ++++++++++------
 10 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1421666..8351caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cminpack (1.1.4-2) UNRELEASED; urgency=low
+
+  * Use my @d.o alias
+  * Remove DMUA flag
+  * Make multiarch
+  * Use hardening flags
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 11 Apr 2012 17:51:11 +0200
+
 cminpack (1.1.4-1) unstable; urgency=low
 
   * New upstream:
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index dc889ca..9e21eba 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,17 @@ Source: cminpack
 Section: libs
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), cmake, quilt (>= 0.46-7~)
-Standards-Version: 3.9.2
+Uploaders: Mathieu Malaterre <malat at debian.org>
+Build-Depends: debhelper (>= 9), cmake
+Standards-Version: 3.9.3
 Homepage: http://devernay.free.fr/hacks/cminpack/cminpack.html
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/cminpack/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/cminpack/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-science/packages/cminpack/trunk/
 
 Package: libcminpack-dev
 Section: libdevel
 Architecture: any
-Depends: libcminpack1.0.90 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libcminpack1.0.90 (= ${binary:Version}), ${misc:Depends}
 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
@@ -30,6 +29,7 @@ Description: Nonlinear equations and nonlinear least squares problems - developm
 Package: libcminpack1.0.90
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: Nonlinear equations and nonlinear least squares problems - runtime
  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/copyright b/debian/copyright
index c9c7843..f319336 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cminpack
 Upstream-Contact: Frédéric Devernay
 Source: http://devernay.free.fr/hacks/cminpack/cminpack.html
@@ -59,6 +59,6 @@ License: BSD
  POSSIBILITY OF SUCH LOSS OR DAMAGES.
 
 Files: debian/*
-Copyright: 2011; Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Copyright: 2011-2012 Mathieu Malaterre <malat at debian.org>
 License: BSD
  Same as above
diff --git a/debian/libcminpack-dev.install b/debian/libcminpack-dev.install
index 30c3738..77d31ca 100644
--- a/debian/libcminpack-dev.install
+++ b/debian/libcminpack-dev.install
@@ -1,3 +1,3 @@
 usr/include/cminpack-1/*.h
-usr/lib/libcminpack.so
-usr/lib/pkgconfig/cminpack.pc
+usr/lib/*/libcminpack.so
+usr/lib/*/pkgconfig/cminpack.pc
diff --git a/debian/libcminpack1.0.90.install b/debian/libcminpack1.0.90.install
index 9e0d12a..43ff2d4 100644
--- a/debian/libcminpack1.0.90.install
+++ b/debian/libcminpack1.0.90.install
@@ -1 +1 @@
-usr/lib/libcminpack.so.1.*
+usr/lib/*/libcminpack.so.1.*
diff --git a/debian/patches/lib64.patch b/debian/patches/lib64.patch
deleted file mode 100644
index 83f2206..0000000
--- a/debian/patches/lib64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cminpack-1.1.3/cmake/cminpack_utils.cmake
-===================================================================
---- cminpack-1.1.3.orig/cmake/cminpack_utils.cmake	2011-04-27 08:56:04.000000000 +0200
-+++ cminpack-1.1.3/cmake/cminpack_utils.cmake	2011-04-27 08:56:11.000000000 +0200
-@@ -8,7 +8,7 @@
-     set(CMINPACK_LIB_INSTALL_DIR "lib")
-     if(OS_LINUX)
-         if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
--            set(CMINPACK_LIB_INSTALL_DIR "lib64")
-+            #set(CMINPACK_LIB_INSTALL_DIR "lib64")
-         else(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-             set(CMINPACK_LIB_INSTALL_DIR "lib")
-         endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
new file mode 100644
index 0000000..30284cb
--- /dev/null
+++ b/debian/patches/multiarch.patch
@@ -0,0 +1,19 @@
+Description: handle multiarch lib location
+Forwarded: Frederic Devernay
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-04-11
+
+Index: cminpack-1.1.4/cmake/cminpack_utils.cmake
+===================================================================
+--- cminpack-1.1.4.orig/cmake/cminpack_utils.cmake	2012-04-11 18:01:36.000000000 +0200
++++ cminpack-1.1.4/cmake/cminpack_utils.cmake	2012-04-11 18:01:41.000000000 +0200
+@@ -5,7 +5,9 @@
+         set(OS_WIN TRUE)
+     endif(WIN32)
+ 
++    if(NOT DEFINED CMINPACK_LIB_INSTALL_DIR)
+     set(CMINPACK_LIB_INSTALL_DIR "lib")
++    endif(NOT DEFINED CMINPACK_LIB_INSTALL_DIR)
+     if(OS_LINUX)
+         if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+             set(CMINPACK_LIB_INSTALL_DIR "lib64")
diff --git a/debian/patches/series b/debian/patches/series
index 06e88de..96b549c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-lib64.patch
+multiarch.patch
diff --git a/debian/rules b/debian/rules
index 962a556..b2c88c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,19 @@
 #!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
 %:
-	dh --parallel --with quilt --buildsystem=cmake $@ 
+	dh $@ --parallel --buildsystem=cmake
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ -DUSE_FPIC:BOOL=ON \
+ -DCMINPACK_LIB_INSTALL_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
+ -DSHARED_LIBS:BOOL=ON \
+ -DBUILD_EXAMPLES:BOOL=OFF
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DUSE_FPIC:BOOL=ON -DSHARED_LIBS:BOOL=ON -DBUILD_EXAMPLES:BOOL=OFF
+	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
 get-orig-source:
 	uscan --verbose --force-download --repack --rename

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

