Advance to Debhelper 12.

* debian/compat: Advance to Debhelper 12, notably yielding DWZ-compressed
  symbols and fully uncompressed examples.
* debian/control: Advance minimum debhelper version to 12~ accordingly.

4 files changed, 256 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index c876a6f..7845a1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ fltk1.3 (1.3.4-10) UNRELEASED; urgency=medium
     by default (e.g. Ubuntu).  (MR: !1.)
 
   [ Aaron M. Ucko ]
+  * debian/compat: Advance to Debhelper 12, notably yielding DWZ-compressed
+    symbols and fully uncompressed examples.
+  * debian/control: Advance minimum debhelper version to 12~ accordingly.
   * documentation/make_pdf: Loosen caption de-hyperlinking to
     accommodate (but not require) interposed mboxes, as produced by Doxygen
     1.8.16 (currently in experimental).
@@ -16,7 +19,7 @@ fltk1.3 (1.3.4-10) UNRELEASED; urgency=medium
   * test/Makefile: Link FLTK libraries dynamically, notably for games.
     (Done years ago for 1.1, but accidentally missed for 1.3.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Sat, 26 Oct 2019 21:24:55 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 26 Oct 2019 21:28:40 -0400
 
 fltk1.3 (1.3.4-9) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index b4de394..48082f7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+12
diff --git a/debian/control b/debian/control
index cca424a..d323805 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fltk1.3
 Maintainer: Aaron M. Ucko <ucko@debian.org>
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 12~),
                libcairo2-dev,
                libgl1-mesa-dev | libgl-dev,
                libglu1-mesa-dev | libglu-dev,
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index b7c2fe1..ddb2f6e 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -61,6 +61,256 @@ Combined patches from git.
  #
  # Object files...
  #
+--- fltk1.3-1.3.4.orig/configure
++++ fltk1.3-1.3.4/configure
+@@ -704,6 +704,9 @@ FL_DSO_VERSION
+ FL_PATCH_VERSION
+ FL_MINOR_VERSION
+ FL_MAJOR_VERSION
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
++PKG_CONFIG
+ ac_ct_CXX
+ CXXFLAGS
+ CXX
+@@ -741,6 +744,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -799,6 +803,9 @@ CPPFLAGS
+ CXX
+ CXXFLAGS
+ CCC
++PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ CPP
+ XMKMF'
+ 
+@@ -839,6 +846,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE}'
+@@ -1091,6 +1099,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1228,7 +1245,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1381,6 +1398,7 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -1457,6 +1475,11 @@ Some influential environment variables:
+               you have headers in a nonstandard directory <include dir>
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
++  PKG_CONFIG  path to pkg-config utility
++  PKG_CONFIG_PATH
++              directories to add to pkg-config's search path
++  PKG_CONFIG_LIBDIR
++              path overriding pkg-config's built-in search path
+   CPP         C preprocessor
+   XMKMF       Path to xmkmf, Makefile generator for X Window System
+ 
+@@ -3618,6 +3641,126 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
++
++
++
++
++
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++  ac_pt_PKG_CONFIG=$PKG_CONFIG
++  # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $ac_pt_PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_pt_PKG_CONFIG" = x; then
++    PKG_CONFIG=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    PKG_CONFIG=$ac_pt_PKG_CONFIG
++  fi
++else
++  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
++
++fi
++if test -n "$PKG_CONFIG"; then
++	_pkg_min_version=0.9.0
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	else
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++		PKG_CONFIG=""
++	fi
++fi
++
+ case $host_os in
+     darwin*)
+ 	if test "x$with_archflags" != x ; then
+@@ -3718,7 +3861,7 @@ if test x$enable_cairoext = xyes; then
+ 	  $as_echo "#define FLTK_HAVE_CAIRO 1" >>confdefs.h
+ 
+ 	  	  	  CAIRODIR="cairo"
+-	  CAIROFLAGS="`pkg-config --cflags cairo`"
++	  CAIROFLAGS="`$PKG_CONFIG --cflags cairo`"
+ 	  CAIROLIBS="-lcairo -lpixman-1"
+ 	  CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+ 	  LINKFLTKCAIRO="../lib/libfltk_cairo.a"
+@@ -3730,7 +3873,7 @@ else
+ 	  $as_echo "#define FLTK_HAVE_CAIRO 1" >>confdefs.h
+ 
+ 	  	  	  CAIRODIR="cairo"
+-	  CAIROFLAGS="`pkg-config --cflags cairo`"
++	  CAIROFLAGS="`$PKG_CONFIG --cflags cairo`"
+ 	  CAIROLIBS="-lcairo -lpixman-1"
+ 	  CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+ 	  LINKFLTKCAIRO="../lib/libfltk_cairo.a"
+@@ -3978,9 +4121,9 @@ $as_echo "$ac_cv_cxx_fvisibility_inlines
+ 		CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+ 	    fi
+ 
+-	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
+-		    DSOLINK="-Wl,-rpath,$libdir"
+-	    fi
++# 	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
++# 		    DSOLINK="-Wl,-rpath,$libdir"
++# 	    fi
+ 	    ;;
+ 	aix*)
+ 	    DSONAME="libfltk_s.a"
+@@ -8597,7 +8740,7 @@ _ACEOF
+ 
+     else
+ 	cat >>confdefs.h <<_ACEOF
+-#define FLTK_DOCDIR "$prefix/share/doc/fltk"
++#define FLTK_DOCDIR "$prefix/share/doc/fltk1.3-doc/HTML"
+ _ACEOF
+ 
+     fi
 --- fltk1.3-1.3.4.orig/configure.ac
 +++ fltk1.3-1.3.4/configure.ac
 @@ -40,6 +40,7 @@ OPTIM="${OPTIM:=}"