[paraview] 01/03: Use packaged protobuf version

Anton Gladky gladk at moszumanska.debian.org
Wed Sep 20 21:33:25 UTC 2017


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

gladk pushed a commit to branch master
in repository paraview.

commit de478ffeffbb2109319188ee61a301d0599ab595
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Sep 20 23:27:15 2017 +0200

    Use packaged protobuf version
---
 debian/control   |  2 ++
 debian/copyright | 24 +-----------------------
 debian/rules     |  1 +
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/debian/control b/debian/control
index c89a908..b738e53 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ Build-Depends: debhelper (>= 9),
                gfortran,
                libavutil-dev,
                libcgns-dev,
+               libprotobuf-dev,
+               protobuf-compiler,
                libavcodec-dev,
                libswscale-dev,
                libqt5sql5-sqlite,
diff --git a/debian/copyright b/debian/copyright
index 026d0b7..d405890 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,6 +27,7 @@ Files-Excluded:
   VTK/ThirdParty/Twisted
   Plugins/SciberQuestToolKit/eigen*
   ThirdParty/cgns/vtkcgns/src
+  ThirdParty/protobuf/vtkprotobuf/src
 
 Files: *
 Copyright: 2000-2005 Kitware Inc. 28 Corporate Drive, Suite 204,
@@ -740,29 +741,6 @@ License: BSD-like
   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: ThirdParty/protobuf/*
-Copyright: 2008 Google Inc.
-License: BSD-like
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-     * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-
 Files: ThirdParty/pugixml/*
 Copyright: 2006-2014, by Arseny Kapoulkine (arseny.kapoulkine at gmail.com) 
 License: MIT
diff --git a/debian/rules b/debian/rules
index 4f3c6c6..149e3e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ extra_flags += -Wno-dev \
 	-DVTK_USE_OGGTHEORA_ENCODER=ON \
 	-DVTK_USE_SYSTEM_FREETYPE=ON \
 	-DVTK_USE_SYSTEM_CGNS=ON \
+	-DVTK_USE_SYSTEM_PROTOBUF=ON \
 	-DVTK_USE_SYSTEM_GL2PS=ON \
 	-DVTK_USE_SYSTEM_JPEG=ON \
 	-DVTK_USE_SYSTEM_JSONCPP=ON \

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



More information about the debian-science-commits mailing list