diff options
-rw-r--r-- | debian/changelog | 9 | ||||
-rwxr-xr-x | debian/rules | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 2fcb5cc..1a5e712 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +fltk1.3 (1.3.8-2) unstable; urgency=medium + + * debian/rules: Don't count on debian/tmp/usr/bin/fltk-config. In + particular, in builds that cover only architecture-dependent binary + packages, override_dh_auto_install-indep won't recreate the file + between override_dh_auto_install-arch and override_dh_install-arch. + + -- Aaron M. Ucko <ucko@debian.org> Sat, 15 Jan 2022 23:33:09 -0500 + fltk1.3 (1.3.8-1) unstable; urgency=medium [ Aaron M. Ucko ] diff --git a/debian/rules b/debian/rules index c99f480..2c0792b 100755 --- a/debian/rules +++ b/debian/rules @@ -100,10 +100,10 @@ override_dh_auto_install-arch: ## libfltk1.3-dev cp debian/CMakeCache.txt CMakeTmp/etc/*.cmake \ CMake/FLTK-Functions.cmake debian/tmp/usr/lib/fltk - sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' debian/tmp/usr/bin/fltk-config \ + sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' fltk-config \ > debian/tmp/usr/bin/$(FLTK_CONFIG) chmod 755 debian/tmp/usr/bin/$(FLTK_CONFIG) - rm debian/tmp/usr/bin/fltk-config + rm -f debian/tmp/usr/bin/fltk-config ifeq "" "$(filter nodoc,$(DEB_BUILD_OPTIONS))" override_dh_auto_install-indep: @@ -112,10 +112,10 @@ endif override_dh_install-arch: ## libfltk1.3-dev - sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' debian/tmp/usr/bin/fltk-config \ + sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' fltk-config \ > debian/tmp/usr/bin/$(FLTK_CONFIG) chmod 755 debian/tmp/usr/bin/$(FLTK_CONFIG) - rm debian/tmp/usr/bin/fltk-config + rm -f debian/tmp/usr/bin/fltk-config dh_install override_dh_installdocs: |