[SCM] Paraview packaging branch, master, updated. debian/3.14.1-6-5-g500098a

Anton Gladky gladky.anton at gmail.com
Fri Jul 13 18:59:00 UTC 2012


The following commit has been merged in the master branch:
commit 155d23cc1b6b4d82bf2c1f6769d66468adb34701
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Jul 13 19:27:50 2012 +0200

    Use compat 9 to harden buildflags.

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 d9c1542..fd08e81 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ DM-Upload-Allowed: yes
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, 
  Mathieu Malaterre <mathieu.malaterre at gmail.com>, 
  Anton Gladky <gladky.anton at gmail.com>
-Build-Depends: debhelper (>= 8), cmake (>= 2.6.3), 
+Build-Depends: debhelper (>= 9), cmake (>= 2.6.3), 
  libqt4-dev (>= 4.3.3-2), libsqlite3-dev,
  qt4-dev-tools, libboost-all-dev, 
  libavformat-dev (>= 4:0.7.1),
diff --git a/debian/rules b/debian/rules
index a65cc34..6fc255c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,16 +10,6 @@ UPSTREAM_VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ { sub("-[^-]*$
 
 export LD_LIBRARY_PATH+=:$(CURDIR)/debian/paraview/usr/lib/paraview
 
-# http://lists.alioth.debian.org/pipermail/debian-science-maintainers/2011-June/008157.html
-# cmake will inspect those settings automatically:
-export CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
-export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-
-# CMAKE_SKIP_RPATH=OFF is important otherwise documentation generation will fails with:
-# vtkSMExtractDocumentation: error while loading shared libraries: libvtkPVServerManager.so:
-# No rule to make target `Documentation/ParaViewWriters.html', needed by `Documentation/paraview.qhp'.  Stop.
 
 # Explicit settings of MPI_* is required see
 # http://www.vtk.org/Bug/view.php?id=12572

-- 
Paraview packaging



More information about the debian-science-commits mailing list