[Gnash-commit] /srv/bzr/gnash/trunk r11916: more tweaks to get the extra manpages working correctly for deb packaging.

[Rob Savoye]

------------------------------------------------------------
revno: 11916
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sat 2010-02-06 12:27:02 -0700
message:
  more tweaks to get the extra manpages working correctly for deb packaging.
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 16:56:57 +0000
+++ b/doc/C/Makefile.am 2010-02-06 19:27:02 +0000
@@ -216,10 +216,9 @@
        @if test -d $(srcdir)/preformatted; then \
          echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
          $(LN_S) -f $(srcdir)/preformatted/address@hidden ./$@; \
-         fi; \
        else \
          touch $@; \
-       fi; 
+       fi
 endif
 
 if DOCBOOK
@@ -335,18 +334,22 @@
 # 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_DATA) gtk-gnash.1 $(DESTDIR)$(man1dir)/gtk-gnash.1
+           $(INSTALL_DATA) kde4-gnash.1 $(DESTDIR)$(man1dir)/kde4-gnash.1
 
 # 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
-       @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
-       @echo "WARNING: Linking to preformatted version of kde4-gnash.1, it 
could be out of date."; \
-       $(LN_S) -f $(srcdir)/preformatted/kde4-gnash.1.in kde4-gnash.1
+       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; \
+         fi
+       address@hidden test ! -e kde4-gnash.1; then \
+           echo "WARNING: Linking to preformatted version of kde4-gnash.1, it 
could be out of date."; \
+           $(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 
 uninstall-hook: uninstall-info-hook uninstall-html-hook

=== modified file 'packaging/debian/control'
--- a/packaging/debian/control  2010-02-05 01:44:54 +0000
+++ b/packaging/debian/control  2010-02-06 19:27:02 +0000
@@ -1,7 +1,7 @@
 Source: gnash
 Priority: optional
 Maintainer: Rob Savoye (Rollinsville, CO) <address@hidden>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), autoconf, 
automake, libtool, libltdl3-dev, libxmu-dev, dejagnu, autotools-dev, 
libjpeg-dev, libpng12-dev | libpng-dev, libagg-dev, libpango1.0-dev | 
pango-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | 
libcurl3-openssl-dev, libboost1.40-dev | libboost1.39-dev | libboost1.38.0-dev 
| libboost1.37-dev | libboost1.36-dev | libboost1.35-dev | libboost1.34.1-dev | 
libboost-dev, libboost-thread1.40-dev | libboost-thread1.39-dev | 
libboost-thread1.38.0-dev | libboost-thread1.37-dev | libboost-thread1.36-dev | 
libboost-thread1.35-dev | libboost-thread1.34.1-dev | libboost-thread-dev, 
libboost-date-time1.40-dev | libboost-date-time1.39-dev | 
libboost-date-time1.38.0-dev | libboost-date-time1.37-dev | 
libboost-date-time1.36-dev | libboost-date-time1.35-dev | 
libboost-date-time1.34.1-dev | libboost-date-time-dev, libgtk2.0-dev, 
libpango1.0-dev, libatk1.0-dev, python2.6-dev | python2.5-dev | python2.4-dev, 
kdelibs5-dev, python-gtk2-dev, qt4-qmake, docbook, docbook2x
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.0), autoconf, 
automake, libtool, libltdl3-dev, libxmu-dev, dejagnu, autotools-dev, 
libjpeg-dev, libpng12-dev | libpng-dev, libagg-dev, libpango1.0-dev | 
pango-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | 
libcurl3-openssl-dev, libboost1.40-dev | libboost1.39-dev | libboost1.38.0-dev 
| libboost1.37-dev | libboost1.36-dev | libboost1.35-dev | libboost1.34.1-dev | 
libboost-dev, libboost-thread1.40-dev | libboost-thread1.39-dev | 
libboost-thread1.38.0-dev | libboost-thread1.37-dev | libboost-thread1.36-dev | 
libboost-thread1.35-dev | libboost-thread1.34.1-dev | libboost-thread-dev, 
libboost-date-time1.40-dev | libboost-date-time1.39-dev | 
libboost-date-time1.38.0-dev | libboost-date-time1.37-dev | 
libboost-date-time1.36-dev | libboost-date-time1.35-dev | 
libboost-date-time1.34.1-dev | libboost-date-time-dev, libgtk2.0-dev, 
libpango1.0-dev, libatk1.0-dev, python2.6-dev | python2.5-dev | python2.4-dev, 
kdelibs5-dev, python-gtk2-dev, qt4-qmake, docbook, docbook2x
 Standards-Version: 3.8.4
 Section: utils
 Homepage: http://www.gnu.org/software/gnash/

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2010-02-06 16:56:57 +0000
+++ b/packaging/debian/rules    2010-02-06 19:27:02 +0000
@@ -119,7 +119,7 @@
        rm -f `find . -name "*.la"`
        rm -rf `find . -name ".libs"`
        rm -rf `find . -name ".deps"`
-       rm -f  doc/C/*.1
+       rm -f doc/C/*.1*
 
        @printf "\n == CLEANING PATCHES ==\n\n"
        # we have no patches, we're the developers!
@@ -173,8 +173,8 @@
        cp packaging/*.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
        install -d $(CURDIR)/debian/tmp/usr/share/applications/
        cp debian/*.desktop $(CURDIR)/debian/tmp/usr/share/applications/
-       gzip -9 $(CURDIR)/debian/tmp/usr/share/man/man1/gtk-gnash.1
-       gzip -9 $(CURDIR)/debian/tmp/usr/share/man/man1/kde4-gnash.1
+       gzip -f9 $(CURDIR)/debian/tmp/usr/share/man/man1/gtk-gnash.1
+       gzip -f9 $(CURDIR)/debian/tmp/usr/share/man/man1/kde4-gnash.1
 
 # CREATE PACKAGES
 
@@ -193,7 +193,7 @@
 #      dh_installmenu
 #      dh_installmime
        dh_installman
-#      dh_desktop
+       dh_desktop
        dh_lintian
        dh_link
        dh_strip --dbg-package=gnash-dbg