r44696 - in /packages/cminpack/trunk/debian: changelog compat control copyright libcminpack-dev.install libcminpack1.0.90.install patches/lib64.patch patches/multiarch.patch patches/series rules

malat at users.alioth.debian.org malat at users.alioth.debian.org
Wed Apr 11 16:04:10 UTC 2012 

Author: malat
Date: Wed Apr 11 16:04:09 2012
New Revision: 44696

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44696
Log:
rework on cminpack

Added:
    packages/cminpack/trunk/debian/patches/multiarch.patch
Removed:
    packages/cminpack/trunk/debian/patches/lib64.patch
Modified:
    packages/cminpack/trunk/debian/changelog
    packages/cminpack/trunk/debian/compat
    packages/cminpack/trunk/debian/control
    packages/cminpack/trunk/debian/copyright
    packages/cminpack/trunk/debian/libcminpack-dev.install
    packages/cminpack/trunk/debian/libcminpack1.0.90.install
    packages/cminpack/trunk/debian/patches/series
    packages/cminpack/trunk/debian/rules

Modified: packages/cminpack/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/changelog?rev=44696&op=diff
==============================================================================
--- packages/cminpack/trunk/debian/changelog (original)
+++ packages/cminpack/trunk/debian/changelog Wed Apr 11 16:04:09 2012
@@ -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:

Modified: packages/cminpack/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/compat?rev=44696&op=diff
==============================================================================
--- packages/cminpack/trunk/debian/compat (original)
+++ packages/cminpack/trunk/debian/compat Wed Apr 11 16:04:09 2012
@@ -1,1 +1,1 @@
-7
+9

Modified: packages/cminpack/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/control?rev=44696&op=diff
==============================================================================
--- packages/cminpack/trunk/debian/control (original)
+++ packages/cminpack/trunk/debian/control Wed Apr 11 16:04:09 2012
@@ -2,18 +2,17 @@
 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 @@
 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

Modified: packages/cminpack/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/copyright?rev=44696&op=diff
==============================================================================
--- packages/cminpack/trunk/debian/copyright (original)
+++ packages/cminpack/trunk/debian/copyright Wed Apr 11 16:04:09 2012
@@ -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 @@
  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

Modified: packages/cminpack/trunk/debian/libcminpack-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/libcminpack-dev.install?rev=44696&op=diff
==============================================================================
--- packages/cminpack/trunk/debian/libcminpack-dev.install (original)
+++ packages/cminpack/trunk/debian/libcminpack-dev.install Wed Apr 11 16:04:09 2012
@@ -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

Modified: packages/cminpack/trunk/debian/libcminpack1.0.90.install
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/libcminpack1.0.90.install?rev=44696&op=diff
==============================================================================
--- packages/cminpack/trunk/debian/libcminpack1.0.90.install (original)
+++ packages/cminpack/trunk/debian/libcminpack1.0.90.install Wed Apr 11 16:04:09 2012
@@ -1,1 +1,1 @@
-usr/lib/libcminpack.so.1.*
+usr/lib/*/libcminpack.so.1.*

Added: packages/cminpack/trunk/debian/patches/multiarch.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/patches/multiarch.patch?rev=44696&op=file
==============================================================================
--- packages/cminpack/trunk/debian/patches/multiarch.patch (added)
+++ packages/cminpack/trunk/debian/patches/multiarch.patch Wed Apr 11 16:04:09 2012
@@ -1,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")

Modified: packages/cminpack/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/patches/series?rev=44696&op=diff
==============================================================================
--- packages/cminpack/trunk/debian/patches/series (original)
+++ packages/cminpack/trunk/debian/patches/series Wed Apr 11 16:04:09 2012
@@ -1,1 +1,1 @@
-lib64.patch
+multiarch.patch

Modified: packages/cminpack/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/cminpack/trunk/debian/rules?rev=44696&op=diff
==============================================================================
--- packages/cminpack/trunk/debian/rules (original)
+++ packages/cminpack/trunk/debian/rules Wed Apr 11 16:04:09 2012
@@ -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 --buildsystem=cmake
 
-%:
-	dh --parallel --with quilt --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

More information about the debian-science-commits mailing list