From 897e8a0b7ad722cb62fd42f9b993d2c7539acb5a Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 29 Aug 2013 10:19:46 -0300 Subject: [PATCH] Bug 10802: Packages should install history.txt Content-Type: text/plain; charset="utf-8" While bug 8911 fixed a problem regarding history.txt, a proper fix for packages was missing. This patch does three things: - Adds docs/history.txt to debian/koha-common.docs so it gets installed. - Moves the line installing the release notes from debian/koha-common.install to debian/koha-common.docs. - Adds an override_dh_compress entry in debian/rules that excludes history.txt from the dh_compress routine [1] To test: - Take a picture of how /usr/share/doc/koha-common looks. - Apply the patch and build a package [2]. - Upgrade and/or install using your package. - Look for the contents of the /usr/share/doc/koha-common, it should look the same, but history.txt must be there. - More > About Koha > Koha Timeline should show the history lines. Regards To+ [1] As 'man dh_compress' says, it is needed as every file considered for the doc dir that is plain text and is more than 4k size will be gzipped unless stated otherwise. We need it uncompressed for about.pl. [2] I did it for you, it can be grabbed here: http://ubuntu.unc.edu.ar/koha/koha-common_3.13-1~git+20130829144510.18a6876b_all.deb Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Chris Cormack Signed-off-by: Mason James --- debian/koha-common.docs | 2 ++ debian/koha-common.install | 1 - debian/rules | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/koha-common.docs b/debian/koha-common.docs index 06575bd..6106c24 100644 --- a/debian/koha-common.docs +++ b/debian/koha-common.docs @@ -1 +1,3 @@ debian/docs/LEEME.Debian +misc/release_notes/release_notes_3*.txt +docs/history.txt diff --git a/debian/koha-common.install b/debian/koha-common.install index 810aadc..e215bde 100644 --- a/debian/koha-common.install +++ b/debian/koha-common.install @@ -1,4 +1,3 @@ -misc/release_notes/release_notes_3*.txt usr/share/doc/koha-common debian/tmp/usr/* usr debian/tmp/etc/koha/searchengine debian/tmp/etc/koha/pazpar2 diff --git a/debian/rules b/debian/rules index cbcfaaf..2073ad2 100755 --- a/debian/rules +++ b/debian/rules @@ -103,3 +103,7 @@ override_dh_auto_install: xsltproc --output $(TMP)/debian/tmp_docbook/ \ /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \ debian/docs/*.xml + +override_dh_compress: + # exclude history.txt from compression as about.pl needs it uncompressed + dh_compress --exclude=history.txt -- 1.7.10.4