From 9f4cb975125d9bdf2ecf36b98be884ccb3ee0c89 Mon Sep 17 00:00:00 2001 From: Sam Manzi Date: Fri, 28 Oct 2016 08:08:40 +1100 Subject: [PATCH] Fixes for install after removal of old LICENSE --- MANIFEST.in | 1 - debian/rules | 5 ++--- setup.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index f6ed25526..081e82f94 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,7 +3,6 @@ include COPYING include FAQ include Gramps.py include INSTALL -include LICENSE include MANIFEST.in include NEWS include RELEASE_NOTES diff --git a/debian/rules b/debian/rules index 4f38c19ac..a9e7539e6 100755 --- a/debian/rules +++ b/debian/rules @@ -18,12 +18,11 @@ override_dh_auto_build: override_dh_auto_install: #dh_auto_install python3 setup.py install --resourcepath=/usr/share --root=debian/python3-gramps --install-layout=deb - # Remove duplicate copyright information + # Remove duplicate license/copyright information rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/COPYING # Remove install file as it is not needed by package users rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/INSTALL - # Remove duplicate license information - rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/LICENSE + # Link license/copyright information to debians ln -s /usr/share/common-licenses/GPL-2 $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/COPYING # Make css style sheets and png icons non-executable diff --git a/setup.py b/setup.py index 8e5c56550..c853d863c 100755 --- a/setup.py +++ b/setup.py @@ -414,8 +414,8 @@ package_data = package_data_core + package_data_gui #------------------------------------------------------------------------- data_files_core = [('share/mime-info', ['data/gramps.mime']), ('share/icons', ['images/gramps.png'])] -DOC_FILES = ['AUTHORS', 'COPYING', 'FAQ', 'INSTALL', 'LICENSE', 'NEWS', - 'README.md', 'TODO'] +DOC_FILES = ['AUTHORS', 'COPYING', 'FAQ', 'INSTALL', 'NEWS', 'README.md', + 'TODO'] GEDCOM_FILES = glob.glob(os.path.join('example', 'gedcom', '*.*')) GRAMPS_FILES = glob.glob(os.path.join('example', 'gramps', '*.*')) IMAGE_WEB = glob.glob(os.path.join('images', 'webstuff', '*.png'))