From 25334892e33a30e0498269592600c281c79c6473 Mon Sep 17 00:00:00 2001 From: Peter O'Connor Date: Tue, 21 Mar 2017 16:38:36 +1100 Subject: [PATCH] Misc packaging fixes - format example yml to current standards - remove Makefile.toplevel as it shouldn't be in the folder --- packaging/building-a-package/en.md | 2 +- packaging/package.yml/en.md | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packaging/building-a-package/en.md b/packaging/building-a-package/en.md index 70f5b86..490004f 100644 --- a/packaging/building-a-package/en.md +++ b/packaging/building-a-package/en.md @@ -62,8 +62,8 @@ Your folder should look something similar to this: | common/ | your-package/ | - Makefile +| Makefile | Makefile.common -| Makefile.toplevel | Makefile.iso ``` diff --git a/packaging/package.yml/en.md b/packaging/package.yml/en.md index 91ea69e..b2884fb 100644 --- a/packaging/package.yml/en.md +++ b/packaging/package.yml/en.md @@ -16,17 +16,16 @@ with a predefined environment. An example file follows: ``` yaml -name : nano -version : 2.5.1 -release : 39 -source : +name : nano +version : 2.5.1 +release : 39 +source : - http://www.nano-editor.org/dist/v2.5/nano-2.5.1.tar.gz : e06fca01bf183f4d531aa65a28dffc0e2d10185239909eb3de797023f3453bde -license : - - GPL-3.0 -component : editor -summary : Small, friendly text editor inspired by Pico -description : | - GNU nano is an easy-to-use text editor originally designed as a replacement for +license : GPL-3.0 +component : editor +summary : Small, friendly text editor inspired by Pico +description: | + GNU nano is an easy-to-use text editor originally designed as a replacement for Pico, the ncurses-based editor from the non-free mailer package Pine. setup : | %configure --enable-utf8 --docdir=/usr/share/doc/nano