Date: Tuesday, January 12, 2021 @ 22:46:09 Author: jlichtblau Revision: 820310
archrelease: copy trunk to community-x86_64 Added: viking/repos/community-x86_64/PKGBUILD (from rev 820309, viking/trunk/PKGBUILD) viking/repos/community-x86_64/viking.changelog (from rev 820309, viking/trunk/viking.changelog) viking/repos/community-x86_64/yelp-tools.patch (from rev 820309, viking/trunk/yelp-tools.patch) Deleted: viking/repos/community-x86_64/PKGBUILD viking/repos/community-x86_64/viking.changelog viking/repos/community-x86_64/yelp-tools.patch ------------------+ PKGBUILD | 112 +++++++++--------- viking.changelog | 119 ++++++++++--------- yelp-tools.patch | 320 ++++++++++++++++++++++++++--------------------------- 3 files changed, 277 insertions(+), 274 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-01-12 22:45:50 UTC (rev 820309) +++ PKGBUILD 2021-01-12 22:46:09 UTC (rev 820310) @@ -1,56 +0,0 @@ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: Nick Østergaard <oe.n...@gmail.com> -# Contributor: Jonny Gerold <jo...@fsk141.com> - -pkgname=viking -pkgver=1.8 -pkgrel=5 -pkgdesc="GTK+2 application to manage GPS data" -arch=('x86_64') -url="https://sourceforge.net/projects/viking/" -license=('GPL2') -depends=('curl' 'file' 'gpsd' 'gtk2' 'libgexiv2' 'mapnik' 'geoclue' 'liboauth' 'libzip') -makedepends=('boost' 'gtk-doc' 'intltool' 'yelp-tools') -optdepends=('gpsbabel: import and export GPS tracks from various formats') -options=('!emptydirs') -changelog=$pkgname.changelog -source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - viking-geoclue_layer.xml::https://raw.githubusercontent.com/viking-gps/viking/6f7b180ebefe2e2d45b2e4d6343d04581216adeb/help/C/geoclue_layer.xml - yelp-tools.patch - viking-gcc10.patch::"https://github.com/viking-gps/viking/commit/7883ec0d.patch") -sha256sums=('855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8' - 'fdcc6caca271cd1b63369a6874d23c5902e1ba6d829c1c3e65c06872189ddc07' - 'bbacf06a9e3cf1a16ab5a9da343e18dcb4fadf1f338295da68fe428dc75e429c' - '57a3b4bb2958d1790865ec13792b4a86dacc85872b16670ee51e7388aecf53d1') - -prepare() { - cd "${srcdir}"/$pkgname-$pkgver - - # Remove Mapbox-Outdoors map, it doesn't work without an access token - sed -i '/maps_layer_register_map_source (mapbox_type);/d' src/osm.c - - # Don't use deprecated gnome-doc-utils - # https://github.com/viking-gps/viking/pull/83 - mv ../viking-geoclue_layer.xml help/C/geoclue_layer.xml - sed -i 's/ghelp:/help:/g' help/*/*.xml src/vikwindow.c - mv help/C/{viking.xml,index.docbook} - patch -Np1 -i ../yelp-tools.patch - autoreconf -fi - intltoolize --force - - patch -p1 -i ../viking-gcc10.patch # Fix build with GCC 10 -} - -build() { - cd "${srcdir}"/$pkgname-$pkgver - - export CXXFLAGS="$CXXFLAGS -I/usr/include/mapnik" - ./configure --prefix=/usr --enable-geocaches - make -} - -package(){ - cd "${srcdir}"/$pkgname-$pkgver - - make DESTDIR="${pkgdir}" install -} Copied: viking/repos/community-x86_64/PKGBUILD (from rev 820309, viking/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-01-12 22:46:09 UTC (rev 820310) @@ -0,0 +1,56 @@ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Nick Østergaard <oe.n...@gmail.com> +# Contributor: Jonny Gerold <jo...@fsk141.com> + +pkgname=viking +pkgver=1.8 +pkgrel=6 +pkgdesc="GTK+2 application to manage GPS data" +arch=('x86_64') +url="https://sourceforge.net/projects/viking/" +license=('GPL2') +depends=('curl' 'file' 'gpsd' 'gtk2' 'libgexiv2' 'mapnik' 'geoclue' 'liboauth' 'libzip') +makedepends=('boost' 'gtk-doc' 'intltool' 'yelp-tools') +optdepends=('gpsbabel: import and export GPS tracks from various formats') +options=('!emptydirs') +changelog=$pkgname.changelog +source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + viking-geoclue_layer.xml::https://raw.githubusercontent.com/viking-gps/viking/6f7b180ebefe2e2d45b2e4d6343d04581216adeb/help/C/geoclue_layer.xml + yelp-tools.patch + viking-gcc10.patch::"https://github.com/viking-gps/viking/commit/7883ec0d.patch") +sha256sums=('855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8' + 'fdcc6caca271cd1b63369a6874d23c5902e1ba6d829c1c3e65c06872189ddc07' + 'bbacf06a9e3cf1a16ab5a9da343e18dcb4fadf1f338295da68fe428dc75e429c' + '57a3b4bb2958d1790865ec13792b4a86dacc85872b16670ee51e7388aecf53d1') + +prepare() { + cd "${srcdir}"/$pkgname-$pkgver + + # Remove Mapbox-Outdoors map, it doesn't work without an access token + sed -i '/maps_layer_register_map_source (mapbox_type);/d' src/osm.c + + # Don't use deprecated gnome-doc-utils + # https://github.com/viking-gps/viking/pull/83 + mv ../viking-geoclue_layer.xml help/C/geoclue_layer.xml + sed -i 's/ghelp:/help:/g' help/*/*.xml src/vikwindow.c + mv help/C/{viking.xml,index.docbook} + patch -Np1 -i ../yelp-tools.patch + autoreconf -fi + intltoolize --force + + patch -p1 -i ../viking-gcc10.patch # Fix build with GCC 10 +} + +build() { + cd "${srcdir}"/$pkgname-$pkgver + + export CXXFLAGS="$CXXFLAGS -I/usr/include/mapnik" + ./configure --prefix=/usr --enable-geocaches + make +} + +package(){ + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install +} Deleted: viking.changelog =================================================================== --- viking.changelog 2021-01-12 22:45:50 UTC (rev 820309) +++ viking.changelog 2021-01-12 22:46:09 UTC (rev 820310) @@ -1,58 +0,0 @@ -2020-02-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.8-1 - -2019-07-01 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.7-1 - -2018-10-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.6.2-7 gpsd 3.18 rebuild - -2016-04-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.6.2-3 pacman hooks rebuild - -2015-12-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.6.2-1 - -2015-11-25 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.6.1-1 - -2015-05-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.6-3 - * gpsd 3.14 rebuild - -2015-04-26 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.6-2 - * boost rebuild - -2015-03-31 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.6-1 - -2014-09-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.5.1-1 - -2014-02-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.5-1 - -2013-09-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.4.2-1 - -2013-05-18 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.4.1-1 - -2013-02-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.4-1 - -2012-10-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.3.2.1-1 - -2012-05-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.3.0-1 - -2011-11-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.2.2-1 - -2011-08-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.2.1-1 - -2011-06-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> - * viking 1.2-1 Copied: viking/repos/community-x86_64/viking.changelog (from rev 820309, viking/trunk/viking.changelog) =================================================================== --- viking.changelog (rev 0) +++ viking.changelog 2021-01-12 22:46:09 UTC (rev 820310) @@ -0,0 +1,61 @@ +2021-01-10 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.8-6 - mapnik 3.1.0 rebuild + +2020-02-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.8-1 + +2019-07-01 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.7-1 + +2018-10-09 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6.2-7 gpsd 3.18 rebuild + +2016-04-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6.2-3 pacman hooks rebuild + +2015-12-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6.2-1 + +2015-11-25 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6.1-1 + +2015-05-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6-3 + * gpsd 3.14 rebuild + +2015-04-26 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6-2 + * boost rebuild + +2015-03-31 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6-1 + +2014-09-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.5.1-1 + +2014-02-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.5-1 + +2013-09-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.4.2-1 + +2013-05-18 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.4.1-1 + +2013-02-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.4-1 + +2012-10-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.3.2.1-1 + +2012-05-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.3.0-1 + +2011-11-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.2.2-1 + +2011-08-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.2.1-1 + +2011-06-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.2-1 Deleted: yelp-tools.patch =================================================================== --- yelp-tools.patch 2021-01-12 22:45:50 UTC (rev 820309) +++ yelp-tools.patch 2021-01-12 22:46:09 UTC (rev 820310) @@ -1,160 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index e59a6b30..111ac662 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,7 +12,6 @@ full: - EXTRA_DIST = \ - README.md \ - HACKING \ -- gnome-doc-utils.make \ - ChangeLog.0 \ - viking.spec \ - mingw-viking.spec \ -@@ -29,9 +28,6 @@ generate-changelog: - dist-hook: viking.spec generate-changelog - cp $(top_builddir)/viking.spec $(distdir) - --MAINTAINERCLEANFILES = \ -- gnome-doc-utils.make -- - DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ -@@ -39,8 +35,5 @@ DISTCLEANFILES = \ - - ACLOCAL_AMFLAGS = -I m4 - --DISTCHECK_CONFIGURE_FLAGS = \ -- --disable-scrollkeeper -- - # Ignore gtk theme cache files on distcheck - distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache' -diff --git a/configure.ac b/configure.ac -index 94b7bff8..4feaa7d8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -111,7 +111,7 @@ AC_SUBST(PACKAGE_LIBS) - dnl ------------- - dnl | User Manual |--------------------------------------- - dnl ------------- --GNOME_DOC_INIT -+YELP_HELP_INIT - - dnl --------------------------------------------------------------------------- - dnl - Use deprecated options (default enabled for devs, disabled in releases) -@@ -553,23 +553,7 @@ AC_DEFINE_UNQUOTED(VIK_CONFIG_DEFAULT_TILE_AGE, ${VIK_CONFIG_DEFAULT_TILE_AGE}, - AC_DEFINE(HAVE_VIKING, 1, [Enable Viking specifics in otherwise reusable code]) - - dnl man pages processing --dnl Different distributions have differing locations for the docbook.xsl --dnl Debian like --if test -r /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl; then -- DB2MAN_XSL=/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl --dnl RedHat like --elif test -r /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl; then -- DB2MAN_XSL=/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl --else --dnl Old default -- DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl --fi --AC_SUBST(DB2MAN_XSL) --AC_PATH_PROG(XP,xsltproc) --AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"]) --AC_CHECK_PROG([HAVE_SCROLLKEEPER],scrollkeeper-config,"yes") --AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"] && test "${HAVE_SCROLLKEEPER}" = "yes" ) --AM_COND_IF([GEN_MANPAGES], [ac_cv_enable_man=yes], [ac_cv_enable_man=no]) -+AC_PATH_PROG(XSLTPROC,xsltproc) - - ISODATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" - AC_SUBST(ISODATE) -@@ -627,7 +611,6 @@ OAuth : $ac_cv_enable_oauth - Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE} - Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE} - GeoNames user : ${VIK_CONFIG_GEONAMES_USERNAME} --Man page generation : $ac_cv_enable_man - Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html}) - ------------------------------------------- - -diff --git a/help/Makefile.am b/help/Makefile.am -index 9ef48691..f7e5b38d 100644 ---- a/help/Makefile.am -+++ b/help/Makefile.am -@@ -1,6 +1,4 @@ --if GEN_MANPAGES --include $(top_srcdir)/gnome-doc-utils.make --endif -+@YELP_HELP_RULES@ - - # Annoyingly in the XML, yelp refuses to load relative images fileref, i.e. ../../src/icons/file.png - # whereas the PDF generation inserts these references OK -@@ -11,17 +9,18 @@ get-icons: - # '-' ^^^^^ means it doesn't care about the exit status - # this copy statement is not critical (especially when run under make distcheck) - --dist-hook: get-icons doc-dist-hook -+dist-hook: get-icons - --DOC_MODULE = viking --DOC_ENTITIES = legal.xml \ -+HELP_ID = viking -+HELP_FILES = index.docbook -+HELP_EXTRA = legal.xml \ - attribution.xml \ - commandline.xml \ -+ geoclue_layer.xml \ - georef_layer.xml \ - mapnik_rendering_layer.xml \ - recommends.xml --DOC_INCLUDES = --DOC_FIGURES = \ -+HELP_MEDIA = \ - figures/Aggregate_statistics.png \ - figures/Aggregate_statistics_years.png \ - figures/addtr_18.png \ -@@ -57,20 +56,17 @@ DOC_FIGURES = \ - figures/Viking-TAC.png \ - figures/DEM_file_info_dialog.png \ - figures/customize_toolbar_dialog.png --DOC_LINGUAS = -+HELP_LINGUAS = - - EXTRA_DIST = viking.xml.in - - CLEANFILES= - - # man pages processing --if GEN_MANPAGES - MANPAGES=viking.1 - man_MANS = $(MANPAGES) - CLEANFILES+=$(MANPAGES) --endif --DB2MAN=@DB2MAN_XSL@ --XP=@XP@ -''-nonet -+XSLTPROC=@XSLTPROC@ -''-nonet - - %.1: %.xml -- $(XP) -o $@ $(DB2MAN) $< -+ $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -diff --git a/src/Makefile.am b/src/Makefile.am -index 37528972..78bda6b8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -16,16 +16,8 @@ authors.h: $(top_srcdir)/AUTHORS - sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@ - echo "NULL};" >> $@ - --if HAVE_XSLTPROC --documenters.h: $(top_srcdir)/help/C/viking.xml -- $(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@ --else --documenters.h: -- rm -f $@ -- echo "/* Generated file. */" >> $@ -- echo "const gchar *DOCUMENTERS[] = {\\" >> $@ -- echo "NULL};" >> $@ --endif -+documenters.h: $(top_srcdir)/help/C/index.docbook -+ $(XSLTPROC) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/index.docbook > $@ - - BUILT_SOURCES = authors.h documenters.h - Copied: viking/repos/community-x86_64/yelp-tools.patch (from rev 820309, viking/trunk/yelp-tools.patch) =================================================================== --- yelp-tools.patch (rev 0) +++ yelp-tools.patch 2021-01-12 22:46:09 UTC (rev 820310) @@ -0,0 +1,160 @@ +diff --git a/Makefile.am b/Makefile.am +index e59a6b30..111ac662 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,7 +12,6 @@ full: + EXTRA_DIST = \ + README.md \ + HACKING \ +- gnome-doc-utils.make \ + ChangeLog.0 \ + viking.spec \ + mingw-viking.spec \ +@@ -29,9 +28,6 @@ generate-changelog: + dist-hook: viking.spec generate-changelog + cp $(top_builddir)/viking.spec $(distdir) + +-MAINTAINERCLEANFILES = \ +- gnome-doc-utils.make +- + DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ +@@ -39,8 +35,5 @@ DISTCLEANFILES = \ + + ACLOCAL_AMFLAGS = -I m4 + +-DISTCHECK_CONFIGURE_FLAGS = \ +- --disable-scrollkeeper +- + # Ignore gtk theme cache files on distcheck + distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache' +diff --git a/configure.ac b/configure.ac +index 94b7bff8..4feaa7d8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -111,7 +111,7 @@ AC_SUBST(PACKAGE_LIBS) + dnl ------------- + dnl | User Manual |--------------------------------------- + dnl ------------- +-GNOME_DOC_INIT ++YELP_HELP_INIT + + dnl --------------------------------------------------------------------------- + dnl - Use deprecated options (default enabled for devs, disabled in releases) +@@ -553,23 +553,7 @@ AC_DEFINE_UNQUOTED(VIK_CONFIG_DEFAULT_TILE_AGE, ${VIK_CONFIG_DEFAULT_TILE_AGE}, + AC_DEFINE(HAVE_VIKING, 1, [Enable Viking specifics in otherwise reusable code]) + + dnl man pages processing +-dnl Different distributions have differing locations for the docbook.xsl +-dnl Debian like +-if test -r /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl; then +- DB2MAN_XSL=/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl +-dnl RedHat like +-elif test -r /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl; then +- DB2MAN_XSL=/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl +-else +-dnl Old default +- DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl +-fi +-AC_SUBST(DB2MAN_XSL) +-AC_PATH_PROG(XP,xsltproc) +-AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"]) +-AC_CHECK_PROG([HAVE_SCROLLKEEPER],scrollkeeper-config,"yes") +-AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"] && test "${HAVE_SCROLLKEEPER}" = "yes" ) +-AM_COND_IF([GEN_MANPAGES], [ac_cv_enable_man=yes], [ac_cv_enable_man=no]) ++AC_PATH_PROG(XSLTPROC,xsltproc) + + ISODATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" + AC_SUBST(ISODATE) +@@ -627,7 +611,6 @@ OAuth : $ac_cv_enable_oauth + Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE} + Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE} + GeoNames user : ${VIK_CONFIG_GEONAMES_USERNAME} +-Man page generation : $ac_cv_enable_man + Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html}) + ------------------------------------------- + +diff --git a/help/Makefile.am b/help/Makefile.am +index 9ef48691..f7e5b38d 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -1,6 +1,4 @@ +-if GEN_MANPAGES +-include $(top_srcdir)/gnome-doc-utils.make +-endif ++@YELP_HELP_RULES@ + + # Annoyingly in the XML, yelp refuses to load relative images fileref, i.e. ../../src/icons/file.png + # whereas the PDF generation inserts these references OK +@@ -11,17 +9,18 @@ get-icons: + # '-' ^^^^^ means it doesn't care about the exit status + # this copy statement is not critical (especially when run under make distcheck) + +-dist-hook: get-icons doc-dist-hook ++dist-hook: get-icons + +-DOC_MODULE = viking +-DOC_ENTITIES = legal.xml \ ++HELP_ID = viking ++HELP_FILES = index.docbook ++HELP_EXTRA = legal.xml \ + attribution.xml \ + commandline.xml \ ++ geoclue_layer.xml \ + georef_layer.xml \ + mapnik_rendering_layer.xml \ + recommends.xml +-DOC_INCLUDES = +-DOC_FIGURES = \ ++HELP_MEDIA = \ + figures/Aggregate_statistics.png \ + figures/Aggregate_statistics_years.png \ + figures/addtr_18.png \ +@@ -57,20 +56,17 @@ DOC_FIGURES = \ + figures/Viking-TAC.png \ + figures/DEM_file_info_dialog.png \ + figures/customize_toolbar_dialog.png +-DOC_LINGUAS = ++HELP_LINGUAS = + + EXTRA_DIST = viking.xml.in + + CLEANFILES= + + # man pages processing +-if GEN_MANPAGES + MANPAGES=viking.1 + man_MANS = $(MANPAGES) + CLEANFILES+=$(MANPAGES) +-endif +-DB2MAN=@DB2MAN_XSL@ +-XP=@XP@ -''-nonet ++XSLTPROC=@XSLTPROC@ -''-nonet + + %.1: %.xml +- $(XP) -o $@ $(DB2MAN) $< ++ $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +diff --git a/src/Makefile.am b/src/Makefile.am +index 37528972..78bda6b8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -16,16 +16,8 @@ authors.h: $(top_srcdir)/AUTHORS + sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@ + echo "NULL};" >> $@ + +-if HAVE_XSLTPROC +-documenters.h: $(top_srcdir)/help/C/viking.xml +- $(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@ +-else +-documenters.h: +- rm -f $@ +- echo "/* Generated file. */" >> $@ +- echo "const gchar *DOCUMENTERS[] = {\\" >> $@ +- echo "NULL};" >> $@ +-endif ++documenters.h: $(top_srcdir)/help/C/index.docbook ++ $(XSLTPROC) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/index.docbook > $@ + + BUILT_SOURCES = authors.h documenters.h +