From 71e74d048de968893017b96266f26faea63573ec Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 24 Oct 2007 19:57:49 +0000 Subject: [PATCH] 2007-10-24 21:57 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) - harbour/debian/hbdot.1 - harbour/debian/harbour.1 - harbour/debian/hbmake.1 - harbour/debian/hbtest.1 - harbour/debian/hbpp.1 - harbour/debian/hbrun.1 - harbour/debian/hbdoc.1 + harbour/doc/man + harbour/doc/man/hbdot.1 + harbour/doc/man/harbour.1 + harbour/doc/man/hbmake.1 + harbour/doc/man/hbpp.1 + harbour/doc/man/hbtest.1 + harbour/doc/man/hbrun.1 + harbour/doc/man/hbdoc.1 * moved man files from ./debian directory to ./doc/man * harbour/debian/rules * updated for new man files location * harbour/bin/pack_src.sh * harbour/harbour.spec * added man files to RPMs --- harbour/ChangeLog | 24 ++++++++++++++++++++++++ harbour/bin/pack_src.sh | 4 ++++ harbour/debian/rules | 2 +- harbour/{debian => doc/man}/harbour.1 | 0 harbour/{debian => doc/man}/hbdoc.1 | 0 harbour/{debian => doc/man}/hbdot.1 | 0 harbour/{debian => doc/man}/hbmake.1 | 0 harbour/{debian => doc/man}/hbpp.1 | 0 harbour/{debian => doc/man}/hbrun.1 | 0 harbour/{debian => doc/man}/hbtest.1 | 0 harbour/harbour.spec | 4 ++++ 11 files changed, 33 insertions(+), 1 deletion(-) rename harbour/{debian => doc/man}/harbour.1 (100%) rename harbour/{debian => doc/man}/hbdoc.1 (100%) rename harbour/{debian => doc/man}/hbdot.1 (100%) rename harbour/{debian => doc/man}/hbmake.1 (100%) rename harbour/{debian => doc/man}/hbpp.1 (100%) rename harbour/{debian => doc/man}/hbrun.1 (100%) rename harbour/{debian => doc/man}/hbtest.1 (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 908d12b425..bef12a3395 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,30 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-10-24 21:57 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + - harbour/debian/hbdot.1 + - harbour/debian/harbour.1 + - harbour/debian/hbmake.1 + - harbour/debian/hbtest.1 + - harbour/debian/hbpp.1 + - harbour/debian/hbrun.1 + - harbour/debian/hbdoc.1 + + harbour/doc/man + + harbour/doc/man/hbdot.1 + + harbour/doc/man/harbour.1 + + harbour/doc/man/hbmake.1 + + harbour/doc/man/hbpp.1 + + harbour/doc/man/hbtest.1 + + harbour/doc/man/hbrun.1 + + harbour/doc/man/hbdoc.1 + * moved man files from ./debian directory to ./doc/man + + * harbour/debian/rules + * updated for new man files location + * harbour/bin/pack_src.sh + * harbour/harbour.spec + * added man files to RPMs + 2007-10-24 21:38 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/debian/hbdot.1 * harbour/debian/harbour.1 diff --git a/harbour/bin/pack_src.sh b/harbour/bin/pack_src.sh index 7d0c3cc571..edaf98f512 100755 --- a/harbour/bin/pack_src.sh +++ b/harbour/bin/pack_src.sh @@ -63,6 +63,10 @@ $hb_collect doc/en/[Mm]akefile* $hb_collect doc/en/*.txt $hb_collect doc/es/[Mm]akefile* $hb_collect doc/es/*.txt +$hb_collect doc/man/*.1* + +# DEBIAN +$hb_collect debian/* # INCLUDE $hb_collect include/Makefile diff --git a/harbour/debian/rules b/harbour/debian/rules index 6614716132..14915fe14b 100755 --- a/harbour/debian/rules +++ b/harbour/debian/rules @@ -72,7 +72,7 @@ binary-arch: build install dh_installdocs dh_installexamples # dh_install - dh_installman debian/harbour.1 debian/hbdoc.1 debian/hbmake.1 debian/hbpp.1 debian/hbrun.1 debian/hbdot.1 debian/hbtest.1 + dh_installman doc/man/harbour.1 doc/man/hbdoc.1 doc/man/hbmake.1 doc/man/hbpp.1 doc/man/hbrun.1 doc/man/hbdot.1 doc/man/hbtest.1 dh_link dh_strip dh_compress diff --git a/harbour/debian/harbour.1 b/harbour/doc/man/harbour.1 similarity index 100% rename from harbour/debian/harbour.1 rename to harbour/doc/man/harbour.1 diff --git a/harbour/debian/hbdoc.1 b/harbour/doc/man/hbdoc.1 similarity index 100% rename from harbour/debian/hbdoc.1 rename to harbour/doc/man/hbdoc.1 diff --git a/harbour/debian/hbdot.1 b/harbour/doc/man/hbdot.1 similarity index 100% rename from harbour/debian/hbdot.1 rename to harbour/doc/man/hbdot.1 diff --git a/harbour/debian/hbmake.1 b/harbour/doc/man/hbmake.1 similarity index 100% rename from harbour/debian/hbmake.1 rename to harbour/doc/man/hbmake.1 diff --git a/harbour/debian/hbpp.1 b/harbour/doc/man/hbpp.1 similarity index 100% rename from harbour/debian/hbpp.1 rename to harbour/doc/man/hbpp.1 diff --git a/harbour/debian/hbrun.1 b/harbour/doc/man/hbrun.1 similarity index 100% rename from harbour/debian/hbrun.1 rename to harbour/doc/man/hbrun.1 diff --git a/harbour/debian/hbtest.1 b/harbour/doc/man/hbtest.1 similarity index 100% rename from harbour/debian/hbtest.1 rename to harbour/doc/man/hbtest.1 diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 6be025dc62..f9441c45a8 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -285,6 +285,9 @@ strip $HB_BIN_INSTALL/harbour # Keep the size of the libraries to a minimim. strip --strip-debug $HB_LIB_INSTALL/* +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m644 doc/man/*.1* $RPM_BUILD_ROOT%{_mandir}/man1/ + mkdir -p $RPM_BUILD_ROOT/etc/harbour install -m644 source/rtl/gtcrs/hb-charmap.def $RPM_BUILD_ROOT/etc/harbour/hb-charmap.def cat > $RPM_BUILD_ROOT/etc/harbour.cfg <