[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-2-2-gb88aa77

[Anton Gladky]

The following commit has been merged in the master branch:
commit d4661a3902d110f7915204b485d4cebb9c276526
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Mar 31 08:59:14 2012 +0200

    Fix FTBFS during arch-only build. Cleans in debian/rules.

diff --git a/debian/gnuplot-doc.doc-base b/debian/gnuplot-doc.doc-base
index 8f702c0..540b214 100644
--- a/debian/gnuplot-doc.doc-base
+++ b/debian/gnuplot-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This documentation describes the gnuplot plotting system
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/gnuplot-doc/html/index.html
-Files: /usr/share/doc/gnuplot-doc/html/*.html
+Index: /usr/share/doc/gnuplot-doc/htmldocs/index.html
+Files: /usr/share/doc/gnuplot-doc/htmldocs/*.html
diff --git a/debian/gnuplot-doc.docs b/debian/gnuplot-doc.docs
index 3c49920..4c318b7 100644
--- a/debian/gnuplot-doc.docs
+++ b/debian/gnuplot-doc.docs
@@ -6,3 +6,4 @@ docs/psdoc/ps_guide.ps
 docs/psdoc/ps_symbols.gpi
 docs/psdoc/ps_file.doc
 docs/psdoc/ps_fontfile_doc.ps
+docs/htmldocs
diff --git a/debian/gnuplot-nox.install b/debian/gnuplot-nox.install
index bb281c7..b5cfe46 100644
--- a/debian/gnuplot-nox.install
+++ b/debian/gnuplot-nox.install
@@ -2,3 +2,4 @@ debian/tmp/usr/share/gnuplot/gnuplot.gih
 debian/tmp/usr/share/man/man1/gnuplot.1
 debian/tmp/usr/share/gnuplot/gnuplot/
 debian/build-nox/src/gnuplot usr/bin
+pm3d/contrib/* usr/share/gnuplot/pm3d
diff --git a/debian/rules b/debian/rules
index 0507465..5461ed2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,12 +91,6 @@ override_dh_auto_install:
 	$(MAKE) -C $(BUILDDIR_X11) install DESTDIR=$(CURDIR)/debian/tmp/ \
 		pkglibexecdir='$$(libexecdir)'
 	chmod u-s $(CURDIR)/debian/tmp/usr/bin/gnuplot
-	mkdir -p debian/gnuplot-nox/usr/share/gnuplot/pm3d
-	cp -p pm3d/contrib/* debian/gnuplot-nox/usr/share/gnuplot/pm3d
-	dh_install
-	mkdir -p debian/gnuplot-doc/usr/share/doc/gnuplot-doc/html
-	cp -f docs/htmldocs/* debian/gnuplot-doc/usr/share/doc/gnuplot-doc/html/
-	rm -rf debian/gnuplot/usr/share/doc/gnuplot
 
 override_dh_auto_test:
 	cp -f $(BUILDDIR_X11)/demo/binary* ./demo/

-- 
Gnuplot. Interactive plotting program