From d2eae2c93df7eeea0aa48e8649571fe9f68e0751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Mon, 25 Nov 2019 00:07:49 +0000 Subject: [PATCH 1/3] From nautilus (3.20.3-1)it was added debian/docs to explicitly install AUTHORS, NEWS, and THANKS but no AUTHORS nor THANKS file exists. --- helpers/make-nautilus | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helpers/make-nautilus b/helpers/make-nautilus index 93a3cab..65b54b3 100644 --- a/helpers/make-nautilus +++ b/helpers/make-nautilus @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2 +VERSION=3 . ./config for patch in 16_unity_new_documents.patch; do @@ -25,6 +25,9 @@ for patch in 16_unity_new_documents.patch; do sed "/$patch/d" -i debian/patches/series done +sed -i '/^AUTHORS/d' debian/docs +sed -i '/^THANKS/d' debian/docs + changelog "Revert from using ubuntu-help to default gnome-help" compile From 3f95738a27a594cce8b0e73e6298c9381c618ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Mon, 2 Dec 2019 08:48:03 +0000 Subject: [PATCH 2/3] Avoid hardcoding names on helper --- helpers/make-nautilus | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/helpers/make-nautilus b/helpers/make-nautilus index 65b54b3..a02e253 100644 --- a/helpers/make-nautilus +++ b/helpers/make-nautilus @@ -25,8 +25,19 @@ for patch in 16_unity_new_documents.patch; do sed "/$patch/d" -i debian/patches/series done -sed -i '/^AUTHORS/d' debian/docs -sed -i '/^THANKS/d' debian/docs +check_file() { +if [ ! -f $1 ]; then + echo " $1 doesn't exist removing from debian/docs" + sed -i "/^$1/d" debian/docs +fi +} + +echo "Checking for necessary files to install by debian/docs." +while read i +do + check_file $i +done < debian/docs + changelog "Revert from using ubuntu-help to default gnome-help" compile From f4d48c7297f80e496d1b075775c3097f6075b131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Mon, 2 Dec 2019 22:43:00 +0000 Subject: [PATCH 3/3] Update make-nautilus avoid read/delete on the same file --- helpers/make-nautilus | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/helpers/make-nautilus b/helpers/make-nautilus index a02e253..0c02396 100644 --- a/helpers/make-nautilus +++ b/helpers/make-nautilus @@ -25,19 +25,16 @@ for patch in 16_unity_new_documents.patch; do sed "/$patch/d" -i debian/patches/series done -check_file() { -if [ ! -f $1 ]; then - echo " $1 doesn't exist removing from debian/docs" - sed -i "/^$1/d" debian/docs -fi -} - echo "Checking for necessary files to install by debian/docs." while read i do - check_file $i + if [ -f $i ]; then + echo $i >> debian/docs.new + fi done < debian/docs +mv debian/docs.new debian/docs +cat debian/docs changelog "Revert from using ubuntu-help to default gnome-help" compile