diff -Nru fltk1.1-1.1.10/debian/changelog fltk1.1-1.1.10/debian/changelog --- fltk1.1-1.1.10/debian/changelog 2018-03-13 00:59:37.000000000 +0000 +++ fltk1.1-1.1.10/debian/changelog 2019-02-17 01:46:35.000000000 +0000 @@ -1,3 +1,32 @@ +fltk1.1 (1.1.10-26ubuntu1) disco; urgency=medium + + * debian/rules: Remove override_dh_installchangelogs because Ubuntu doesn't + install changelogs by default, and the logic causes an FTBFS. + + -- Logan Rosen Sat, 16 Feb 2019 20:46:35 -0500 + +fltk1.1 (1.1.10-26) unstable; urgency=medium + + * configure: Revert local changes in favor of using (dh_)autoreconf. + * debian/compat: Go ahead and advance to 11. + * debian/control: + - Advance debhelper B-D version constraint to (>= 11~). + - Standards-Version: 4.3.0 (fully compliant at this point). + * debian/rules: + - Allow (dh_)autoreconf, albeit with autoheader suppressed, and + configure saved and restored rather than deleted on cleanup. + - Use /usr/share/dpkg/{architecture,buildflags}.mk instead of calling + dpkg-{architecture,buildflags} directly (and piecemeal). + - Use host-specific pkg-config in FTCONFIG for the sake of cross + builds, per Helmut Grohne. (Closes: #914480.) + - override_dh_auto_install-arch: Skip test/ here too for cross builds. + - override_dh_install-arch: Strip *all* -f*-prefix-map=* flags from + fltk-config, per Chris Lamb. (Closes: #909078.) + - override_dh_installchangelogs: Install CHANGES as NEWS(.gz), not + changelog(.gz). + + -- Aaron M. Ucko Sun, 10 Feb 2019 23:07:45 -0500 + fltk1.1 (1.1.10-25) unstable; urgency=medium * debian/rules (override_dh_auto_build-indep): Cover more subdirectories diff -Nru fltk1.1-1.1.10/debian/compat fltk1.1-1.1.10/debian/compat --- fltk1.1-1.1.10/debian/compat 2018-03-12 00:46:07.000000000 +0000 +++ fltk1.1-1.1.10/debian/compat 2019-02-11 04:07:45.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru fltk1.1-1.1.10/debian/control fltk1.1-1.1.10/debian/control --- fltk1.1-1.1.10/debian/control 2018-03-12 01:29:25.000000000 +0000 +++ fltk1.1-1.1.10/debian/control 2019-02-17 01:46:35.000000000 +0000 @@ -1,8 +1,9 @@ Source: fltk1.1 -Maintainer: Aaron M. Ucko +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Aaron M. Ucko Section: libs Priority: optional -Build-Depends: debhelper (>= 10~), +Build-Depends: debhelper (>= 11~), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libjpeg-dev, @@ -15,7 +16,7 @@ zlib1g-dev | libz-dev Build-Depends-Arch: libasound2-dev [linux-any] Build-Depends-Indep: htmldoc -Standards-Version: 4.1.3 +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/ucko/fltk1.1 Vcs-Git: https://salsa.debian.org/ucko/fltk1.1.git Homepage: http://www.fltk.org/ diff -Nru fltk1.1-1.1.10/debian/.gitignore fltk1.1-1.1.10/debian/.gitignore --- fltk1.1-1.1.10/debian/.gitignore 2017-01-25 04:34:43.000000000 +0000 +++ fltk1.1-1.1.10/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -*.debhelper -*.debhelper.log -*.substvars -debhelper-build-stamp -files -fltk1.1-doc -fltk1.1-games -libfltk1.1 -libfltk1.1-dev -tmp diff -Nru fltk1.1-1.1.10/debian/patches/debian-changes fltk1.1-1.1.10/debian/patches/debian-changes --- fltk1.1-1.1.10/debian/patches/debian-changes 2018-03-13 00:59:37.000000000 +0000 +++ fltk1.1-1.1.10/debian/patches/debian-changes 2019-02-17 01:46:35.000000000 +0000 @@ -1,105 +1,4 @@ Combined patches from git. ---- /dev/null -+++ fltk1.1-1.1.10/.gitignore -@@ -0,0 +1,98 @@ -+.pc -+FL/Makefile -+config.* -+documentation/*.[0-9] -+documentation/fltk.p* -+fltk-config -+fltk-config.unhardened -+fltk.list -+fluid/fluid -+fluid/fluid-shared -+lib/lib*.a -+makeinclude -+src/lib*.so* -+test/CubeView -+test/CubeViewUI.cxx -+test/CubeViewUI.h -+test/adjuster -+test/arc -+test/ask -+test/bitmap -+test/blocks -+test/boxtype -+test/browser -+test/button -+test/buttons -+test/checkers -+test/clock -+test/colbrowser -+test/color_chooser -+test/cube -+test/cursor -+test/curve -+test/demo -+test/doublebuffer -+test/editor -+test/fast_slow -+test/fast_slow.cxx -+test/fast_slow.h -+test/file_chooser -+test/fonts -+test/forms -+test/fractals -+test/fullscreen -+test/gl_overlay -+test/glpuzzle -+test/hello -+test/help -+test/iconize -+test/image -+test/inactive -+test/inactive.cxx -+test/inactive.h -+test/input -+test/input_choice -+test/keyboard -+test/keyboard_ui.cxx -+test/keyboard_ui.h -+test/label -+test/line_style -+test/list_visuals -+test/mandelbrot -+test/mandelbrot_ui.cxx -+test/mandelbrot_ui.h -+test/menubar -+test/message -+test/minimum -+test/navigation -+test/output -+test/overlay -+test/pack -+test/pixmap -+test/pixmap_browser -+test/preferences -+test/preferences.cxx -+test/preferences.h -+test/radio -+test/radio.cxx -+test/radio.h -+test/resize -+test/resize.cxx -+test/resize.h -+test/resizebox -+test/scroll -+test/shape -+test/subwindow -+test/sudoku -+test/symbols -+test/tabs -+test/tabs.cxx -+test/tabs.h -+test/threads -+test/tile -+test/tiled_image -+test/unittests -+test/valuators -+test/valuators.cxx -+test/valuators.h -+*/*.o --- fltk1.1-1.1.10.orig/FL/forms.H +++ fltk1.1-1.1.10/FL/forms.H @@ -651,7 +651,7 @@ inline int fl_show_question(const char* @@ -158,113 +57,6 @@ portable-dist: epm -v -s fltk.xpm fltk ---- fltk1.1-1.1.10.orig/configure -+++ fltk1.1-1.1.10/configure -@@ -1957,10 +1957,10 @@ if test x$enable_shared = xyes; then - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" -- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" -- if test "x$libdir" != "x/usr/lib"; then -- DSOLINK="-Wl,-rpath,$libdir" -- fi -+ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" -+# if test "x$libdir" != "x/usr/lib"; then -+# DSOLINK="-Wl,-rpath,$libdir" -+# fi - ;; - AIX*) - DSONAME="libfltk_s.a" -@@ -7926,6 +7926,7 @@ _ACEOF - fi - - -+SAVELIBS=$LIBS - { echo "$as_me:$LINENO: checking for library containing dlsym" >&5 - echo $ECHO_N "checking for library containing dlsym... $ECHO_C" >&6; } - if test "${ac_cv_search_dlsym+set}" = set; then -@@ -8145,6 +8146,7 @@ _ACEOF - fi - - -+LIBS=$SAVELIBS - - AUDIOLIBS="" - -@@ -8771,8 +8773,8 @@ echo "$as_me: WARNING: Cannot find syste - else - ZLIBINC="" - ZLIB="" -- LIBS="-lz $LIBS" -- IMAGELIBS="-lz $IMAGELIBS" -+ # LIBS="-lz $LIBS" -+ # IMAGELIBS="-lz $IMAGELIBS" - STATICIMAGELIBS="-lz $STATICIMAGELIBS" - cat >>confdefs.h <<\_ACEOF - #define HAVE_LIBZ 1 -@@ -9521,6 +9523,7 @@ _ACEOF - break - fi - done -+ LIBS=$SAVELIBS - fi - fi - -@@ -11233,7 +11236,7 @@ echo "$as_me: error: Configure could not - echo "$as_me: WARNING: Ignoring libraries \"$X_PRE_LIBS\" requested by configure." >&2;} - fi - -- LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS" -+ LIBS="$LIBS -lX11 $X_EXTRA_LIBS" - CFLAGS="$CFLAGS $X_CFLAGS" - CXXFLAGS="$CXXFLAGS $X_CFLAGS" - LDFLAGS="$X_LIBS $LDFLAGS" -@@ -11794,12 +11797,12 @@ if test $ac_cv_header_GL_glu_h = yes; th - #define HAVE_GL_GLU_H 1 - _ACEOF - -- if test x$ac_cv_lib_GL_glXMakeCurrent = xyes; then -- GLLIB="-lGLU $GLLIB" -- fi -- if test x$ac_cv_lib_MesaGL_glXMakeCurrent = xyes; then -- GLLIB="-lMesaGLU $GLLIB" -- fi -+ # if test x$ac_cv_lib_GL_glXMakeCurrent = xyes; then -+ # GLLIB="-lGLU $GLLIB" -+ # fi -+ # if test x$ac_cv_lib_MesaGL_glXMakeCurrent = xyes; then -+ # GLLIB="-lMesaGLU $GLLIB" -+ # fi - - fi - -@@ -12080,7 +12083,7 @@ if test "${ac_cv_lib_Xft_XftDrawCreate+s - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lXft $LIBS" -+LIBS="-lXft -lfontconfig $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -12140,7 +12143,7 @@ if test $ac_cv_lib_Xft_XftDrawCreate = y - #define USE_XFT 1 - _ACEOF - -- LIBS="-lXft $LIBS" -+ LIBS="-lXft -lfontconfig $LIBS" - fi - - fi -@@ -12658,7 +12661,7 @@ _ACEOF - - else - cat >>confdefs.h <<_ACEOF --#define FLTK_DOCDIR "$prefix/share/doc/fltk" -+#define FLTK_DOCDIR "$prefix/share/doc/fltk1.1-doc/HTML" - _ACEOF - - fi --- fltk1.1-1.1.10.orig/configure.in +++ fltk1.1-1.1.10/configure.in @@ -202,10 +202,10 @@ if test x$enable_shared = xyes; then diff -Nru fltk1.1-1.1.10/debian/rules fltk1.1-1.1.10/debian/rules --- fltk1.1-1.1.10/debian/rules 2018-03-13 00:28:48.000000000 +0000 +++ fltk1.1-1.1.10/debian/rules 2019-02-17 01:46:34.000000000 +0000 @@ -1,27 +1,33 @@ #!/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) - -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) +PKG_CONFIG = /usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config libdir = /usr/lib/$(DEB_HOST_MULTIARCH) GAMES = blocks checkers sudoku EXTRA_MFLAGS = OPTIM="$(CFLAGS) $(XCFLAGS)" STRIP=@: %: - 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. + AUTOHEADER=/bin/true dh_autoreconf + +override_dh_autoreconf_clean: + dh_autoreconf_clean + [ -e configure ] || mv debian/configure.saved configure override_dh_auto_configure: mv fltk.spec fltk.spec.saved - 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-threads --enable-xft \ --enable-xinerama --without-links --libdir=$(libdir) \ @@ -52,7 +58,7 @@ dh_clean debian/libfltk1.1.symbols.$(DEB_HOST_ARCH) override_dh_auto_install-arch: - dh_auto_install + dh_auto_install -- $(EXTRA_MFLAGS) DIRS='$$(IMAGEDIRS) src fluid' mkdir -p debian/tmp/usr/games mkdir -p debian/tmp/usr/lib/fltk mkdir -p debian/tmp/usr/share/applications @@ -81,7 +87,7 @@ override_dh_install-arch: ## libfltk1.1-dev - sed -e 's/ -fdebug-prefix-map=[^ ]*=\. / /' fltk-config \ + sed -e 's/ -f[a-z]*-prefix-map=[^ ]*/ /g' fltk-config \ > debian/tmp/usr/bin/fltk-config chmod +x debian/tmp/usr/bin/fltk-config dh_install