From e28a6e1690813db371aa731ffdee45f2aa1feca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 30 Dec 2016 16:55:20 +0100 Subject: Move the documention to /usr/share/doc/xtrkcad --- debian/changelog | 4 ++++ debian/copyright | 12 ++++++------ debian/rules | 5 ++++- debian/xtrkcad.doc-base | 7 +++++++ debian/xtrkcad.install | 5 ++++- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 debian/xtrkcad.doc-base diff --git a/debian/changelog b/debian/changelog index c560766..1723f72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,10 @@ xtrkcad (1:4.2.4a-1) unstable; urgency=medium * Rewrite debian/watch to use the sf redirector. - Add files to exclude in debian/copyright. * Rewrite debian/copyright. + * Move the documention to /usr/share/doc/xtrkcad: + - debian/xtrkcad.install: add the new place to install. + - debian/rules: Remove the documentation from /usr/share/xtrkcad. + - New debian/xtrkcat.doc-base. -- Jörg Frings-Fürst Fri, 30 Dec 2016 13:31:38 +0100 diff --git a/debian/copyright b/debian/copyright index 02d7593..a5a715f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -30,7 +30,7 @@ License: GPL-2+ Files: app/help/readpng.* Copyright: 1998-1999 Greg Roelofs -License: BSD-like with advertising clause +License: BSD-like-with-advertising-clause Files: app/i18n/pt_BR.po Copyright: 2009 Daniel Spagnol @@ -40,14 +40,14 @@ Files: app/lib/params/protosteam.xtp Copyright: 2012 Serdar Soysal License: GPL-2+ -Files: app/tools/halibut/charset/macenc.c -Copyright: 2008 Ben Harris -License: Expat - Files: app/tools/halibut/* Copyright: 1999-2007 Simon Tatham License: Expat +Files: app/tools/halibut/charset/macenc.c +Copyright: 2008 Ben Harris +License: Expat + Files: app/tools/addcrlf.c app/tools/listxtp.c Copyright: 2006-2009 Marin Fischer @@ -202,7 +202,7 @@ License: Expat TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -License: BSD-like with advertising clause +License: BSD-like-with-advertising-clause This software is provided "as is," without warranty of any kind, express or implied. In no event shall the author or contributors be held liable for any damages arising in any way from the use of diff --git a/debian/rules b/debian/rules index 8aea7dc..4ddb741 100755 --- a/debian/rules +++ b/debian/rules @@ -17,4 +17,7 @@ override_dh_auto_configure: override_dh_install: dh_install - rm -f debian/xtrkcad/usr/share/xtrkcad/COPYING + rm -fr $(CURDIR)/debian/xtrkcad/usr/share/xtrkcad/html + rm -f $(CURDIR)/debian/xtrkcad/usr/share/xtrkcad/Readme.txt + rm -f $(CURDIR)/debian/xtrkcad/usr/share/xtrkcad/logo.bmp + rm -f $(CURDIR)/debian/xtrkcad/usr/share/xtrkcad/COPYING diff --git a/debian/xtrkcad.doc-base b/debian/xtrkcad.doc-base new file mode 100644 index 0000000..196ec18 --- /dev/null +++ b/debian/xtrkcad.doc-base @@ -0,0 +1,7 @@ +Document: xtrkcad +Title: xtrkcad Documentation +Section: Editors + +Format: HTML +Index: /usr/share/doc/xtrkcad/html/index.html +Files: /usr/share/doc/xtrkcad/html/*.html diff --git a/debian/xtrkcad.install b/debian/xtrkcad.install index 4ab189b..e338dd9 100644 --- a/debian/xtrkcad.install +++ b/debian/xtrkcad.install @@ -1 +1,4 @@ -debian/xtrkcad.desktop usr/share/applications +debian/xtrkcad.desktop usr/share/applications +debian/xtrkcad/usr/share/xtrkcad/html/* usr/share/doc/xtrkcad/html +debian/xtrkcad/usr/share/xtrkcad/Readme.txt usr/share/doc/xtrkcad +debian/xtrkcad/usr/share/xtrkcad/logo.bmp usr/share/doc/xtrkcad -- cgit v1.2.3