Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package fltk1.3.
As noted in #924820, I issued my latest upload to unstable on Feb. 27.
The only reason it didn't migrate before the freeze is that I
addressed #921294 (fallout from texlive-latex-extra tabu.sty bug
#920459) by specifically build-depending on an unbroken version of
texlive-latex-extra, which alas turned out not to migrate in a
sufficiently timely fashion.
I see that TeX Live has now migrated, so the only obstacle to
fltk1.3's migration is the freeze.
You can find the changes from 1.3.4-7 at
https://salsa.debian.org/ucko/fltk1.3/compare/debian%2F1.3.4-7...debian%2F1.3.4-9
or in the attached debdiff.
Thanks!
unblock fltk1.3/1.3.4-9
-- System Information:
Debian Release: buster/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500,
'testing'), (500, 'stable'), (300, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, x32
Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru fltk1.3-1.3.4/debian/.gitignore fltk1.3-1.3.4/debian/.gitignore
--- fltk1.3-1.3.4/debian/.gitignore 2017-01-16 18:26:31.000000000 -0500
+++ fltk1.3-1.3.4/debian/.gitignore 2019-02-27 21:21:30.000000000 -0500
@@ -1,7 +1,9 @@
*.debhelper
*.debhelper.log
*.substvars
+autoreconf.*
common-build-stamp
+configure.saved
debhelper-build-stamp
files
fltk1.3-doc
diff -Nru fltk1.3-1.3.4/debian/FLTKLibraries-noconfig.cmake.in
fltk1.3-1.3.4/debian/FLTKLibraries-noconfig.cmake.in
--- fltk1.3-1.3.4/debian/FLTKLibraries-noconfig.cmake.in 2011-07-04
00:07:20.000000000 -0400
+++ fltk1.3-1.3.4/debian/FLTKLibraries-noconfig.cmake.in 1969-12-31
19:00:00.000000000 -0500
@@ -1,96 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "".
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-SET(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Import target "fluid" for configuration ""
-SET_PROPERTY(TARGET fluid APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-SET_TARGET_PROPERTIES(fluid PROPERTIES
- IMPORTED_LOCATION_NOCONFIG "/usr/bin/fluid"
- )
-
-# Import target "fltk" for configuration ""
-SET_PROPERTY(TARGET fltk APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-SET_TARGET_PROPERTIES(fltk PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "C;CXX"
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG
"-lXft;-lfontconfig;-lXinerama;-lX11;-lm"
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk.a"
- )
-
-# Import target "fltk_cairo" for configuration ""
-SET_PROPERTY(TARGET fltk_cairo APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_cairo PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "fltk;-lcairo"
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk_cairo.a"
- )
-
-# Import target "fltk_forms" for configuration ""
-SET_PROPERTY(TARGET fltk_forms APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_forms PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "fltk"
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk_forms.a"
- )
-
-# Import target "fltk_images" for configuration ""
-SET_PROPERTY(TARGET fltk_images APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_images PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "fltk;-lpng;-lz;-ljpeg"
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk_images.a"
- )
-
-# Import target "fltk_gl" for configuration ""
-SET_PROPERTY(TARGET fltk_gl APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_gl PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "fltk;-lGLU;-lGL"
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk_gl.a"
- )
-
-# Import target "fltk_SHARED" for configuration ""
-SET_PROPERTY(TARGET fltk_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_SHARED PROPERTIES
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG ""
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk.so.1.3"
- IMPORTED_SONAME_NOCONFIG "libfltk.so.0"
- )
-
-# Import target "fltk_cairo_SHARED" for configuration ""
-SET_PROPERTY(TARGET fltk_cairo_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_cairo_SHARED PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG ""
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk_cairo.so.1.3"
- IMPORTED_SONAME_NOCONFIG "libfltk_cairo.so.0"
- )
-
-# Import target "fltk_forms_SHARED" for configuration ""
-SET_PROPERTY(TARGET fltk_forms_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_forms_SHARED PROPERTIES
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG ""
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk_forms.so.1.3"
- IMPORTED_SONAME_NOCONFIG "libfltk_forms.so.0"
- )
-
-# Import target "fltk_images_SHARED" for configuration ""
-SET_PROPERTY(TARGET fltk_images_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_images_SHARED PROPERTIES
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG ""
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk_images.so.1.3"
- IMPORTED_SONAME_NOCONFIG "libfltk_images.so.0"
- )
-
-# Import target "fltk_gl_SHARED" for configuration ""
-SET_PROPERTY(TARGET fltk_gl_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
-SET_TARGET_PROPERTIES(fltk_gl_SHARED PROPERTIES
- IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG ""
- IMPORTED_LOCATION_NOCONFIG "@libdir@/libfltk_gl.so.1.3"
- IMPORTED_SONAME_NOCONFIG "libfltk_gl.so.0"
- )
-
-# Commands beyond this point should not need to know the version.
-SET(CMAKE_IMPORT_FILE_VERSION)
diff -Nru fltk1.3-1.3.4/debian/FLTKLibraries-none.cmake.in
fltk1.3-1.3.4/debian/FLTKLibraries-none.cmake.in
--- fltk1.3-1.3.4/debian/FLTKLibraries-none.cmake.in 1969-12-31
19:00:00.000000000 -0500
+++ fltk1.3-1.3.4/debian/FLTKLibraries-none.cmake.in 2019-02-27
21:21:30.000000000 -0500
@@ -0,0 +1,96 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+SET(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "fluid" for configuration ""
+SET_PROPERTY(TARGET fluid APPEND PROPERTY IMPORTED_CONFIGURATIONS NONE)
+SET_TARGET_PROPERTIES(fluid PROPERTIES
+ IMPORTED_LOCATION_NONE "/usr/bin/fluid"
+ )
+
+# Import target "fltk" for configuration ""
+SET_PROPERTY(TARGET fltk APPEND PROPERTY IMPORTED_CONFIGURATIONS NONE)
+SET_TARGET_PROPERTIES(fltk PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES_NONE "C;CXX"
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE
"-lXft;-lfontconfig;-lXinerama;-lX11;-lm"
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk.a"
+ )
+
+# Import target "fltk_cairo" for configuration ""
+SET_PROPERTY(TARGET fltk_cairo APPEND PROPERTY IMPORTED_CONFIGURATIONS NONE)
+SET_TARGET_PROPERTIES(fltk_cairo PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES_NONE "CXX"
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE "fltk;-lcairo"
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk_cairo.a"
+ )
+
+# Import target "fltk_forms" for configuration ""
+SET_PROPERTY(TARGET fltk_forms APPEND PROPERTY IMPORTED_CONFIGURATIONS NONE)
+SET_TARGET_PROPERTIES(fltk_forms PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES_NONE "CXX"
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE "fltk"
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk_forms.a"
+ )
+
+# Import target "fltk_images" for configuration ""
+SET_PROPERTY(TARGET fltk_images APPEND PROPERTY IMPORTED_CONFIGURATIONS NONE)
+SET_TARGET_PROPERTIES(fltk_images PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES_NONE "CXX"
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE "fltk;-lpng;-lz;-ljpeg"
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk_images.a"
+ )
+
+# Import target "fltk_gl" for configuration ""
+SET_PROPERTY(TARGET fltk_gl APPEND PROPERTY IMPORTED_CONFIGURATIONS NONE)
+SET_TARGET_PROPERTIES(fltk_gl PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES_NONE "CXX"
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE "fltk;-lGLU;-lGL"
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk_gl.a"
+ )
+
+# Import target "fltk_SHARED" for configuration ""
+SET_PROPERTY(TARGET fltk_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS NONE)
+SET_TARGET_PROPERTIES(fltk_SHARED PROPERTIES
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE ""
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk.so.1.3"
+ IMPORTED_SONAME_NONE "libfltk.so.0"
+ )
+
+# Import target "fltk_cairo_SHARED" for configuration ""
+SET_PROPERTY(TARGET fltk_cairo_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NONE)
+SET_TARGET_PROPERTIES(fltk_cairo_SHARED PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES_NONE "CXX"
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE ""
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk_cairo.so.1.3"
+ IMPORTED_SONAME_NONE "libfltk_cairo.so.0"
+ )
+
+# Import target "fltk_forms_SHARED" for configuration ""
+SET_PROPERTY(TARGET fltk_forms_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NONE)
+SET_TARGET_PROPERTIES(fltk_forms_SHARED PROPERTIES
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE ""
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk_forms.so.1.3"
+ IMPORTED_SONAME_NONE "libfltk_forms.so.0"
+ )
+
+# Import target "fltk_images_SHARED" for configuration ""
+SET_PROPERTY(TARGET fltk_images_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NONE)
+SET_TARGET_PROPERTIES(fltk_images_SHARED PROPERTIES
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE ""
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk_images.so.1.3"
+ IMPORTED_SONAME_NONE "libfltk_images.so.0"
+ )
+
+# Import target "fltk_gl_SHARED" for configuration ""
+SET_PROPERTY(TARGET fltk_gl_SHARED APPEND PROPERTY IMPORTED_CONFIGURATIONS
NONE)
+SET_TARGET_PROPERTIES(fltk_gl_SHARED PROPERTIES
+ IMPORTED_LINK_INTERFACE_LIBRARIES_NONE ""
+ IMPORTED_LOCATION_NONE "@libdir@/libfltk_gl.so.1.3"
+ IMPORTED_SONAME_NONE "libfltk_gl.so.0"
+ )
+
+# Commands beyond this point should not need to know the version.
+SET(CMAKE_IMPORT_FILE_VERSION)
diff -Nru fltk1.3-1.3.4/debian/changelog fltk1.3-1.3.4/debian/changelog
--- fltk1.3-1.3.4/debian/changelog 2018-03-15 22:20:20.000000000 -0400
+++ fltk1.3-1.3.4/debian/changelog 2019-02-27 21:21:30.000000000 -0500
@@ -1,3 +1,36 @@
+fltk1.3 (1.3.4-9) unstable; urgency=medium
+
+ * d/control: Tighten B-D-I on texlive-latex-extra to definitively avoid
+ #920459, which accidentally recurred in one release. (See #921294.)
+
+ -- Aaron M. Ucko <u...@debian.org> Wed, 27 Feb 2019 21:21:30 -0500
+
+fltk1.3 (1.3.4-8) unstable; urgency=medium
+
+ * configure: Revert local changes in favor of using dh_autoreconf.
+ * configure.ac: Use (PKG_PROG_)PKG_CONFIG per Helmut Grohne.
+ * debian/*-none*: Formally renamed from debian/*-noconfig* and tweaked
+ correspondingly to account for running cmake via dh_auto_configure,
+ which supplies -DCMAKE_BUILD_TYPE=None.
+ * debian/control:
+ - Add a versioned Build-Depends-Indep entry for texlive-latex-extra to
+ avoid (long)tabu lossage from #920459. (Closes: #921294.)
+ - Standards-Version: 4.3.0 (fully compliant at this point).
+ * debian/rules:
+ - Allow (dh_)autoreconf after all, albeit with autoheader suppressed.
+ - Run cmake via dh_auto_configure per Helmut Grohne's suggestion;
+ account for formal side effects of gaining -DCMAKE_BUILD_TYPE=None.
+ - Use /usr/share/dpkg/{architecture,buildflags}.mk instead of calling
+ dpkg-{architecture,buildflags} directly (and piecemeal).
+ - Specify a host-specific pkg-config per Helmut Grohne, both in FTCONFIG
+ and in the environment. (Together with the configure.ac change,
+ closes: #900190.)
+ - Strip all -f*-prefix-map=* flags from fltk-config. (See #909078.)
+ - override_dh_installchangelogs: Install CHANGES as NEWS(.gz), not
+ changelog(.gz).
+
+ -- Aaron M. Ucko <u...@debian.org> Tue, 26 Feb 2019 20:30:37 -0500
+
fltk1.3 (1.3.4-7) unstable; urgency=medium
* debian/compat: Advance to 11.
diff -Nru fltk1.3-1.3.4/debian/control fltk1.3-1.3.4/debian/control
--- fltk1.3-1.3.4/debian/control 2018-03-15 22:18:19.000000000 -0400
+++ fltk1.3-1.3.4/debian/control 2019-02-27 21:21:30.000000000 -0500
@@ -18,8 +18,9 @@
Build-Depends-Arch: cmake,
libasound2-dev [linux-any]
Build-Depends-Indep: doxygen-latex,
- texlive-font-utils
-Standards-Version: 4.1.3
+ texlive-font-utils,
+ texlive-latex-extra (>= 2018.20190227-1~) |
texlive-latex-extra (<< 2018.20181215~)
+Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/ucko/fltk1.3
Vcs-Git: https://salsa.debian.org/ucko/fltk1.3.git
Homepage: http://www.fltk.org/
diff -Nru fltk1.3-1.3.4/debian/fix-fltk-targets-noconfig
fltk1.3-1.3.4/debian/fix-fltk-targets-noconfig
--- fltk1.3-1.3.4/debian/fix-fltk-targets-noconfig 2018-03-15
16:56:39.000000000 -0400
+++ fltk1.3-1.3.4/debian/fix-fltk-targets-noconfig 1969-12-31
19:00:00.000000000 -0500
@@ -1,34 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-my $to_untag = '';
-while (<>) {
-
s,(\$\{_IMPORT_PREFIX}/lib)(?!/$ENV{DEB_HOST_MULTIARCH}),$1/$ENV{DEB_HOST_MULTIARCH},g;
- s,\.so\.1\.3\.\d*,\.so,g;
- s,([^a-z]fltk\w*(?<!_SHARED))(\W),${1}_STATIC$2,g;
- s,(libfltk\w*)_SHARED,$1,g;
-
- if (/^#/) {
- $to_untag =~ s/_SHARED//g;
- print $to_untag;
- if (/"(fltk.*)_SHARED"/) {
- $to_untag = ("# Create imported target $1\n" .
- "add_library($1 SHARED IMPORTED)\n\n$_");
- } else {
- $to_untag = '';
- }
- } elsif ($to_untag) {
- next if /IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG/;
- $to_untag .= $_;
- }
- print;
-}
-
-print <<EOF;
-
-# Don't enforce the existence of fluid when asked to skip it.
-# (See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855040.)
-if(FLTK_SKIP_FLUID)
- list(REMOVE_ITEM _IMPORT_CHECK_TARGETS fluid)
-endif()
-EOF
diff -Nru fltk1.3-1.3.4/debian/fix-fltk-targets-none
fltk1.3-1.3.4/debian/fix-fltk-targets-none
--- fltk1.3-1.3.4/debian/fix-fltk-targets-none 1969-12-31 19:00:00.000000000
-0500
+++ fltk1.3-1.3.4/debian/fix-fltk-targets-none 2019-02-27 21:21:30.000000000
-0500
@@ -0,0 +1,34 @@
+#!/usr/bin/perl -w
+use strict;
+
+my $to_untag = '';
+while (<>) {
+
s,(\$\{_IMPORT_PREFIX}/lib)(?!/$ENV{DEB_HOST_MULTIARCH}),$1/$ENV{DEB_HOST_MULTIARCH},g;
+ s,\.so\.1\.3\.\d*,\.so,g;
+ s,([^a-z]fltk\w*(?<!_SHARED))(\W),${1}_STATIC$2,g;
+ s,(libfltk\w*)_SHARED,$1,g;
+
+ if (/^#/) {
+ $to_untag =~ s/_SHARED//g;
+ print $to_untag;
+ if (/"(fltk.*)_SHARED"/) {
+ $to_untag = ("# Create imported target $1\n" .
+ "add_library($1 SHARED IMPORTED)\n\n$_");
+ } else {
+ $to_untag = '';
+ }
+ } elsif ($to_untag) {
+ next if /IMPORTED_LINK_INTERFACE_LIBRARIES_NONE/;
+ $to_untag .= $_;
+ }
+ print;
+}
+
+print <<EOF;
+
+# Don't enforce the existence of fluid when asked to skip it.
+# (See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855040.)
+if(FLTK_SKIP_FLUID)
+ list(REMOVE_ITEM _IMPORT_CHECK_TARGETS fluid)
+endif()
+EOF
diff -Nru fltk1.3-1.3.4/debian/patches/debian-changes
fltk1.3-1.3.4/debian/patches/debian-changes
--- fltk1.3-1.3.4/debian/patches/debian-changes 2018-03-15 22:20:20.000000000
-0400
+++ fltk1.3-1.3.4/debian/patches/debian-changes 2019-02-27 21:21:30.000000000
-0500
@@ -1,10 +1,11 @@
Combined patches from git.
--- fltk1.3-1.3.4.orig/.gitignore
+++ fltk1.3-1.3.4/.gitignore
-@@ -1,3 +1,10 @@
+@@ -1,3 +1,11 @@
+# Start Debian additions
+/.pc
+/CMakeTmp
++/aclocal.m4
+/cairo/libfltk_cairo.so*
+/documentation/doxygen_sqlite3.db
+# End Debian additions
@@ -60,82 +61,35 @@
#
# Object files...
#
---- fltk1.3-1.3.4.orig/configure
-+++ fltk1.3-1.3.4/configure
-@@ -741,6 +741,7 @@ infodir
- docdir
- oldincludedir
- includedir
-+runstatedir
- localstatedir
- sharedstatedir
- sysconfdir
-@@ -839,6 +840,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 +1093,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 +1239,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 +1392,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]
-@@ -3978,9 +3990,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 +8609,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
-@@ -310,9 +310,9 @@ if test x$enable_shared = xyes; then
+@@ -40,6 +40,7 @@ OPTIM="${OPTIM:=}"
+ dnl Find compiler commands...
+ AC_PROG_CC
+ AC_PROG_CXX
++PKG_PROG_PKG_CONFIG
+
+ dnl So --with-archflags option is used during "checking size of long"
+ case $host_os in
+@@ -132,7 +133,7 @@ if test x$enable_cairoext = xyes; then
+ dnl FIXME This part should be fixed so configure do not depend on
+ dnl we do not rely on pkg-config .
+ CAIRODIR="cairo"
+- CAIROFLAGS="`pkg-config --cflags cairo`"
++ CAIROFLAGS="`$PKG_CONFIG --cflags cairo`"
+ CAIROLIBS="-lcairo -lpixman-1"
+ CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+ LINKFLTKCAIRO="../lib/libfltk_cairo.a"
+@@ -146,7 +147,7 @@ else
+ dnl FIXME This part should be fixed so configure do not depend on
+ dnl we do not rely on pkg-config .
+ CAIRODIR="cairo"
+- CAIROFLAGS="`pkg-config --cflags cairo`"
++ CAIROFLAGS="`$PKG_CONFIG --cflags cairo`"
+ CAIROLIBS="-lcairo -lpixman-1"
+ CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+ LINKFLTKCAIRO="../lib/libfltk_cairo.a"
+@@ -310,9 +311,9 @@ if test x$enable_shared = xyes; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
fi
@@ -148,7 +102,7 @@
;;
aix*)
DSONAME="libfltk_s.a"
-@@ -1454,7 +1454,7 @@ case $host_os in
+@@ -1454,7 +1455,7 @@ case $host_os in
if test x$prefix = xNONE; then
AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk")
else
diff -Nru fltk1.3-1.3.4/debian/rules fltk1.3-1.3.4/debian/rules
--- fltk1.3-1.3.4/debian/rules 2018-03-15 22:06:21.000000000 -0400
+++ fltk1.3-1.3.4/debian/rules 2019-02-27 21:21:30.000000000 -0500
@@ -1,29 +1,30 @@
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-
-export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+DPKG_EXPORT_BUILDFLAGS = yes
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildflags.mk
XCFLAGS = -Wall -Wunused -Wno-format-y2k -fPIE -fno-strict-aliasing
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
GAMES = blocks checkers sudoku
EXTRA_MFLAGS = OPTIM="$(CFLAGS) $(XCFLAGS)" STRIP=@:
-export DEB_HOST_MULTIARCH
+PKG_CONFIG = /usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config
+export PKG_CONFIG
%:
- dh $@ --without autoreconf
+ dh $@
+
+override_dh_autoreconf:
+ -mv configure debian/configure.saved
# FLTK uses a hand-maintained configh.in and an autoheader-unfriendly
-# configure.ac, breaking autoreconf (which runs by default in compat 10).
+# configure.ac.
+ AUTOHEADER=/bin/true dh_autoreconf
override_dh_auto_clean:
+ [ -e configure ] || mv debian/configure.saved configure
[ -e fltk.spec.saved ] || mv fltk.spec fltk.spec.saved
# Avoid reconfigure. Removed by distclean. >> deliberate -- keeping
# existing contents allows for proper cleaning between builds.
@@ -34,24 +35,23 @@
override_dh_clean:
rm -rf CMakeTmp
dh_clean documentation/doxygen_sqlite3.db debian/common-build-stamp
- chmod +x debian/fix-fltk-targets-noconfig
+ chmod +x debian/fix-fltk-targets-none
override_dh_auto_configure:
[ -e fltk.spec.saved ] || mv fltk.spec fltk.spec.saved
ifneq "" "$(filter libfltk1.3-dev, $(shell dh_listpackages))"
mkdir -p CMakeTmp
- cd CMakeTmp && cmake \
- -DCMAKE_INSTALL_PREFIX:STRING=/usr -DOPTION_CAIRO:BOOL=ON \
+ dh_auto_configure -S cmake -B CMakeTmp -- -DOPTION_CAIRO:BOOL=ON \
-DOPTION_BUILD_SHARED_LIBS:BOOL=ON -DOPTION_CREATE_LINKS:BOOL=ON \
- -DOPTION_BUILD_EXAMPLES:BOOL=OFF ..
+ -DOPTION_BUILD_EXAMPLES:BOOL=OFF
sed -e 's/ STATIC /_STATIC&/' \
CMakeTmp/CMakeFiles/Export/share/fltk/FLTK-Targets.cmake \
> CMakeTmp/etc/FLTK-Targets.cmake
- debian/fix-fltk-targets-noconfig \
- CMakeTmp/CMakeFiles/Export/share/fltk/FLTK-Targets-noconfig.cmake \
- > CMakeTmp/etc/FLTK-Targets-noconfig.cmake
+ debian/fix-fltk-targets-none \
+ CMakeTmp/CMakeFiles/Export/share/fltk/FLTK-Targets-none.cmake \
+ > CMakeTmp/etc/FLTK-Targets-none.cmake
endif
- dh_auto_configure -- FTCONFIG="/usr/bin/pkg-config freetype2" \
+ dh_auto_configure -- FTCONFIG="$(PKG_CONFIG) freetype2" \
DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
--enable-shared --enable-cairo --enable-cp936 --with-links \
--with-optim=$(filter -O%,$(CXXFLAGS)) --libdir=$(libdir)
@@ -98,7 +98,7 @@
## libfltk1.3-dev
cp debian/CMakeCache.txt CMakeTmp/etc/*.cmake \
CMake/FLTK-Functions.cmake debian/tmp/usr/lib/fltk
- sed -e 's/ -fdebug-prefix-map=[^ ]*=\. / /' fltk-config \
+ sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' fltk-config \
> debian/tmp/usr/bin/fltk-config
chmod +x debian/tmp/usr/bin/fltk-config
@@ -112,7 +112,7 @@
override_dh_install-arch:
## libfltk1.3-dev
- sed -e 's/ -fdebug-prefix-map=[^ ]*=\. / /' fltk-config \
+ sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' fltk-config \
> debian/tmp/usr/bin/fltk-config
chmod +x debian/tmp/usr/bin/fltk-config
dh_install
@@ -122,3 +122,9 @@
override_dh_makeshlibs:
dh_makeshlibs -V
+
+override_dh_installchangelogs:
+ dh_installchangelogs
+ for x in debian/*/usr/share/doc/*/changelog; do \
+ mv -v $$x `dirname $$x`/NEWS; \
+ done
