r45166 - in /packages/nlopt/trunk/debian: changelog compat control libnlopt-dev.install libnlopt-guile0.install libnlopt-guile0.lintian-overrides libnlopt0.install libnlopt0.lintian-overrides octave-nlopt.install octave-nlopt.lintian-overrides rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Jun 29 08:00:31 UTC 2012
Author: trophime-guest
Date: Fri Jun 29 08:00:30 2012
New Revision: 45166
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45166
Log:
add multiarch support (Sergey B Kirpichev)
Added:
packages/nlopt/trunk/debian/libnlopt-guile0.lintian-overrides
packages/nlopt/trunk/debian/libnlopt0.lintian-overrides
Modified:
packages/nlopt/trunk/debian/changelog
packages/nlopt/trunk/debian/compat
packages/nlopt/trunk/debian/control
packages/nlopt/trunk/debian/libnlopt-dev.install
packages/nlopt/trunk/debian/libnlopt-guile0.install
packages/nlopt/trunk/debian/libnlopt0.install
packages/nlopt/trunk/debian/octave-nlopt.install
packages/nlopt/trunk/debian/octave-nlopt.lintian-overrides
packages/nlopt/trunk/debian/rules
Modified: packages/nlopt/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/changelog?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/changelog (original)
+++ packages/nlopt/trunk/debian/changelog Fri Jun 29 08:00:30 2012
@@ -2,8 +2,10 @@
[Sergey B Kirpichev]
* Add patches to make nlopt bindings to work
+ * Add multiarch support
+ * Add debian/*.shlibs
- * create libnlopt_guile.so link to libnlopt_guile.so.0
+ * Add Sergey B Kirpîchev to maintainers list
-- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Wed, 27 Jun 2012 12:05:11 +0200
Modified: packages/nlopt/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/compat?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/compat (original)
+++ packages/nlopt/trunk/debian/compat Fri Jun 29 08:00:30 2012
@@ -1,1 +1,1 @@
-7
+9
Modified: packages/nlopt/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/control?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/control (original)
+++ packages/nlopt/trunk/debian/control Fri Jun 29 08:00:30 2012
@@ -1,19 +1,23 @@
Source: nlopt
-Section: devel
+Section: math
Priority: extra
-Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Build-Depends: quilt, debhelper (>= 8), autotools-dev, libtool, automake,
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Build-Depends: quilt, debhelper (>= 9), autotools-dev, libtool, automake,
gcc (>= 4.2), g++ (>= 4.2), octave-pkg-dev (>= 0.7.0),
python-all-dev (>= 2.6.6-3~), python-numpy,
guile-1.8, guile-1.8-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
X-Python-Version: >= 2.5
Homepage: http://ab-initio.mit.edu/wiki/index.php/NLopt
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/nlopt
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/nlopt
Package: libnlopt0
+Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: nonlinear optimization library
NLopt is a free/open-source library for nonlinear optimization, providing
@@ -76,7 +80,7 @@
Package: octave-nlopt
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
+Depends: libnlopt0, ${shlibs:Depends}, ${octave:Depends}, ${misc:Depends}
Description: nlopt for octave
NLopt is a free/open-source library for nonlinear optimization, providing
a common interface for a number of different free optimization routines
@@ -96,6 +100,8 @@
Package: libnlopt-guile0
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: libnlopt0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
guile-1.8
Description: guile plugins for nlopt
Modified: packages/nlopt/trunk/debian/libnlopt-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/libnlopt-dev.install?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/libnlopt-dev.install (original)
+++ packages/nlopt/trunk/debian/libnlopt-dev.install Fri Jun 29 08:00:30 2012
@@ -1,3 +1,3 @@
usr/include
-usr/lib/libnlopt.so
-usr/lib/libnlopt.a
+usr/lib/*/libnlopt.so
+usr/lib/*/libnlopt.a
Modified: packages/nlopt/trunk/debian/libnlopt-guile0.install
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/libnlopt-guile0.install?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/libnlopt-guile0.install (original)
+++ packages/nlopt/trunk/debian/libnlopt-guile0.install Fri Jun 29 08:00:30 2012
@@ -1,4 +1,4 @@
-usr/lib/libnlopt_guile.so.*
-usr/lib/libnlopt_guile.so
-usr/lib/libnlopt_guile.a
+usr/lib/*/libnlopt_guile.so.*
+usr/lib/*/libnlopt_guile.so
+usr/lib/*/libnlopt_guile.a
usr/share/guile/site
Added: packages/nlopt/trunk/debian/libnlopt-guile0.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/libnlopt-guile0.lintian-overrides?rev=45166&op=file
==============================================================================
--- packages/nlopt/trunk/debian/libnlopt-guile0.lintian-overrides (added)
+++ packages/nlopt/trunk/debian/libnlopt-guile0.lintian-overrides Fri Jun 29 08:00:30 2012
@@ -1,0 +1,5 @@
+# Looks to be a false alarm, see http://bugs.debian.org/673112
+libnlopt-guile0: hardening-no-fortify-functions usr/lib/*/libnlopt_guile.so.*
+# it's ok for plugin:
+libnlopt-guile0: non-dev-pkg-with-shlib-symlink usr/lib/*/libnlopt_guile.so.* usr/lib/*/libnlopt_guile.so
+libnlopt-guile0: no-symbols-control-file usr/lib/*/libnlopt_guile.so.*
Modified: packages/nlopt/trunk/debian/libnlopt0.install
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/libnlopt0.install?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/libnlopt0.install (original)
+++ packages/nlopt/trunk/debian/libnlopt0.install Fri Jun 29 08:00:30 2012
@@ -1,3 +1,3 @@
-usr/lib/libnlopt.so.0.*
-usr/lib/libnlopt.so.0
+usr/lib/*/libnlopt.so.0.*
+usr/lib/*/libnlopt.so.0
usr/share/man/man3/*
Added: packages/nlopt/trunk/debian/libnlopt0.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/libnlopt0.lintian-overrides?rev=45166&op=file
==============================================================================
--- packages/nlopt/trunk/debian/libnlopt0.lintian-overrides (added)
+++ packages/nlopt/trunk/debian/libnlopt0.lintian-overrides Fri Jun 29 08:00:30 2012
@@ -1,0 +1,2 @@
+# See http://lists.debian.org/debian-devel/2012/05/msg00852.html
+libnlopt0: hardening-no-stackprotector usr/lib/*/libnlopt.so.*
Modified: packages/nlopt/trunk/debian/octave-nlopt.install
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/octave-nlopt.install?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/octave-nlopt.install (original)
+++ packages/nlopt/trunk/debian/octave-nlopt.install Fri Jun 29 08:00:30 2012
@@ -1,3 +1,3 @@
usr/share/octave
-usr/lib/*/octave
+usr/lib/octave
#usr/share/lintian/overrides/octave-nlopt*
Modified: packages/nlopt/trunk/debian/octave-nlopt.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/octave-nlopt.lintian-overrides?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/octave-nlopt.lintian-overrides (original)
+++ packages/nlopt/trunk/debian/octave-nlopt.lintian-overrides Fri Jun 29 08:00:30 2012
@@ -1,1 +1,1 @@
-octave-nlopt: missing-dependency-on-libc needed by usr/lib/octave/packages/3.2/nlopt_optimize.oct
+octave-nlopt: missing-dependency-on-libc needed by usr/lib/octave/site/exec/x86_64-pc-linux-gnu/nlopt_optimize.oct
Modified: packages/nlopt/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/rules?rev=45166&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/rules (original)
+++ packages/nlopt/trunk/debian/rules Fri Jun 29 08:00:30 2012
@@ -50,6 +50,15 @@
dh_auto_build --builddirectory=$(BUILDDIR)$$v; \
done
+override_dh_strip:
+ dh_strip
+ find debian/octave-nlopt/usr/lib -name *.oct | \
+ xargs strip --strip-unneeded --remove-section=.comment
+
+override_dh_makeshlibs:
+ dh_makeshlibs -X/usr/lib/python2.7/dist-packages
+
+
override_dh_auto_install:
for v in $(PYVERS); do \
dh_auto_install --builddirectory=$(BUILDDIR)$$v; \
@@ -62,21 +71,10 @@
#
# Fix lintian errors
dh_numpy
- dh_shlibdeps
- #
- # Fix unstripped-binary-or-object
- strip --strip-unneeded $(CURDIR)/debian/tmp/usr/lib/libnlopt.so.0*
- strip --strip-unneeded $(CURDIR)/debian/tmp/usr/lib/libnlopt_guile.so.0.*
- find $(CURDIR)/debian/tmp/usr/lib -name _\*.so | xargs strip --strip-unneeded
- strip --strip-unneeded $(CURDIR)/debian/tmp/$(bpath)/nlopt_optimize.oct
- #
- #mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
- #cp debian/octave-nlopt.lintian-overrides $(CURDIR)/debian/tmp/usr/share/lintian/overrides/octave-nlopt
#
find $(CURDIR)/debian/tmp/usr/lib -name \*.la | xargs rm
+ find $(CURDIR)/debian/tmp/usr/lib -name _nlopt.a | xargs rm
- #Fix missing libnlopt_guile.so
- dh_link usr/lib/libnlopt_guile.so.0 usr/lib/libnlopt_guile.so
# Grab the version before +dfsg
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
More information about the debian-science-commits
mailing list