[Gnash-commit] /srv/bzr/gnash/trunk r11915: add the two extra manpages to EXTRA_DIST, now that they always exist. Don't do the extra clean step, it's unnecessary now.

[Rob Savoye]

------------------------------------------------------------
revno: 11915
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sat 2010-02-06 09:56:57 -0700
message:
  add the two extra manpages to EXTRA_DIST, now that they always exist. Don't 
do the extra clean step, it's unnecessary now.
modified:
  doc/C/Makefile.am
  packaging/debian/rules

=== modified file 'doc/C/Makefile.am'
--- a/doc/C/Makefile.am 2010-02-06 16:15:35 +0000
+++ b/doc/C/Makefile.am 2010-02-06 16:56:57 +0000
@@ -88,7 +88,9 @@
        $(REFMAN) \
        $(COMMON) \
        $(XML_MAIN) \
-       $(MANSRC)  \
+       $(MANSRC) \
+       gtk-gnash.1 \
+       kde4-gnash.1 \
        preformatted/gnashuser.html.in \
        preformatted/gprocessor.1.in \
        preformatted/cygnal.1.in \

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2010-02-06 16:25:02 +0000
+++ b/packaging/debian/rules    2010-02-06 16:56:57 +0000
@@ -139,7 +139,7 @@
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+#      dh_clean -k 
        dh_installdirs
 
        install -d $(CURDIR)/debian/tmp/usr/bin
@@ -150,7 +150,6 @@
        install -d $(CURDIR)/debian/tmp/usr/include/gnash
 
        @printf "\n == INSTALL ==\n\n"
-       $(MAKE) -C doc/C clean
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        $(MAKE) install-plugins DESTDIR=$(CURDIR)/debian/tmp
        @printf "\n ---- End of INSTALL ---- \n\n"
@@ -194,7 +193,7 @@
 #      dh_installmenu
 #      dh_installmime
        dh_installman
-       dh_desktop
+#      dh_desktop
        dh_lintian
        dh_link
        dh_strip --dbg-package=gnash-dbg