[magics] 02/04: Delete ./src/boost in rules to ensure boost pkg is used

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Apr 25 10:44:39 UTC 2017


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

mckinstry pushed a commit to tag debian/2.32.0-2
in repository magics.

commit cb9e3b292b0f512f2259be067de5f6e2edb0b297
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Apr 25 11:42:49 2017 +0100

    Delete ./src/boost in rules to ensure boost pkg is used
---
 debian/changelog | 1 +
 debian/rules     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c3b04c7..9ed5034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ magics++ (2.32.0-2) UNRELEASED; urgency=medium
 
   * Fixes to python3; Closes: #858949
   * Silence HAVE_GEOTIFF dup warnings.
+  * Delete ./src/boost in rules to ensure boost pkg is used
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 20 Apr 2017 19:40:28 +0100
 
diff --git a/debian/rules b/debian/rules
index 68d54e7..c690f23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@ export LC_ALL
 
 export QT_SELECT=5
 
+export CXX=g++-6
+
 LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 AUTOGENERATED:= libmagplus3v5.links libmagics++-dev.links libmagplus3v5.install
 # Uncomment this to turn on verbose mode.
@@ -86,7 +88,7 @@ override_dh_auto_clean:
 	rm -f bin/magjsonx  bin/magmlx  bin/metgramx
 	find . -type l -delete
 	rm -f src/params/*.h src/decoders/*Attributes.h
-	rm -rf share/magics/ttf src/terralib debian/build
+	rm -rf share/magics/ttf src/terralib debian/build src/boost
 	rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
 
 override_dh_auto_configure:

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



More information about the debian-science-commits mailing list