From 2884f67c0d20476e3e88c625b4921e27becbf282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 2 Jan 2017 13:39:32 +0100 Subject: Move help html dir into xtrkcad-common; add patch to find them --- debian/NEWS.Debian | 3 ++- debian/changelog | 11 +++++------ debian/patches/0705-help_path.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + debian/xtrkcad-common.doc-base | 7 +++++++ debian/xtrkcad-common.install | 3 ++- debian/xtrkcad.doc-base | 7 ------- debian/xtrkcad.install | 1 - 8 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 debian/patches/0705-help_path.patch create mode 100644 debian/xtrkcad-common.doc-base delete mode 100644 debian/xtrkcad.doc-base diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index 4cc37dd..2ff6643 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,6 +1,7 @@ xtrkcad (1:4.2.4a-1) unstable; urgency=medium With this release xtrkcad are spilt into two packages. - The new xtrkcad-common contains the dems, examples und the params directories. + The new xtrkcad-common contains the demos, examples and the params + directories. It also include the html documentation. -- Jörg Frings-Fürst Mon, 02 Jan 2017 06:58:26 +0100 diff --git a/debian/changelog b/debian/changelog index 70a795a..910032d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ xtrkcad (1:4.2.4a-1) unstable; urgency=medium - [ Team Upload ] * New Maintainer (Closes: #849139): - debian/control: Add myself as maintainer. - debian/copyright: Add myself to debian/*. @@ -18,7 +17,8 @@ xtrkcad (1:4.2.4a-1) unstable; urgency=medium - Change Priority from extra to optional to match with current ftp-master override file. - Rewrite package description. - - Remove not used Build-Depends. + - Remove not longer used libglib2.0-dev, libx11-dev, netpbm, imagemagick + and libcairo2-dev from Build-Depends. * debian/rules: - Enable hardening. - Remove now unused parameter from dh_auto_configure. @@ -29,10 +29,6 @@ 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 documentation 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. * Split package into arch-indep and arch-dep packages: - New package xtrkcad-common for the arch-indep files. + Add section for xtrkcad-common into debian/control. @@ -40,6 +36,9 @@ xtrkcad (1:4.2.4a-1) unstable; urgency=medium + Rewrite debian/xtrkcad.install. + Remove now useless override_dh_install for debian/rules. + New debian/NEWS.debian. + + New debian/xtrkcat-common.doc-base. + + New debian/patches/0705-help_path.patch: + - Change help html directory to the installation specific. * Remove useless debian/docs. -- Jörg Frings-Fürst Mon, 02 Jan 2017 06:58:26 +0100 diff --git a/debian/patches/0705-help_path.patch b/debian/patches/0705-help_path.patch new file mode 100644 index 0000000..ac5e463 --- /dev/null +++ b/debian/patches/0705-help_path.patch @@ -0,0 +1,25 @@ +Description: Change help html directory to the installation specific +Author: Jörg Frings-Fürst +Forwarded: not-needed +Last-Update: 2017-01-02 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/app/wlib/gtklib/gtkhelp.c +=================================================================== +--- trunk.orig/app/wlib/gtklib/gtkhelp.c ++++ trunk/app/wlib/gtklib/gtkhelp.c +@@ -677,8 +677,12 @@ EXPORT void wHelp( const char * topic ) + directory = malloc( BUFSIZ ); + assert( directory != NULL ); + +- sprintf( directory, "%s/html/", wGetAppLibDir()); +- ++/* sprintf( directory, "%s/html/", wGetAppLibDir());*/ ++/* ++ * Change path for debian installation ++ * ++ */ ++ sprintf( directory, "%s/html/", "/usr/share/doc/xtrkcad-common"); + wHelpWindow = CreateHelpWindow(); + /* load the default content */ + load_into_view ("index.html", MAIN_VIEW); diff --git a/debian/patches/series b/debian/patches/series index c7cc441..aa10a1c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0900-spelling-errors.patch 0700-info_file.patch 0100-gtk.patch +0705-help_path.patch diff --git a/debian/xtrkcad-common.doc-base b/debian/xtrkcad-common.doc-base new file mode 100644 index 0000000..a2fe4cc --- /dev/null +++ b/debian/xtrkcad-common.doc-base @@ -0,0 +1,7 @@ +Document: xtrkcad +Title: xtrkcad Documentation +Section: Editors + +Format: HTML +Index: /usr/share/doc/xtrkcad-common/html/index.html +Files: /usr/share/doc/xtrkcad-common/html/*.html diff --git a/debian/xtrkcad-common.install b/debian/xtrkcad-common.install index cc2b369..4d5fb92 100644 --- a/debian/xtrkcad-common.install +++ b/debian/xtrkcad-common.install @@ -2,4 +2,5 @@ usr/share/xtrkcad/demos/* usr/share/xtrkcad/demos usr/share/xtrkcad/examples/* usr/share/xtrkcad/examples usr/share/xtrkcad/params/* usr/share/xtrkcad/params usr/share/xtrkcad/xtrkcad.tip usr/share/xtrkcad -usr/share/xtrkcad/xtrkcad.xtq usr/share/xtrkcad \ No newline at end of file +usr/share/xtrkcad/xtrkcad.xtq usr/share/xtrkcad +usr/share/xtrkcad/html/* usr/share/doc/xtrkcad-common/html diff --git a/debian/xtrkcad.doc-base b/debian/xtrkcad.doc-base deleted file mode 100644 index 196ec18..0000000 --- a/debian/xtrkcad.doc-base +++ /dev/null @@ -1,7 +0,0 @@ -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 d1d5887..fd092b8 100644 --- a/debian/xtrkcad.install +++ b/debian/xtrkcad.install @@ -1,5 +1,4 @@ debian/xtrkcad.desktop usr/share/applications -usr/share/xtrkcad/html/* usr/share/doc/xtrkcad/html usr/share/xtrkcad/Readme.txt usr/share/doc/xtrkcad usr/share/xtrkcad/logo.bmp usr/share/doc/xtrkcad usr/bin/* -- cgit v1.2.3