diff options
| -rw-r--r-- | app-arch/dpkg/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/dpkg/files/dpkg-1.14.25-start-stop-daemon.8.patch | 45 |
2 files changed, 42 insertions, 11 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog index 80f92819bca0..7199e5ed58ed 100644 --- a/app-arch/dpkg/ChangeLog +++ b/app-arch/dpkg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-arch/dpkg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.86 2009/05/04 16:06:05 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.87 2009/05/04 16:34:30 yvasilev Exp $ + + 04 May 2009; <yvasilev@gentoo.org> + files/dpkg-1.14.25-start-stop-daemon.8.patch: + Replaced dpkg-1.14.25-start-stop-daemon.8.patch to handle nls and install + man pages when --without-start-stop-daemon is not passed to ./configure. + Fixes bug #268298. 04 May 2009; Jeroen Roovers <jer@gentoo.org> dpkg-1.14.25.ebuild, dpkg-1.14.26.ebuild, dpkg-1.15.0.ebuild: diff --git a/app-arch/dpkg/files/dpkg-1.14.25-start-stop-daemon.8.patch b/app-arch/dpkg/files/dpkg-1.14.25-start-stop-daemon.8.patch index d6b727c859d9..3f6f20567988 100644 --- a/app-arch/dpkg/files/dpkg-1.14.25-start-stop-daemon.8.patch +++ b/app-arch/dpkg/files/dpkg-1.14.25-start-stop-daemon.8.patch @@ -1,17 +1,42 @@ ---- dpkg-1.14.25/man/Makefile.am.orig 2009-02-01 07:18:59.000000000 +0100 -+++ dpkg-1.14.25/man/Makefile.am 2009-05-04 17:02:32.000000000 +0200 -@@ -100,9 +100,13 @@ - dselect.1 \ - dselect.cfg.5 \ - install-info.8 \ -- start-stop-daemon.8 \ +--- dpkg-1.15.0.orig/man/Makefile.am 2009-05-04 15:03:33.000000000 +0000 ++++ dpkg-1.15.0/man/Makefile.am 2009-05-04 15:37:47.000000000 +0000 +@@ -37,7 +37,7 @@ install-data-local-yes: + $(MAKE) install-man \ + mandir="$(mandir)/$$lang" \ + man_MANS="" \ +- dist_man_MANS="$$files"; \ ++ manfiles="$$files"; \ + fi \ + done + +@@ -51,7 +51,7 @@ uninstall-local-yes: + $(MAKE) uninstall-man \ + mandir="$(mandir)/$$lang" \ + man_MANS="" \ +- dist_man_MANS="$$files"; \ ++ manfiles="$$files"; \ + fi \ + done + +@@ -64,7 +64,7 @@ dist-hook: man.stamp + cp -r $(srcdir)/$$lang $(distdir)/; \ + done + +-dist_man_MANS = \ ++manfiles = \ + 822-date.1 \ + deb-control.5 \ + deb-version.5 \ +@@ -102,6 +102,12 @@ dist_man_MANS = \ + start-stop-daemon.8 \ update-alternatives.8 +if WITH_START_STOP_DAEMON -+dist_man_MANS = \ -+ start-stop-daemon.8 ++ dist_man_MANS = $(manfiles) ++else ++ dist_man_MANS = $(filter-out %start-stop-daemon.8,$(manfiles)) +endif + EXTRA_DIST = \ + po/ChangeLog \ po/po4a.cfg \ - po/dpkg-man.pot |