[SCM] udav packaging branch, master, updated. debian/0.6.3-2-15-g5c8d695

[Salvatore Bonaccorso]

The following commit has been merged in the master branch:
commit 5c8d695a3842ca1b6269d8dee69396e228a76c0e
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Tue Feb 22 23:17:07 2011 +0100

    use documentation from mathgl-doc-en package

diff --git a/debian/changelog b/debian/changelog
index 123a758..2836d97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,12 @@ udav (0.7.0.1-1) unstable; urgency=low
   * Drop fix-598069-segfault-under-kde.patch as it is applied upstream.
   * debian/copyright: Refresh and add copyright and license information
     for new added files.
-  * debian/control: Bump Build-Depends on libmgl-dev to (>= 1.11). 
+  * debian/control:
+    - Bump Build-Depends on libmgl-dev to (>= 1.11).
+    - Add Recommends on mathgl-doc-en
+  * debian/rules: Adjust MGLDOCDIR to english documenation for mathgl.
 
- -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 22 Feb 2011 21:15:13 +0100
+ -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 22 Feb 2011 23:12:11 +0100
 
 udav (0.6.3-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c303c70..895c8dd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/udav.git
 Package: udav
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: mathgl-doc-en
 Description: application for data visualization based on MathGL
  UDAV provides a graphical environment for Data Array 
  Visualization based on the MathGL library. It allows easy 
diff --git a/debian/rules b/debian/rules
index 5a33c63..e8379a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 # export MGLDODIR path
-export MGLDOCDIR=/usr/share/doc/udav/help/
+export MGLDOCDIR=/usr/share/doc/mathgl-doc-en/mgl_en.html/
 
 %:
 	dh $@
@@ -15,7 +15,6 @@ override_dh_auto_install:
 	install -d $(CURDIR)/debian/udav/usr/bin
 	install $(CURDIR)/bin/udav $(CURDIR)/debian/udav/usr/bin
 	install -d $(CURDIR)/debian/udav/usr/share/doc/udav
-	cp -rf $(CURDIR)/help $(CURDIR)/debian/udav/usr/share/doc/udav
 	
 	# convert and scale udav.png
 	convert -scale 16x16 src/udav.png $(CURDIR)/debian/udav/usr/share/icons/hicolor/16x16/apps/udav.xpm

-- 
udav packaging