[magics] 10/10: Enable parallel builds.

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 0f667f177e01de60b61ac9276dabd5b8af5e0dfc
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jan 10 02:02:00 2016 +0000

    Enable parallel builds.
---
 debian/changelog                    |  5 ++--
 debian/libmagics++-dev.install      |  1 -
 debian/patches/soname-version.patch | 50 ++++++++++++++++++++++++++++---------
 debian/rules                        |  5 ++--
 4 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff20b10..dfecf62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-magics++ (2.26.2-1) UNRELEASED; urgency=medium
+magics++ (2.26.2-1) unstable; urgency=medium
 
   * New upstream release.
   * Patches merged upstream / obsoleted:
@@ -10,8 +10,9 @@ magics++ (2.26.2-1) UNRELEASED; urgency=medium
   * B-D on libgrib-api-dev >= 1.14.4-2 for cmake config files.
   * Enable GEOTIFF support
   * Enable tests
+  * Enable parallel builds.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Mon, 04 Jan 2016 05:35:27 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 10 Jan 2016 02:01:33 +0000
 
 magics++ (2.24.7-7) unstable; urgency=medium
 
diff --git a/debian/libmagics++-dev.install b/debian/libmagics++-dev.install
index cd8abc3..87e6c58 100644
--- a/debian/libmagics++-dev.install
+++ b/debian/libmagics++-dev.install
@@ -1,5 +1,4 @@
 debian/tmp/usr/include/magics usr/include
-debian/tmp/usr/bin/magics-config usr/bin
 debian/tmp/usr/lib/*/pkgconfig/magics.pc 
 debian/tmp/usr/bin/magicsCompatibilityChecker usr/bin
 debian/tmp/usr/lib/*/cmake
diff --git a/debian/patches/soname-version.patch b/debian/patches/soname-version.patch
index c81ad69..54a0be8 100644
--- a/debian/patches/soname-version.patch
+++ b/debian/patches/soname-version.patch
@@ -7,19 +7,45 @@ Index: magics++-2.26.2/src/CMakeLists.txt
 ===================================================================
 --- magics++-2.26.2.orig/src/CMakeLists.txt
 +++ magics++-2.26.2/src/CMakeLists.txt
-@@ -162,6 +162,7 @@ ecbuild_add_library( TARGET    MagPlusSt
- 
- ecbuild_add_library( TARGET      MagPlusSingleStatic 
+@@ -122,6 +122,9 @@ ecbuild_add_library( TARGET    MagPlus
+                         ${common_templates}
+                      DEFINITIONS
+                         ${MAGICS_EXTRA_DEFINITIONS} MAGICS_EXCEPTION=on
++		     VERSION     3.0.0
++		     SONAME      libMagPlus.so.3
++		     SOVERSION   3
+                      LIBS
+                         ${MAGICS_EXTRA_LIBRARIES}
+                      TYPE SHARED )
+@@ -129,11 +132,18 @@ ecbuild_add_library( TARGET    MagPlus
+ ecbuild_add_library( TARGET      MagPlusSingle
                       SOURCES     MagicsSingle.cc
-+                     VERSION     3.0.0
-                      LIBS        MagPlusStatic
-                      TYPE        STATIC
-                      OUTPUT_NAME MagPlusSingle )
-@@ -169,6 +170,7 @@ ecbuild_add_library( TARGET      MagPlus
- ecbuild_add_library( TARGET      MagPlusDoubleStatic
+                      LIBS        MagPlus
++		     VERSION     3.0.0
++		     SONAME      libMagPlusSingle.so.3
++		     SOVERSION   3
+                      TYPE        SHARED )
+ 
+ ecbuild_add_library( TARGET      MagPlusDouble
                       SOURCES     MagicsDouble.cc
-                      LIBS        MagPlusStatic
+                      LIBS        MagPlus
 +		     VERSION     3.0.0
-                      TYPE        STATIC
-                      OUTPUT_NAME MagPlusDouble )
++		     SONAME      libMagPlusDouble.so.3
++		     SOVERSION   3
++
+                      TYPE        SHARED )
+ 
+ if ( BUILD_SHARED_LIBS STREQUAL "BOTH" )
+Index: magics++-2.26.2/cmake/ecbuild_add_library.cmake
+===================================================================
+--- magics++-2.26.2.orig/cmake/ecbuild_add_library.cmake
++++ magics++-2.26.2/cmake/ecbuild_add_library.cmake
+@@ -133,7 +133,7 @@
+ function( ecbuild_add_library_impl )
+ 
+   set( options NOINSTALL AUTO_VERSION )
+-  set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME )
++  set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION SONAME SOVERSION OUTPUT_NAME )
+   set( multi_value_args  SOURCES TEMPLATES LIBS INCLUDES PRIVATE_INCLUDES PUBLIC_INCLUDES DEPENDS PERSISTENT DEFINITIONS INSTALL_HEADERS_LIST CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
  
+   cmake_parse_arguments( _PAR "${options}" "${single_value_args}" "${multi_value_args}"  ${_FIRST_ARG} ${ARGN} )
diff --git a/debian/rules b/debian/rules
index cd95d7f..8e58c48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ AUTOGENERATED:= libmagplus3v5.links libmagics++-dev.links libmagplus3v5.install
 export DH_VERBOSE=1
 
 %:
-	dh $@  --with python2 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
+	dh $@ --parallel --with python2 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
 
 export extra_flags +=  \
 	-DCMAKE_PREFIX_PATH=${LIBDIR}/cmake/grib_api \
@@ -68,7 +68,7 @@ export extra_flags +=  \
 	-DENABLE_QT5=ON \
 	-DENABLE_NETCDF=ON \
 	-DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel -I/usr/include/geotiff' \
-	-DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd' 
+	-DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd -lemosR64' 
 
 export LD_LIBRARY_PATH:=$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)
 
@@ -88,7 +88,6 @@ override_dh_auto_configure:
                 sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
                 done
 	dh_auto_configure -- $(extra_flags)
-	exit 1
 	(cd python/Magics && ln -s $(BUILDDIR)/python/Magics/Magics.i )
 
 override_dh_auto_test check:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git