[med-svn] [amide] 01/04: Switch to yelp documentation creation, Closes: #830051
Gert Wollny
gewo at moszumanska.debian.org
Sun Sep 24 15:50:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository amide.
commit 5a4a5eb2a7f613e864e8dea83af54ad03fb70003
Author: Gert Wollny <gewo at debian.org>
Date: Fri Sep 22 13:13:29 2017 +0000
Switch to yelp documentation creation, Closes: #830051
- force non-parallel builds
- remove test for gtk-doc
- update dependencies to align with dh 10
- update depenencies foc documentation creation
---
debian/configure_helper.sh | 2 +
debian/control | 14 +--
debian/patches/remove-autdated-gnome-macros.patch | 137 ++++++++++++----------
debian/rules | 8 +-
4 files changed, 83 insertions(+), 78 deletions(-)
diff --git a/debian/configure_helper.sh b/debian/configure_helper.sh
index ff546e3..bba9310 100755
--- a/debian/configure_helper.sh
+++ b/debian/configure_helper.sh
@@ -5,4 +5,6 @@ intltoolize --copy --force --automake
aclocal -I m4 # specify where to seek for m4 files
libtoolize -f -c
automake -f -a -c
+gtkdocize --copy
+aclocal -I m4 --install
autoconf -f
diff --git a/debian/control b/debian/control
index 9e96fc0..7dc78fc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,10 @@ Uploaders: Dominique Belhachemi <domibel at debian.org>,
Gert Wollny <gw.fossdev at gmail.com>
Section: graphics
Priority: optional
-Build-Depends: gnome-doc-utils,
- gtk-doc-tools,
- gnome-common,
- libtool,
+Build-Depends: libtool,
debhelper (>= 10),
- autotools-dev,
- dh-autoreconf,
+ appstream-util,
+ intltool,
scrollkeeper,
libxml-parser-perl,
libgtk2.0-dev,
@@ -24,8 +21,9 @@ Build-Depends: gnome-doc-utils,
libvolpack1-dev,
libavcodec-dev,
libavformat-dev,
- libavutil-dev
-Standards-Version: 3.9.8
+ libavutil-dev,
+ yelp-tools
+Standards-Version: 4.1.0
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/amide.git
Vcs-Git: https://anonscm.debian.org/git/debian-med/amide.git
Homepage: http://amide.sourceforge.net/
diff --git a/debian/patches/remove-autdated-gnome-macros.patch b/debian/patches/remove-autdated-gnome-macros.patch
index 98e1652..8730402 100644
--- a/debian/patches/remove-autdated-gnome-macros.patch
+++ b/debian/patches/remove-autdated-gnome-macros.patch
@@ -5,72 +5,79 @@ Description: Remove use of deprecated gnome-common macros/variables
--- a/configure.ac
+++ b/configure.ac
-@@ -420,8 +420,7 @@
+@@ -3,7 +3,6 @@
+ dnl ===============================================================================
+ AC_PREREQ(2.59)
+ AC_INIT([amide],[1.0.5],[amide-users at lists.sourceforge.net])
+-
+ AC_CONFIG_SRCDIR(src/amide.c)
+ AC_CONFIG_HEADERS(amide_config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+@@ -400,7 +399,7 @@
+ ################################################################
+
+ dnl if we define --enable-gtk-doc, we build the library documentation
+-GTK_DOC_CHECK([1.10])
++#GTK_DOC_CHECK([1.10])
+
+ dnl the following is for the application documentation
+ AC_ARG_ENABLE(doc,
+@@ -418,11 +417,9 @@
+ fi
+ AM_CONDITIONAL(DISABLE_DOC, test ${enable_doc} = no)
- if test ${enable_doc} = yes; then
- dnl building documentatin
+-if test ${enable_doc} = yes; then
+- dnl building documentatin
- GNOME_DOC_INIT
--
-+ echo "removed obsolete macro"
- else
++YELP_HELP_INIT
+
+-else
++if test x${enable_doc} = xno; then
dnl not building documentation
ENABLE_SK_TRUE="#"
---- a/m4/gnome-doc-utils.m4
-+++ /dev/null
-@@ -1,56 +0,0 @@
--dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
--dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
--AC_DEFUN([GNOME_DOC_DEFINES],
--[
--AC_ARG_WITH([help-dir],
-- AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-- [with_help_dir='${datadir}/gnome/help'])
--HELP_DIR="$with_help_dir"
--AC_SUBST(HELP_DIR)
--
--AC_ARG_WITH([omf-dir],
-- AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-- [with_omf_dir='${datadir}/omf'])
--OMF_DIR="$with_omf_dir"
--AC_SUBST(OMF_DIR)
--
--AC_ARG_WITH([help-formats],
-- AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-- [with_help_formats=''])
--DOC_USER_FORMATS="$with_help_formats"
--AC_SUBST(DOC_USER_FORMATS)
--
--AC_ARG_ENABLE([scrollkeeper],
-- [AC_HELP_STRING([--disable-scrollkeeper],
-- [do not make updates to the scrollkeeper database])],,
-- enable_scrollkeeper=yes)
--AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
--
--dnl disable scrollkeeper automatically for distcheck
--DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
--AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
--
--AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
--])
--
--# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
--#
--AC_DEFUN([GNOME_DOC_INIT],
--[AC_REQUIRE([AC_PROG_LN_S])dnl
--
--ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
--
--AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
--PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-- [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
--
--if test "$gdu_cv_have_gdu" = "yes"; then
-- AC_MSG_RESULT([yes])
-- ifelse([$2],,[:],[$2])
--else
-- AC_MSG_RESULT([no])
-- ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
--fi
--
--GNOME_DOC_DEFINES
--])
+ ENABLE_SK_FALSE=""
+@@ -443,9 +440,6 @@
+ win32/Makefile
+ macosx/Makefile
+ macosx/amide.plist
+-doc/Makefile
+-doc/reference/Makefile
+-doc/reference/version.xml
+ help/Makefile
+ etc/Makefile
+ etc/amide-$VERSION-1.info:etc/amide.info.in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,7 +14,6 @@
+ win32 \
+ macosx \
+ src \
+- doc \
+ man \
+ po \
+ etc \
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -1,15 +1,16 @@
+ ## Process this file with automake to produce Makefile.in.
+
+-include $(top_srcdir)/gnome-doc-utils.make
++ at YELP_HELP_RULES@
++
+ dist-hook: doc-dist-hook
+
+-DOC_MODULE = amide
+-DOC_ENTITIES = legal.xml
+-DOC_INCLUDES =
+-DOC_FIGURES = \
++HELP_ID = amide
++HELP_FILES = legal.xml
++HELP_EXTRA =
++HELP_MEDIA = \
+ figures/amide_main_window.png \
+ figures/study_tree.png
+
+-DOC_LINGUAS = es
++HELP_LINGUAS = es
+
+ DISTCLEANFILES = *~ */*~
diff --git a/debian/rules b/debian/rules
index 0edaa94..5795e55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,11 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
export ACLOCAL = aclocal -I m4
%:
- dh $@ --with autotools_dev --with autoreconf
-
-override_dh_autoreconf:
- dh_autoreconf --as-needed debian/configure_helper.sh
+ dh $@ --no-parallel
override_dh_auto_configure:
dh_auto_configure -- \
@@ -20,7 +18,7 @@ override_dh_auto_configure:
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--localstatedir=/var/lib/amide \
- LDFLAGS="-Wl,-z,defs $(LDFLAGS)"
+ LDFLAGS="-Wl,-z,defs -Wl,--as-needed $(LDFLAGS)"
# To create the docs this option would be needed but it causes build problems
# see doc/README
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/amide.git
More information about the debian-med-commit
mailing list