[flann] 47/54: Prepare flann 1.8.3
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Fri Jul 15 10:42:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository flann.
commit 454caddef54308c2903badd3a349268d34db55a0
Author: Mathieu Malaterre <malat at debian.org>
Date: Thu Jan 3 12:14:53 2013 +0000
Prepare flann 1.8.3
---
debian/changelog | 18 ++++++++++++++++--
debian/compat | 2 +-
debian/control | 11 ++++-------
debian/orig-tar.sh | 17 -----------------
debian/patches/remove_lib64.patch | 13 -------------
debian/patches/remove_tests.patch | 8 ++++----
debian/patches/series | 1 -
debian/rules | 26 ++++----------------------
debian/watch | 3 +--
9 files changed, 30 insertions(+), 69 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 37a86de..3b9284e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,22 @@
-flann (1.7.1-4) UNRELEASED; urgency=low
+flann (1.8.3-1) experimental; urgency=low
+
+ * New upstream
+ * Switch from tbb to OpenMP
+ * Remove hack to get Changelog from web, use upstream instead
+ * Remove Breaks/Replace, not needed anymore
+ * Bump Std-Vers to 3.9.4, no changes needed
+ * remove patch not needed anymore:
+ - debian/patches/remove_lib64.patch
+ * Remove obsolete DMUA flag
+
+ -- Mathieu Malaterre <malat at debian.org> Thu, 03 Jan 2013 13:11:26 +0100
+
+flann (1.7.1-4) unstable; urgency=low
* enable the libhdf5-mpi-dev build dependency on hurd. Closes: #673513
+ * Fix hardening switch to compat 9
- -- Mathieu Malaterre <malat at debian.org> Sun, 20 May 2012 20:38:49 +0200
+ -- Mathieu Malaterre <malat at debian.org> Sun, 03 Jun 2012 18:55:10 +0200
flann (1.7.1-3) unstable; urgency=medium
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index da05c91..f1d723f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,13 @@ Source: flann
Section: libs
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <malat at debian.org>,
Michael Kleiber <mike at kleibi.de>
-Build-Depends: debhelper (>= 8), cmake (>= 2.6.0), libtbb-dev [amd64 i386 ia64],
+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.3
+Standards-Version: 3.9.4
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/
@@ -17,7 +16,7 @@ Vcs-Svn: svn://svn.debian.org/debian-science/packages/flann/trunk/
Package: libflann-dev
Section: libdevel
Architecture: any
-Depends: libflann1.7 (= ${binary:Version}), ${misc:Depends}
+Depends: libflann1.8 (= ${binary:Version}), ${misc:Depends}
Description: Fast Library for Approximate Nearest Neighbors - development
FLANN is a library for performing fast approximate nearest neighbor searches
in high dimensional spaces. It contains a collection of algorithms we found
@@ -26,11 +25,9 @@ Description: Fast Library for Approximate Nearest Neighbors - development
.
This package contains development files needed to build FLANN applications.
-Package: libflann1.7
+Package: libflann1.8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libflann1 (<< 1.7.1-2)
-Breaks: libflann1 (<< 1.7.1-2)
Description: Fast Library for Approximate Nearest Neighbors - runtime
FLANN is a library for performing fast approximate nearest neighbor searches
in high dimensional spaces. It contains a collection of algorithms we found
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index d9a2caf..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-TAR=../flann_$2.orig.tar.gz
-DIR=flann-$2-src
-
-# clean up the upstream tarball
-unzip $3
-tar -czf $TAR $DIR
-rm -rf $DIR $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
diff --git a/debian/patches/remove_lib64.patch b/debian/patches/remove_lib64.patch
deleted file mode 100644
index fc8da80..0000000
--- a/debian/patches/remove_lib64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: flann-1.7.0/cmake/flann_utils.cmake
-===================================================================
---- flann-1.7.0.orig/cmake/flann_utils.cmake 2011-12-20 17:14:31.000000000 +0100
-+++ flann-1.7.0/cmake/flann_utils.cmake 2011-12-20 17:14:38.000000000 +0100
-@@ -2,7 +2,7 @@
- string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
- if(OS_IS_LINUX)
- if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-- set(FLANN_LIB_INSTALL_DIR "lib64")
-+ set(FLANN_LIB_INSTALL_DIR "lib")
- else(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- set(FLANN_LIB_INSTALL_DIR "lib")
- endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
diff --git a/debian/patches/remove_tests.patch b/debian/patches/remove_tests.patch
index 89133f8..dd197e3 100644
--- a/debian/patches/remove_tests.patch
+++ b/debian/patches/remove_tests.patch
@@ -1,8 +1,8 @@
-Index: flann-1.7.0/CMakeLists.txt
+Index: flann-1.8.3-src/CMakeLists.txt
===================================================================
---- flann-1.7.0.orig/CMakeLists.txt 2011-12-20 17:14:31.000000000 +0100
-+++ flann-1.7.0/CMakeLists.txt 2011-12-20 17:14:34.000000000 +0100
-@@ -144,7 +144,7 @@
+--- flann-1.8.3-src.orig/CMakeLists.txt 2013-01-03 13:01:02.619952920 +0100
++++ flann-1.8.3-src/CMakeLists.txt 2013-01-03 13:01:05.755952938 +0100
+@@ -156,7 +156,7 @@
add_subdirectory( cmake )
add_subdirectory( src )
add_subdirectory( examples )
diff --git a/debian/patches/series b/debian/patches/series
index f3ba908..f2850ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
remove_tests.patch
-remove_lib64.patch
diff --git a/debian/rules b/debian/rules
index a69062d..9201fd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,14 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-DPKG_EXPORT_BUILDFLAGS = 1
--include /usr/share/dpkg/buildflags.mk
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
CMAKE_FLAGS = \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DBUILD_MATLAB_BINDINGS:BOOL=OFF \
-DBUILD_PYTHON_BINDINGS:BOOL=OFF \
-DUSE_MPI:BOOL=ON \
+ -DUSE_OPENMP:BOOL=ON \
-DBUILD_CUDA_LIB:BOOL=OFF
%:
@@ -30,23 +30,5 @@ override_dh_auto_build-indep:
# No tests needed for docs
override_dh_auto_test-indep:
-VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
-
-UPSTREAM_SRC = flann-$(VER_FULL)-src
-DEBIAN_SRC_DIR = flann-$(VER_FULL)
-DEBIAN_SRC_TAR = flann_$(VER_FULL).orig.tar.gz
-
-$(UPSTREAM_SRC).zip:
- #uscan --verbose --force-download --repack --rename
- wget -c http://people.cs.ubc.ca/~mariusm/uploads/FLANN/$@
-
-get-orig-source: $(UPSTREAM_SRC).zip
- rm -rf $(DEBIAN_SRC_DIR)
- unzip -q $(UPSTREAM_SRC).zip
- mv $(UPSTREAM_SRC) $(DEBIAN_SRC_DIR)
- rm $(DEBIAN_SRC_DIR)/doc/manual.pdf # will be rebuild from latex
- # download changelog:
- links -dump http://people.cs.ubc.ca/~mariusm/index.php/FLANN/Changelog | tail -n +10 | grep -v PmWiki > $(DEBIAN_SRC_DIR)/Changelog
- GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
- rm -rf $(DEBIAN_SRC_DIR)
- rm $(UPSTREAM_SRC).zip
+get-orig-source:
+ uscan --verbose --force-download --repack --rename
diff --git a/debian/watch b/debian/watch
index f24bd75..f161726 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
version=3
-http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN .*flann-(.*)-src.zip \
-debian debian/orig-tar.sh
+http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN .*flann-(.*)-src.zip
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/flann.git
More information about the debian-science-commits
mailing list