[SCM] Test git-repository for paraview branch, master, updated. upstream/3.10.1-23-g0cc8ce1

[Anton Gladky]

The following commit has been merged in the master branch:
commit 0cc8ce133de37c4d265cc20b84e70a5a54409820
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jun 23 21:17:59 2011 +0200

    Divide binary-library and development files

diff --git a/debian/control b/debian/control
index 0cbe349..c9e50fb 100644
--- a/debian/control
+++ b/debian/control
@@ -37,3 +37,23 @@ Description: Parallel Visualization Application
  supercomputers. Under the hood, ParaView uses the Visualization
  Toolkit as the data processing and rendering engine and has a user
  interface written using Qt.
+ 
+Package: libparaview-dev
+Architecture: all
+Recommends: paraview
+Description: Parallel Visualization Application. Development header files
+ ParaView is an open-source, multi-platform application designed to
+ visualize data sets of size varying from small to very large. The
+ goals of the ParaView project include the following:
+ .
+     * Develop an open-source, multi-platform visualization application.
+     * Support distributed computation models to process large data sets.
+     * Create an open, flexible, and intuitive user interface.
+     * Develop an extensible architecture based on open standards.
+ .
+ ParaView runs on distributed and shared memory parallel as well as
+ single processor systems and has been successfully tested on Windows,
+ Mac OS X, Linux and various Unix workstations, clusters and
+ supercomputers. Under the hood, ParaView uses the Visualization
+ Toolkit as the data processing and rendering engine and has a user
+ interface written using Qt. Development header files
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 74c5069..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-
diff --git a/debian/libparaview-dev.install b/debian/libparaview-dev.install
index b7ca79f..2e137f7 100644
--- a/debian/libparaview-dev.install
+++ b/debian/libparaview-dev.install
@@ -1,2 +1 @@
-debian/tmp/usr/include/paraview  /usr/include
-debian/tmp/include/paraview  /usr/include
\ No newline at end of file
+debian/tmp/usr/include usr
diff --git a/debian/libparaview.install b/debian/libparaview.install
deleted file mode 100644
index 91fd7ba..0000000
--- a/debian/libparaview.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/paraview/lib*.so /usr/lib/paraview
-debian/tmp/lib/paraview/lib*.so /usr/lib/paraview
\ No newline at end of file
diff --git a/debian/paraview-plugins.install b/debian/paraview-plugins.install
deleted file mode 100644
index 13ab80d..0000000
--- a/debian/paraview-plugins.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/paraview/plugins  /usr/lib/paraview/
-debian/tmp/usr/bin/plugins           /usr/lib/paraview/
diff --git a/debian/paraview.docs b/debian/paraview.docs
new file mode 100644
index 0000000..1832b08
--- /dev/null
+++ b/debian/paraview.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/paraview-3.10/* 
diff --git a/debian/paraview.install b/debian/paraview.install
index b8718d9..ddb293f 100644
--- a/debian/paraview.install
+++ b/debian/paraview.install
@@ -1,12 +1,5 @@
-debian/paraview.1 /usr/share/man/man1
-debian/vtkWrapClientServer.1 /usr/share/man/man1
-debian/kwProcessXML.1 /usr/share/man/man1
-debian/pvbatch.1 /usr/share/man/man1
-debian/pvdataserver.1 /usr/share/man/man1
-debian/pvpython.1 /usr/share/man/man1
-debian/pvrenderserver.1 /usr/share/man/man1
-debian/pvserver.1 /usr/share/man/man1
+usr/bin usr
+usr/lib usr
 debian/paraview.xpm usr/share/pixmaps
 debian/paraview.xml usr/share/mime/packages
 debian/paraview.desktop usr/share/applications
-
diff --git a/debian/paraview.manpages b/debian/paraview.manpages
new file mode 100644
index 0000000..880c6b9
--- /dev/null
+++ b/debian/paraview.manpages
@@ -0,0 +1,9 @@
+debian/paraview.1
+debian/vtkWrapClientServer.1
+debian/kwProcessXML.1
+debian/pvbatch.1
+debian/pvdataserver.1
+debian/pvpython.1
+debian/pvrenderserver.1
+debian/pvserver.1
+debian/tmp/usr/share/man/man3/*
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index 8b253bc..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.4-
diff --git a/debian/rules b/debian/rules
index 4024e47..d1e64b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,16 @@
 #! /usr/bin/make -f
 BUILDDIR = $(CURDIR)/debian/build
+DESTDIR = $(CURDIR)/debian/tmp
 
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)
 
 export LD_LIBRARY_PATH+=:$(CURDIR)/debian/paraview/usr/lib/paraview
+
+# -lXt is added for compiling not in clean environment. It gives an error without it.
+CFLAGS := -Wall -lXt $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := -Wall -lXt $(shell dpkg-buildflags --get CXXFLAGS)
+
 PYVER = $(shell pyversions -dv)
 extra_flags += 	-DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
 	-DBUILD_SHARED_LIBS=ON \
@@ -39,9 +45,23 @@ extra_flags += 	-DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
 	-DMPI_LINK_FLAGS=-Wl \
 	-DPARAVIEW_ENABLE_PYTHON=ON \
 	-DPYTHON_EXECUTABLE=/usr/bin/python$(PVER) \
-    -DVTK_USE_OGGTHEORA_ENCODER=ON \
-    -DVTK_USE_SYSTEM_OGGTHEORA=ON
+	-DVTK_USE_OGGTHEORA_ENCODER=ON \
+	-DVTK_USE_SYSTEM_OGGTHEORA=ON \
+	-DCMAKE_C_FLAGS='$(CFLAGS)' \
+	-DCMAKE_CXX_FLAGS='$(CXXFLAGS)' \
 
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)
+
+override_dh_auto_clean:
+	rm -rf $(BUILDDIR)
+	rm -rf $(DESTDIR)
+	dh_clean
+	
+override_dh_auto_install:
+	dh_auto_install -- DESTDIR=$(DESTDIR)
+
+override_dh_auto_build:
+	dh_auto_build
+	cd $(BUILDDIR); make HTMLDocumentation

-- 
Test git-repository for paraview