[SCM] maria packaging branch, master, updated. debian/1.3.5-3-8-g1562ac5

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 1562ac5a906236be756d5630449146572fa0bf37
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri May 13 22:11:51 2011 +0200

    install more stuff through debian/package.* files

diff --git a/debian/changelog b/debian/changelog
index 5606a79..92eef7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ maria (1.3.5-4) unstable; urgency=low
     - set priority to extra
     - set maintainer to debian-science
     - add Vcs-Git/Browse fields
-  * Simplify calls to debhelpers
+  * Simplify invocations to debhelpers in debian/rules
   * patch utf8: migrate NEWS file to utf8
 
  -- Ralf Treinen <treinen at debian.org>  Fri, 13 May 2011 21:59:53 +0200
diff --git a/debian/maria.examples b/debian/maria.examples
new file mode 100644
index 0000000..d7b3c3f
--- /dev/null
+++ b/debian/maria.examples
@@ -0,0 +1 @@
+debian/README.examples
diff --git a/debian/maria.manpages b/debian/maria.manpages
new file mode 100644
index 0000000..547d6a9
--- /dev/null
+++ b/debian/maria.manpages
@@ -0,0 +1,3 @@
+maria.1
+maria-cso.1
+maria-vis.1
diff --git a/debian/rules b/debian/rules
index b2d7e39..fab57fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 # rules for maria
 
 # export DH_VERBOSE=1
-export MAKE=make
 
 # workaround for gcc-4.0 bug on m68k
 export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -54,8 +53,6 @@ install-arch: build
 	dh_install -a
 	$(MAKE) install DESTDIR=debian/maria \
 		 EXDIR=/usr/share/doc/maria/examples
-	cp debian/README.examples debian/maria/usr/share/doc/maria/examples
-	$(MAKE) installman DESTDIR=debian/maria
 
 binary-indep: install-indep
 	dh_testdir -i
@@ -77,6 +74,8 @@ binary-arch: install-arch
 	dh_installemacsen -a
 	dh_installchangelogs -a 
 	dh_installdocs -a
+	dh_installman -a
+	dh_installexamples -a
 	dh_link -a
 	dh_strip -a
 	dh_compress -a

-- 
maria packaging