From b0af48774ebb46a1579f79401bd820fda923837f Mon Sep 17 00:00:00 2001 From: Fredrik Rinnestam Date: Sun, 26 Jul 2015 16:49:26 +0200 Subject: [PATCH] lilo: actually move man-pages to the right place proper --- lilo/.footprint | 16 ++++++++-------- lilo/.md5sum | 2 +- lilo/Pkgfile | 4 +--- lilo/lilo-config.patch | 14 +++----------- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/lilo/.footprint b/lilo/.footprint index b3891141..3fc06e92 100644 --- a/lilo/.footprint +++ b/lilo/.footprint @@ -3,15 +3,15 @@ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/lilo.conf drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/lilo -drwxr-xr-x root/root share/ -drwxr-xr-x root/root share/man/ -drwxr-xr-x root/root share/man/man5/ --rw-r--r-- root/root share/man/man5/lilo.conf.5.gz -drwxr-xr-x root/root share/man/man8/ --rw-r--r-- root/root share/man/man8/keytab-lilo.8.gz --rw-r--r-- root/root share/man/man8/lilo-uuid-diskid.8.gz --rw-r--r-- root/root share/man/man8/lilo.8.gz drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/keytab-lilo -rwxr-xr-x root/root usr/sbin/lilo-uuid-diskid +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man5/ +-rw-r--r-- root/root usr/share/man/man5/lilo.conf.5.gz +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/keytab-lilo.8.gz +-rw-r--r-- root/root usr/share/man/man8/lilo-uuid-diskid.8.gz +-rw-r--r-- root/root usr/share/man/man8/lilo.8.gz diff --git a/lilo/.md5sum b/lilo/.md5sum index 95c153ba..390b1a14 100644 --- a/lilo/.md5sum +++ b/lilo/.md5sum @@ -1,3 +1,3 @@ 66573ba8629209da694131efbe20c5de lilo-24.1.tar.gz -875e43154f21b03f21c375a75863cbf8 lilo-config.patch +d433c968c3cd98d2fbe8947f1e34ffb9 lilo-config.patch 33ffc1bb0b8ff0b67236cd074f14fcf9 lilo.conf diff --git a/lilo/Pkgfile b/lilo/Pkgfile index f333804f..0b38ff95 100644 --- a/lilo/Pkgfile +++ b/lilo/Pkgfile @@ -5,7 +5,7 @@ name=lilo version=24.1 -release=2 +release=3 source=(http://lilo.alioth.debian.org/ftp/sources/$name-$version.tar.gz \ $name-config.patch lilo.conf) @@ -15,6 +15,4 @@ build() { make all make DESTDIR=$PKG install install -m 644 $SRC/lilo.conf $PKG/etc - mkdir -p $PKG/share - mv $PKG/usr/man $PKG/share/man } diff --git a/lilo/lilo-config.patch b/lilo/lilo-config.patch index 4f814a2b..d22b8fdb 100644 --- a/lilo/lilo-config.patch +++ b/lilo/lilo-config.patch @@ -31,9 +31,9 @@ diff -Nru lilo-24.1.orig/Makefile lilo-24.1/Makefile tidy: $(MAKE) -C src tidy diff -Nru lilo-24.1.orig/make.vars lilo-24.1/make.vars ---- lilo-24.1.orig/make.vars 2014-10-19 09:31:10.868573065 +0200 -+++ lilo-24.1/make.vars 2014-10-19 09:31:38.537607503 +0200 -@@ -70,14 +70,14 @@ +--- lilo-24.1.orig/make.vars 2015-07-26 16:42:59.144497363 +0200 ++++ lilo-24.1/make.vars 2015-07-26 16:43:49.518277641 +0200 +@@ -70,7 +70,7 @@ # XL_SECS=n Support for extra large (non-standard) floppies. CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ @@ -42,14 +42,6 @@ diff -Nru lilo-24.1.orig/make.vars lilo-24.1/make.vars -DMDPRAID -DDEVMAPPER # set the following if you wish LILO.COM to be installed - DOS_DIR=/dosC/boot - - # select place for man pages --MAN_DIR=/usr/share/man -+MAN_DIR=/usr/man - - # set the compiler optimization level - OPT=-Os diff -Nru lilo-24.1.orig/man/Makefile lilo-24.1/man/Makefile --- lilo-24.1.orig/man/Makefile 2014-10-19 09:31:10.868573065 +0200 +++ lilo-24.1/man/Makefile 2014-10-19 09:31:38.537607503 +0200