Fix build for yakkety (remove use of gnome-doc-utils)

linuxmint · Feb 5, 2017 · 18bb919 · 18bb919
1 parent 151fa9e
commit 18bb919
Show file tree

Hide file tree

Showing 11 changed files with 153 additions and 403 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -23,11 +23,9 @@ EXTRA_DIST = \
 	README.install		\
 	intltool-extract.in	\
 	intltool-merge.in	\
-	intltool-update.in	\
-	gnome-doc-utils.make
+	intltool-update.in
 
 DISTCLEANFILES = \
-	gnome-doc-utils.make	\
 	intltool-extract	\
 	intltool-merge		\
 	intltool-update

diff --git a/autogen.sh b/autogen.sh
@@ -1,21 +1,38 @@
-#!/bin/bash
+#!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+olddir=$(pwd)
 
-PKG_NAME="mdm"
+cd $srcdir
 
-(test -f $srcdir/configure.ac \
-  && test -d $srcdir/gui) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level mdm directory"
+(test -f configure.ac) || {
+    echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
     exit 1
 }
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from GNOME Git (or from"
-    echo "your OS vendor's package manager)."
-    exit 1
-}
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
+
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+    echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+    echo "*** If you wish to pass any to it, please specify them on the" >&2
+    echo "*** '$0' command line." >&2
+    echo "" >&2
+fi
+
+aclocal --install || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+    $srcdir/configure "$@" || exit 1
+
+    if [ "$1" = "--help" ]; then exit 0 else
+        echo "Now type 'make' to compile $PKG_NAME" || exit 1
+    fi
+else
+    echo "Skipping configure process."
+fi
diff --git a/configure.ac b/configure.ac
@@ -3,13 +3,13 @@ AC_INIT(daemon/mdm.h)
 
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE(mdm,2.0.17)
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AM_MAINTAINER_MODE
 AC_GNU_SOURCE
 
 IT_PROG_INTLTOOL([0.35.0])
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 DBUS_REQUIRED=0.78
 GLIB_REQUIRED=2.37.3

diff --git a/debian/control b/debian/control
@@ -26,7 +26,6 @@ Build-Depends: libpam0g-dev (>= 0.99.7.1),
                libxdmcp-dev,
                libxinerama-dev,
                libdmx-dev,
-               gnome-doc-utils,
                sharutils,
                gnome-pkg-tools,
                quilt,
@@ -35,6 +34,7 @@ Build-Depends: libpam0g-dev (>= 0.99.7.1),
                xserver-xorg,
                libwebkitgtk-dev (>= 1.3.10),
                gnome-common,
+               yelp-tools,
                libxml2-utils,
                dh-systemd (>= 1.5)
 Standards-Version: 3.9.5

diff --git a/debian/mdm.install b/debian/mdm.install
@@ -26,9 +26,7 @@ debian/tmp/usr/share/mdm/*.glade
 debian/tmp/usr/share/mdm/locale
 debian/tmp/usr/share/mdm/recovery
 debian/tmp/usr/share/mdm/gtk-preview.png
-debian/tmp/usr/share/gnome/help/mdm
 debian/tmp/usr/share/icons/hicolor
 debian/tmp/usr/share/locale
-debian/tmp/usr/share/man
-debian/tmp/usr/share/omf/mdm
+debian/tmp/usr/share/help
 debian/tmp/usr/share/pixmaps
diff --git a/docs/C/legal.xml b/docs/C/legal.xml
@@ -6,7 +6,7 @@
 	  by the Free Software Foundation with no Invariant Sections,
 	  no Front-Cover Texts, and no Back-Cover Texts.  You can find
 	  a copy of the GFDL at this <ulink type="help"
-	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+	  url="help:fdl">link</ulink> or in the file COPYING-DOCS
 	  distributed with this manual.
          </para>        
 

diff --git a/docs/Makefile.am b/docs/Makefile.am
@@ -1,10 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mdm
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_LINGUAS = en_GB
+HELP_ID = mdm
+HELP_FILES = mdm.xml legal.xml
+HELP_MEDIA =
+HELP_LINGUAS = en_GB
 # it ja zh_CN zh_HK zh_TW need to be transitioned to gnome-doc-utils
 
 man_MANS = mdm.1

diff --git a/files/Makefile b/files/Makefile
diff --git a/files/Makefile.in b/files/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,15 +88,18 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = files
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
+	$(top_srcdir)/m4/gnome-compiler-flags.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/m4/yelp.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -111,6 +124,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -143,10 +157,8 @@ DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DLLTOOL = @DLLTOOL@
 DMX_LIBS = @DMX_LIBS@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -197,6 +209,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -210,6 +223,7 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALSTATEDIR = @LOCALSTATEDIR@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -237,7 +251,6 @@ NMEDIT = @NMEDIT@
 NOLOGIN = @NOLOGIN@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -286,6 +299,7 @@ XEVIE_OPTION = @XEVIE_OPTION@
 XGETTEXT = @XGETTEXT@
 XINERAMA_LIBS = @XINERAMA_LIBS@
 XMKMF = @XMKMF@
+XMLLINT = @XMLLINT@
 XSESSION_SHELL = @XSESSION_SHELL@
 X_CFLAGS = @X_CFLAGS@
 X_CONFIG_OPTIONS = @X_CONFIG_OPTIONS@
@@ -295,6 +309,8 @@ X_PATH = @X_PATH@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_SERVER = @X_SERVER@
 X_SERVER_PATH = @X_SERVER_PATH@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 ZENITY = @ZENITY@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -349,6 +365,7 @@ pixmapdir = @pixmapdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -373,7 +390,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu files/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu files/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -551,6 +567,8 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am uninstall-hook
 
+.PRECIOUS: Makefile
+
 install-data-hook:
 	find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
 

diff --git a/m4/gnome-doc-utils.m4 b/m4/gnome-doc-utils.m4