[plplot] 12/68: Import Debian changes 5.3.1-11

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit 2871f3d309b936545b469bfedf3b019167157fe2
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Wed Apr 12 16:11:00 2006 +0200

    Import Debian changes 5.3.1-11
    
    plplot (5.3.1-11) unstable; urgency=low
    
      * debian/rules: the plplot-doc package has now its own /usr/share/doc
        directory (really closes: #361781)
      * debian/control: Removed dependency of plplot-doc on libplplot9
---
 debian/changelog        |  8 ++++++++
 debian/compat           |  1 +
 debian/control          |  1 -
 debian/plplot-doc.files |  3 ---
 debian/rules            | 10 ++++++----
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4ea408..179a7c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+plplot (5.3.1-11) unstable; urgency=low
+
+  * debian/rules: the plplot-doc package has now its own /usr/share/doc
+    directory (really closes: #361781)
+  * debian/control: Removed dependency of plplot-doc on libplplot9
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 12 Apr 2006 16:11:00 +0200
+
 plplot (5.3.1-10) unstable; urgency=low
 
   * debian/control: Made the dependency of plplot-doc on libplplot9
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index cf1a77d..f6a9f49 100644
--- a/debian/control
+++ b/debian/control
@@ -160,7 +160,6 @@ Description: Octave support for PLplot, a plotting library
 Package: plplot-doc
 Architecture: all
 Section: doc
-Depends: libplplot9
 Suggests: libplplot-dev
 Description: Documentation for PLplot, a plotting library
  This package contains the HTML, PDF, PostScript and info forms of the
diff --git a/debian/plplot-doc.files b/debian/plplot-doc.files
index f4f9766..dd0d1d6 100644
--- a/debian/plplot-doc.files
+++ b/debian/plplot-doc.files
@@ -1,7 +1,4 @@
 usr/share/doc/plplot-doc
-usr/share/doc/libplplot9/html
-usr/share/doc/libplplot9/*.pdf
-usr/share/doc/libplplot9/*.ps.gz
 usr/share/man/man3
 usr/share/info
 
diff --git a/debian/rules b/debian/rules
index b0b81d6..eb5bbe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DH_COMPAT=4
-
 include /usr/share/octave/debian/defs.make
 
 version		:= $(shell perl debian/get-upstream-version.pl < configure.ac)
 libpkg          := libplplot9
+docpkg          := plplot-doc
 debbase		:= $(shell pwd)/debian
 debtmp		:= $(debbase)/tmp
 debusr		:= $(debtmp)/usr
@@ -84,9 +83,11 @@ install-stamp: build-stamp
 	  rm -f COPYING.LIB *.dvi ; \
 	  mv ChangeLog changelog )
 	mv $(debdoc)/plplot $(debdoc)/$(libpkg)
+	mkdir -p $(debdoc)/$(docpkg)
+	(cd $(debdoc)/$(libpkg) ; mv html *.pdf *.ps.gz $(debdoc)/$(docpkg))
 	mv $(debex) $(debdoc)/$(libpkg)
 
-	for i in libplplot-dev plplot-tcl plplot-tcl-dev plplot-doc	\
+	for i in libplplot-dev plplot-tcl plplot-tcl-dev 		\
 		plplot9-driver-gd plplot9-driver-xwin octave-plplot	\
 		python-plplot plplot-bin libplplot-c++9c2 		\
 		libcsiro0 ; do \
@@ -107,7 +108,8 @@ binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdirs -i
-	dh_installdocs --package=plplot-doc --exclude=copyright
+	dh_installdocs --package=$(docpkg)
+	dh_installchangelogs --package=$(docpkg)
 	dh_compress -i --exclude=.pdf
 	dh_fixperms -i
 	dh_installdeb -i

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