r46709 - in /packages/flann/trunk/debian: changelog control libflann-dev.install libflann1.8.install rules

[malat at users.alioth.debian.org]

Author: malat
Date: Tue Jun 17 09:01:41 2014
New Revision: 46709

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46709
Log:
prepare next upload

Modified:
    packages/flann/trunk/debian/changelog
    packages/flann/trunk/debian/control
    packages/flann/trunk/debian/libflann-dev.install
    packages/flann/trunk/debian/libflann1.8.install
    packages/flann/trunk/debian/rules

Modified: packages/flann/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/changelog?rev=46709&op=diff
==============================================================================
--- packages/flann/trunk/debian/changelog	(original)
+++ packages/flann/trunk/debian/changelog	Tue Jun 17 09:01:41 2014
@@ -1,3 +1,12 @@
+flann (1.8.4-4) unstable; urgency=low
+
+  * Bump Std-Vers to 3.9.5, no changes needed. Run w-a-s for cleanup.
+  * Use the ggc-min-expand flag.
+    Patch by Dejan Latinovic <Dejan.Latinovic at imgtec.com>.
+    Closes: #751478.
+
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 17 Jun 2014 10:57:45 +0200
+
 flann (1.8.4-3) unstable; urgency=low
 
   * Do not use CMAKE_BUILD_TYPE. Closes: #731514

Modified: packages/flann/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/control?rev=46709&op=diff
==============================================================================
--- packages/flann/trunk/debian/control	(original)
+++ packages/flann/trunk/debian/control	Tue Jun 17 09:01:41 2014
@@ -3,12 +3,17 @@
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Mathieu Malaterre <malat at debian.org>,
- Michael Kleiber <mike at kleibi.de>
-Build-Depends: debhelper (>= 9), cmake (>= 2.6.0),
- libgtest-dev, python, python-numpy, libboost-all-dev,
- mpi-default-dev, libhdf5-mpi-dev
-Build-Depends-Indep: texlive-latex-base, texlive-binaries, latex2html
-Standards-Version: 3.9.4
+           Michael Kleiber <mike at kleibi.de>
+Build-Depends: cmake (>= 2.6.0),
+               debhelper (>= 9),
+               libboost-all-dev,
+               libgtest-dev,
+               libhdf5-mpi-dev,
+               mpi-default-dev,
+               python,
+               python-numpy
+Build-Depends-Indep: latex2html, texlive-binaries, texlive-latex-base
+Standards-Version: 3.9.5
 Homepage: http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/flann/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-science/packages/flann/trunk/
@@ -27,7 +32,7 @@
 
 Package: libflann1.8
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Fast Library for Approximate Nearest Neighbors - runtime
@@ -41,7 +46,7 @@
 Package: flann-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, doc-base
+Depends: doc-base, ${misc:Depends}
 Description: Fast Library for Approximate Nearest Neighbors - documentation
  FLANN is a library for performing fast approximate nearest neighbor searches
  in high dimensional spaces. It contains a collection of algorithms found

Modified: packages/flann/trunk/debian/libflann-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/libflann-dev.install?rev=46709&op=diff
==============================================================================
--- packages/flann/trunk/debian/libflann-dev.install	(original)
+++ packages/flann/trunk/debian/libflann-dev.install	Tue Jun 17 09:01:41 2014
@@ -1,6 +1,6 @@
 usr/include/flann/*
-usr/lib/*/pkgconfig/flann.pc
 usr/lib/*/libflann.so
-usr/lib/*/libflann_s.a
 usr/lib/*/libflann_cpp.so
 usr/lib/*/libflann_cpp_s.a
+usr/lib/*/libflann_s.a
+usr/lib/*/pkgconfig/flann.pc

Modified: packages/flann/trunk/debian/libflann1.8.install
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/libflann1.8.install?rev=46709&op=diff
==============================================================================
--- packages/flann/trunk/debian/libflann1.8.install	(original)
+++ packages/flann/trunk/debian/libflann1.8.install	Tue Jun 17 09:01:41 2014
@@ -1,2 +1,2 @@
+usr/lib/*/libflann.so.1.*
 usr/lib/*/libflann_cpp.so.1.*
-usr/lib/*/libflann.so.1.*

Modified: packages/flann/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/rules?rev=46709&op=diff
==============================================================================
--- packages/flann/trunk/debian/rules	(original)
+++ packages/flann/trunk/debian/rules	Tue Jun 17 09:01:41 2014
@@ -4,6 +4,12 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
+	export DEB_CXXFLAGS_MAINT_APPEND = --param ggc-min-expand=20
+endif
 
 CMAKE_FLAGS = \
 	-DCMAKE_BUILD_TYPE:STRING=None \