diff --git a/Makefile.in b/Makefile.in
index 155594d..558096d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
# Makefile for help2man
-# $Id: Makefile.in,v 1.27 2005/10/16 16:15:54 bod Exp $
+# $Id: Makefile.in,v 1.28 2005/10/29 06:50:33 bod Exp $
SHELL = @SHELL@
VPATH = @srcdir@
@@ -32,7 +32,7 @@ MKINSTALLDIRS = $(srcdir)/mkinstalldirs
target = help2man
preload = hacklocaledir
-all: $(target) man info @extra_make_all@
+all: $(target) man info @extra_make_all@
install: all install_base @extra_make_install@
install_base:
@@ -42,11 +42,14 @@ install_base:
$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)
- $(INSTALL_DATA) $(target).1 $(DESTDIR)$(mandir)/man1
- $(INSTALL_DATA) $(target).info $(DESTDIR)$(infodir)/$(target).info
+ $(INSTALL_DATA) $(srcdir)/$(target).1 $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) $(srcdir)/$(target).info \
+ $(DESTDIR)$(infodir)/$(target).info
+
if test -f $(DESTDIR)$(infodir)/dir; \
then \
- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(target).info; \
+ $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) \
+ $(srcdir)/$(target).info; \
fi
install_preload: preload
@@ -57,9 +60,9 @@ install_l10n: man_l10n
do \
$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/$$lang/man1; \
$(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- $(INSTALL_DATA) $(target).$$lang.1 \
- $(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \
- $(INSTALL_DATA) po/$$lang.gmo \
+ $(INSTALL_DATA) $(srcdir)/$(target).$$lang.1 \
+ $(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \
+ $(INSTALL_DATA) $(srcdir)/po/$$lang.gmo \
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(target).mo; \
done
@@ -81,15 +84,15 @@ clean:
-rm -f $(target) $(preload).so
mostlyclean: clean
- rm -f $(target).dvi $(target).aux $(target).cp $(target).cps \
- $(target).fn $(target).ky $(target).log $(target).pg \
- $(target).toc $(target).tp $(target).vr $(srcdir)/po/*.po~
+ cd $(srcdir) && rm -f $(target).dvi $(target).aux $(target).cp \
+ $(target).cps $(target).fn $(target).ky $(target).log \
+ $(target).pg $(target).toc $(target).tp $(target).vr po/*.po~
distclean: mostlyclean
-rm -rf config.cache config.log config.status Makefile autom4te.cache
realclean: distclean
- -rm -f $(target).info $(target).1 $(target).*.1 po/*.gmo
+ cd $(srcdir) && rm -f $(target).info $(target).1 $(target).*.1 po/*.gmo
maintainer-clean: realclean
rm -f configure
diff --git a/README b/README
index fcc62f0..5013a37 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ help2man is a script to create simple man pages from the --help and
--version output of programs.
http://www.gnu.org/software/help2man/
- ftp://ftp.gnu.org/gnu/help2man/help2man-1.36.1.tar.gz
+ ftp://ftp.gnu.org/gnu/help2man/help2man-1.36.2.tar.gz
Since most GNU documentation is now in info format, this provides a
way to generate a placeholder man page pointing to that resource while
diff --git a/debian/changelog b/debian/changelog
index 0d5cffd..454bb3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+help2man (1.36.2) unstable; urgency=low
+
+ * Updated po translation from Jakub Bogusz.
+ * Makefile.in: $(srcdir) fix from Paul Eggert (closes: #335741).
+
+ -- Brendan O'Dea <bod@debian.org> Sat, 29 Oct 2005 16:46:16 +1000
+
help2man (1.36.1) unstable; urgency=low
* Add default territory to --locale option.
diff --git a/help2man.pl.1 b/help2man.pl.1
index 7c20ccb..c72c234 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -116,15 +116,17 @@ w miejscu
Najnowsza wersja tego oprogramowania jest dostępna pod:
ftp://ftp.gnu.org/gnu/help2man/
+.SH AUTOR
+Program napisał Brendan O'Dea <bod@debian.org>
.SH "ZGŁASZANIE BŁĘDÓW"
Błędy proszę zgłaszać na adres <bug\-help2man@gnu.org>.
.SH COPYRIGHT
Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.PP
-Written by Brendan O'Dea <bod@debian.org>
+.br
+Ten program jest darmowy; warunki kopiowania są opisane w źródłach.
+Autorzy nie dają ŻADNYCH gwarancji, w tym również gwarancji PRZYDATNOŚCI
+DO SPRZEDAŻY LUB DO KONKRETNYCH CELÓW.
.SH "ZOBACZ TAKŻE"
Pełna dokumentacja dla programu
.B help2man
diff --git a/help2man.pl.h2m b/help2man.pl.h2m
index ae50316..87d0315 100644
--- a/help2man.pl.h2m
+++ b/help2man.pl.h2m
@@ -1,11 +1,11 @@
Encoding charset: ISO-8859-2
Language: Polish
Locale: pl_PL
-Translator: Jakub Bogusz <qboosh@pld.org.pl>
+Translator: Jakub Bogusz <qboosh@pld-linux.org>
Include file for Polish help2man man page
-$Id: help2man.pl.h2m,v 1.1 2003/07/17 14:52:39 bod Exp $
+$Id: help2man.pl.h2m,v 1.2 2005/10/29 06:50:33 bod Exp $
[nazwa]
help2man \- generowanie prostej strony podręcznika
diff --git a/po/help2man.pot b/po/help2man.pot
index 0346c64..69cd98d 100644
--- a/po/help2man.pot
+++ b/po/help2man.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 02:18+1000\n"
+"POT-Creation-Date: 2005-10-29 16:48+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index 5d2c015..544a81b 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 9c6171e..701f0cf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,14 +1,14 @@
# Polish translation for help2man.
-# Copyright (C) 2003, 2004 Free Software Foundation
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation
# This file is distributed under the same license as the help2man package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2004.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2005.
#
msgid ""
msgstr ""
-"Project-Id-Version: help2man 1.34.1\n"
+"Project-Id-Version: help2man 1.36.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-17 01:08+1000\n"
-"PO-Revision-Date: 2004-11-21 21:51+1000\n"
+"PO-Revision-Date: 2005-10-19 19:40+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: help2man:66
-#, fuzzy, perl-format
+#, perl-format
msgid ""
"GNU %s %s\n"
"\n"
@@ -29,8 +29,8 @@ msgid ""
msgstr ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software\n"
-"Foundation, Inc.\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free\n"
+"Software Foundation, Inc.\n"
"Ten program jest darmowy; warunki kopiowania są opisane w źródłach.\n"
"Autorzy nie dają ŻADNYCH gwarancji, w tym również gwarancji PRZYDATNOŚCI\n"
"DO SPRZEDAŻY LUB DO KONKRETNYCH CELÓW.\n"