From 296f19575d7de9cecd5f12c63af03835c4353fec Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Sun, 12 Jun 2011 03:10:28 +0200 Subject: [PATCH] Add extra patch for Drop installation of localized manpages from upstream Makefile. This patch adds the ebdefd9601c017c5a7264a94cee2c7af914bca76 commit as an extra patch to the patch series. --- debian/patches/28_remove_localized_manpages.patch | 33 +++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 debian/patches/28_remove_localized_manpages.patch diff --git a/debian/patches/28_remove_localized_manpages.patch b/debian/patches/28_remove_localized_manpages.patch new file mode 100644 index 0000000..5143027 --- /dev/null +++ b/debian/patches/28_remove_localized_manpages.patch @@ -0,0 +1,33 @@ +commit ebdefd9601c017c5a7264a94cee2c7af914bca76 +Author: Michael Prokop +Date: Wed Jun 8 10:19:29 2011 +0200 + + Drop installation of localized manpages from upstream Makefile. + + Upstream's Makefile currently results in: + + E: live-boot: manpage-in-wrong-directory usr/share/man/en/man/live-boot.7..gz + E: live-boot: manpage-in-wrong-directory usr/share/man/en/man/live-snapshot.1..gz + + So lets drop the localized manpages and just install the english ones. + +diff --git a/Makefile b/Makefile +index 4e579a3..46de269 100644 +--- a/Makefile ++++ b/Makefile +@@ -66,15 +66,6 @@ install: + install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \ + done + +- for LANGUAGE in $(LANGUAGES); \ +- do \ +- for MANPAGE in manpages/$${LANGUAGE}/*; \ +- do \ +- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \ +- install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \ +- done; \ +- done +- + uninstall: + # Uninstalling executables + rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile diff --git a/debian/patches/series b/debian/patches/series index 44f3ef1..0e54294 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ 25_support_lvm_for_live-media.patch 26_support_dns_bootoption.patch 27_support_static_ip.patch +28_remove_localized_manpages.patch -- 2.1.4