r36833 - in /packages/paraview/trunk/debian: changelog rules

malat-guest at users.alioth.debian.org malat-guest at users.alioth.debian.org
Wed Aug 18 15:01:51 UTC 2010 

Author: malat-guest
Date: Wed Aug 18 15:01:48 2010
New Revision: 36833

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36833
Log:
prepare for new upload

Modified:
    packages/paraview/trunk/debian/changelog
    packages/paraview/trunk/debian/rules

Modified: packages/paraview/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/paraview/trunk/debian/changelog?rev=36833&op=diff
==============================================================================
--- packages/paraview/trunk/debian/changelog (original)
+++ packages/paraview/trunk/debian/changelog Wed Aug 18 15:01:48 2010
@@ -3,6 +3,7 @@
   * New upstream: 3.8.1. Closes: #591137
   * Do not install system lib (ffmpeg, qt)
   * Update Standard-Version: 3.9.1 (no change required)
+  * Some debian/rules cleanups
 
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 30 Jul 2010 11:56:30 +0200
 

Modified: packages/paraview/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/paraview/trunk/debian/rules?rev=36833&op=diff
==============================================================================
--- packages/paraview/trunk/debian/rules (original)
+++ packages/paraview/trunk/debian/rules Wed Aug 18 15:01:48 2010
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -18,12 +12,7 @@
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-#include /usr/share/cdbs/1/class/python-distutils.mk
 
-#DEB_PYTHON_BUILD_ARGS =
-#--build-base="$(DEB_BUILDDIR)/VTK/Wrapping/Python/"
-#DEB_PYTHON_SETUP_CMD := $(DEB_BUILDDIR)/VTK/Wrapping/Python/setup.py
-#DEB_PYTHON_SETUP_CMD :=
 DEB_DH_MAKESHLIBS_ARGS_paraview := -n
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -40,7 +29,7 @@
         -DDOCUMENTATION_HTML_HELP=ON     \
         -DBUILD_EXAMPLES=OFF              \
         -DBUILD_SHARED_LIBS=ON           \
-        -DVTK_USE_RPATH=ON               \
+        -DVTK_USE_RPATH:BOOL=ON               \
         -DCMAKE_VERBOSE_MAKEFILE=OFF     \
         -DCMAKE_BUILD_TYPE="Release"     \
         -DCMAKE_INSTALL_RPATH=/usr/lib/paraview \
@@ -107,63 +96,14 @@
         -DPYTHON_EXECUTABLE=/usr/bin/python$(PVER) \
 	      -DPYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) \
 	      -DPYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so \
-        -DPV_INSTALL_LIB_DIR="$${PV_INSTALL_ROOT}/lib/paraview" \
-        -DPV_INSTALL_INCLUDE_DIR="$${PV_INSTALL_ROOT}/include/paraview"
+        -DPV_INSTALL_LIB_DIR="lib/paraview" \
+        -DPV_INSTALL_INCLUDE_DIR="include/paraview"
 
 DEB_DH_SHLIBDEPS_ARGS=-l$(CURDIR)/debian/paraview/usr/lib/paraview -l$(CURDIR)/debian/paraview/usr/lib/python$(PVER)/site-packages/paraview/python/
 
 binary-install/paraview::
-# 	-for i in `find $(DEB_BUILDDIR)/bin/ -name "[DHPckmpv]*"`;  \
-# 	 do\
-#           install $$i debian/paraview/usr/bin; \
-#         done
-# 	-mkdir -p debian/paraview/usr/lib/paraview
-# 	-mkdir -p debian/paraview/usr/lib/paraview/python
-# 	-for i in `find $(DEB_BUILDDIR)/bin/ -name "*.so*"`;  \
-# 	 do\
-#           install $$i debian/paraview/usr/lib/paraview/; \
-#         done
-# 	-rm debian/paraview/usr/lib/paraview/lib*Python*.so*
-# 	-for i in `find $(DEB_BUILDDIR)/bin/ -name "*Python*.so*"`;  \
-# 	 do\
-#           install $$i debian/paraview/usr/lib/paraview/python; \
-#         done
-# 	-mkdir -p debian/paraview/usr/share/doc/paraview/html
-# 	-for i in `find $(DEB_BUILDDIR)/Documentation/ -name "*.[pnghtml]*"`;  \
-# 	 do\
-#           install $$i debian/paraview/usr/share/doc/paraview/html; \
-#         done
-# 	-mkdir -p debian/paraview/usr/share/lintian/overrides
-# 	-cp debian/paraview.lintian-overrides debian/paraview/usr/share/lintian/overrides/paraview
-# 	-# install the documentation
-# 	-mkdir debian/paraview/usr/share/paraview
-# 	-echo  >debian/paraview/usr/share/paraview/pqClientDocFinder.txt /usr/bin/
-# 	-echo >>debian/paraview/usr/share/paraview/pqClientDocFinder.txt /usr/share/doc/paraview/html/pqClient.adp
-# 	-install $(DEB_BUILDDIR)/pqClient.adp debian/paraview/usr/share/doc/paraview/html
-
-
-# #binary-install/python-paraview::
-# #	dh_pycentral -ppython-paraview
-# #	dh_python -ppython-paraview
-
-# #makebuilddir/python-paraview::
-# #	ln -sf build $(DEB_BUILDDIR)/VTK/Wrapping/Python/
-# #	ln -sf  $(DEB_BUILDDIR)/VTK/Wrapping/Python/setup.py
-
-	-mv debian/paraview/usr/bin/plugins $(CURDIR)/debian/paraview/usr/lib/paraview/plugins
-	-mv debian/paraview/usr/plugins/* $(CURDIR)/debian/paraview/usr/lib/paraview/plugins
-	-rm -rf debian/paraview/usr/plugins
-	-mv debian/paraview/lib/paraview/* $(CURDIR)/debian/paraview/usr/lib/paraview/
-	-mv debian/paraview/include/paraview/* $(CURDIR)/debian/paraview/usr/include/paraview/
-	-mv debian/paraview/usr/bin/Documentation $(CURDIR)/debian/paraview/usr/share/doc/paraview/html
-	-mv debian/paraview/usr/bin/*.html $(CURDIR)/debian/paraview/usr/share/doc/paraview/
-	-mv debian/paraview/usr/bin/*.txt $(CURDIR)/debian/paraview/usr/share/doc/paraview/
-	-mv debian/paraview/usr/bin/*.adp $(CURDIR)/debian/paraview/usr/share/doc/paraview/
 	-chmod a+x $(CURDIR)/debian/paraview/usr/lib/paraview/testing/FindString.tcl
-	-rm -rf debian/paraview/lib
-	-rm -rf debian/paraview/include
-	-rm -rf debian/paraview/scratch
-	# we need to keep: vtkWrapClientServer
+	# we need to keep: vtkWrapClientServer, remove vtkWrapPython  vtkWrapPythonInit
 	find debian/paraview/usr/bin -type f -name vtk\* -not -name vtkWrapClientServer -print | xargs rm
 	# The assistant is actually the one from Qt, simply a convient copy, remove it !
 	-rm debian/paraview/usr/bin/assistant
@@ -171,6 +111,7 @@
 	-rm debian/paraview/usr/bin/lproj
 	# remove cmake test driver
 	-rm debian/paraview/usr/bin/smTestDriver
+	# need to handle this one more gracefully
 	-mv debian/paraview/usr/doc/paraview.qch debian/paraview/usr/share/doc/paraview/paraview.qch
 	-rmdir debian/paraview/usr/doc
 
@@ -187,7 +128,6 @@
 	dh_pysupport -pparaview
 	-chmod a-x $(CURDIR)/debian/paraview/usr/share/pyshared/paraview/*.py
 	-chmod a-x $(CURDIR)/debian/paraview/usr/share/pyshared/paraview/vtk/*.py
-	-rm -r debian/paraview/usr/lib/paraview/doc
 
 clean::
 	-find $(CURDIR) -name "*.pyc" | xargs rm -f

More information about the debian-science-commits mailing list