r45492 - in /packages/flann/trunk/debian: changelog compat control orig-tar.sh patches/remove_lib64.patch patches/remove_tests.patch patches/series rules watch

malat at users.alioth.debian.org malat at users.alioth.debian.org
Thu Jan 3 12:14:54 UTC 2013 

Author: malat
Date: Thu Jan  3 12:14:53 2013
New Revision: 45492

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45492
Log:
Prepare flann 1.8.3

Removed:
    packages/flann/trunk/debian/orig-tar.sh
    packages/flann/trunk/debian/patches/remove_lib64.patch
Modified:
    packages/flann/trunk/debian/changelog
    packages/flann/trunk/debian/compat
    packages/flann/trunk/debian/control
    packages/flann/trunk/debian/patches/remove_tests.patch
    packages/flann/trunk/debian/patches/series
    packages/flann/trunk/debian/rules
    packages/flann/trunk/debian/watch

Modified: packages/flann/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/changelog?rev=45492&op=diff
==============================================================================
--- packages/flann/trunk/debian/changelog (original)
+++ packages/flann/trunk/debian/changelog Thu Jan  3 12:14:53 2013
@@ -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
 

Modified: packages/flann/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/compat?rev=45492&op=diff
==============================================================================
--- packages/flann/trunk/debian/compat (original)
+++ packages/flann/trunk/debian/compat Thu Jan  3 12:14:53 2013
@@ -1,1 +1,1 @@
-8
+9

Modified: packages/flann/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/control?rev=45492&op=diff
==============================================================================
--- packages/flann/trunk/debian/control (original)
+++ packages/flann/trunk/debian/control Thu Jan  3 12:14:53 2013
@@ -2,14 +2,13 @@
 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 @@
 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 @@
  .
  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

Modified: packages/flann/trunk/debian/patches/remove_tests.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/remove_tests.patch?rev=45492&op=diff
==============================================================================
--- packages/flann/trunk/debian/patches/remove_tests.patch (original)
+++ packages/flann/trunk/debian/patches/remove_tests.patch Thu Jan  3 12:14:53 2013
@@ -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 )

Modified: packages/flann/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/series?rev=45492&op=diff
==============================================================================
--- packages/flann/trunk/debian/patches/series (original)
+++ packages/flann/trunk/debian/patches/series Thu Jan  3 12:14:53 2013
@@ -1,2 +1,1 @@
 remove_tests.patch
-remove_lib64.patch

Modified: packages/flann/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/rules?rev=45492&op=diff
==============================================================================
--- packages/flann/trunk/debian/rules (original)
+++ packages/flann/trunk/debian/rules Thu Jan  3 12:14:53 2013
@@ -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 @@
 # 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

Modified: packages/flann/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/watch?rev=45492&op=diff
==============================================================================
--- packages/flann/trunk/debian/watch (original)
+++ packages/flann/trunk/debian/watch Thu Jan  3 12:14:53 2013
@@ -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

More information about the debian-science-commits mailing list