[Gnash-commit] /srv/bzr/gnash/trunk r11926: tweaks to get manpages always building for deb packages, like the do by hand and for rpms.

[Rob Savoye]

------------------------------------------------------------
revno: 11926
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Mon 2010-02-08 21:14:24 -0700
message:
  tweaks to get manpages always building for deb packages, like the do by hand 
and for rpms.
modified:
  doc/C/Makefile.am
  packaging/debian/control
  packaging/debian/rules

=== modified file 'doc/C/Makefile.am'
--- a/doc/C/Makefile.am 2010-02-06 19:27:02 +0000
+++ b/doc/C/Makefile.am 2010-02-09 04:14:24 +0000
@@ -20,6 +20,7 @@
 
 htmldir = ${prefix}/share/doc/gnash
 infodir = ${prefix}/share/info
+man1dir = ${prefix}/share/man/man1
 docname = gnash
 lang = C
 omffile = gnash-C.omf
@@ -89,8 +90,6 @@
        $(COMMON) \
        $(XML_MAIN) \
        $(MANSRC) \
-       gtk-gnash.1 \
-       kde4-gnash.1 \
        preformatted/gnashuser.html.in \
        preformatted/gprocessor.1.in \
        preformatted/cygnal.1.in \
@@ -112,8 +111,18 @@
 # docbook-utils transform the name at different steps in the process.
 # This is an easy way to handle it either way, since we only need it as
 # dependency anyway.
-dist_man_MANS = gnash.1 gprocessor.1 dumpshm.1 soldumper.1 flvdumper.1 
cygnal.1 rtmpget.1 findmicrophones.1 findwebcams.1
-MANSRC = $(dist_man_MANS:.1=.man-xml)
+MANPAGES = \
+       gnash.1 \
+       gprocessor.1 \
+       dumpshm.1 \
+       soldumper.1 \
+       flvdumper.1 \
+       cygnal.1 \
+       rtmpget.1 \
+       findmicrophones.1 \
+       findwebcams.1
+
+MANSRC = $(MANPAGES:.1=.man-xml)
 INFOS  = gnash_user.info gnash_ref.info
 HTMLS  = $(XML_MAIN:.xml=.html)
 PDFS   = $(XML_MAIN:.xml=.pdf)
@@ -129,7 +138,7 @@
 # and working correctly.
 html: $(HTMLS)
 pdf:  $(PDFS)
-man:  $(dist_man_MANS)
+man:  $(MANPAGES)
 info: $(INFOS)
 texi: $(TEXIS)
 
@@ -221,6 +230,15 @@
        fi
 endif
 
+gnash.1: $(srcdir)/gnash.man-xml
+gprocessor.1: $(srcdir)/gprocessor.man-xml
+dumpshm.1: $(srcdir)/dumpshm.man-xml
+soldumper.1: $(srcdir)/soldumper.man-xml
+flvdumper.1: $(srcdir)/flvdumper.man-xml
+cygnal.1: $(srcdir)/cygnal.man-xml
+findmicrophones.1: $(srcdir)/findmicrophones.man-xml
+findwebcams.1: $(srcdir)/findwebcams.man-xml
+
 if DOCBOOK
 gnash_user.info: gnashuser.texi
 gnash_ref.info: gnashref.texi
@@ -333,15 +351,19 @@
 
 # gtk-gnash.1 and kde4-gnash.1 are special, as they are created by
 # the --solinks option to the docbook2 tools for creating man pages.
-install-extra-man: gnash.1
-           $(INSTALL_DATA) gtk-gnash.1 $(DESTDIR)$(man1dir)/gtk-gnash.1
-           $(INSTALL_DATA) kde4-gnash.1 $(DESTDIR)$(man1dir)/kde4-gnash.1
+install-man1: $(MANPAGES)
+       -test -d "$(DESTDIR)$(man1dir)/" || $(mkinstalldirs) 
"$(DESTDIR)$(man1dir)/"
+       -$(INSTALL_DATA) gtk-gnash.1 $(DESTDIR)$(man1dir)/gtk-gnash.1
+       -$(INSTALL_DATA) kde4-gnash.1 $(DESTDIR)$(man1dir)/kde4-gnash.1
+       -for file in $(MANPAGES); do \
+          $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \
+       done
 
 # the gtk-gnash.1 and kde4-gnash.1 manpages are generated as aliases
 # for the gnash.1 man page, so we can't use the suffix rules to build
 # them, but we need to install the ".so gnash.1" manpages also, or
 # they aren;t in the tarball.
-link-extra-man: gnash.1
+link-extra-man: 
        address@hidden test ! -e gtk-gnash.1; then \
            echo "WARNING: Linking to preformatted version of gtk-gnash.1, it 
could be out of date."; \
            $(LN_S) -f $(srcdir)/preformatted/gtk-gnash.1.in gtk-gnash.1; \
@@ -351,7 +373,7 @@
            $(LN_S) -f $(srcdir)/preformatted/kde4-gnash.1.in kde4-gnash.1; \
          fi
 
-install-data-hook: install-extra-man install-info-hook install-html-hook 
+install-data-hook: $(MANPAGES) install-man1 install-info-hook 
install-html-hook 
 uninstall-hook: uninstall-info-hook uninstall-html-hook
        -$(RM) -f $(DESTDIR)$(man1dir)/gtk-gnash.1 
        -$(RM) -f $(DESTDIR)$(man1dir)/kde4-gnash.1
@@ -391,16 +413,13 @@
 
 CLEANFILES = \
         $(PDFS) \
-       $(MANS) \
+       $(MANPAGES) \
        $(INFOS) \
         $(HTMLS) \
+       $(TEXIS) \
        gnash-C.omf.out \
        manpage.links  \
        manpage.refs  \
-       gnash_ref.texi  \
-       gnashref.texi  \
-       gnash_user.texi  \
-       gnashuser.texi  \
        gnash.fo  \
        gnash.log  \
        gnashuser.txml \

=== modified file 'packaging/debian/control'
--- a/packaging/debian/control  2010-02-08 19:01:05 +0000
+++ b/packaging/debian/control  2010-02-09 04:14:24 +0000
@@ -144,9 +144,10 @@
 
 Package: gnash-dbg
 Architecture: any
-Section: libdevel
+Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, , ${misc:Depends}, gnash-common (= 
${binary:Version})
+Depends: gnash-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
 Description: Debug symbols for Gnash
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2010-02-08 19:01:05 +0000
+++ b/packaging/debian/rules    2010-02-09 04:14:24 +0000
@@ -133,7 +133,6 @@
        dh_testdir
        dh_testroot
        rm -f build-stamp 
-#      rm -f doc/C/*.1*
        rm -f README.amf README.cygnal
 
        rm -fr $(BUILD_DIRECTORY)