diff -Nru gimp-2.10.34/debian/changelog gimp-2.10.34/debian/changelog --- gimp-2.10.34/debian/changelog 2023-02-18 18:08:37.000000000 +0000 +++ gimp-2.10.34/debian/changelog 2023-02-18 18:08:37.000000000 +0000 @@ -1,4 +1,4 @@ -gimp (2.10.34-1build1~ubuntu2210) kinetic; urgency=medium +gimp (2.10.34-1build2~ubuntu2210) kinetic; urgency=medium * New upstream release diff -Nru gimp-2.10.34/debian/gimp.install gimp-2.10.34/debian/gimp.install --- gimp-2.10.34/debian/gimp.install 2023-02-18 18:08:37.000000000 +0000 +++ gimp-2.10.34/debian/gimp.install 2022-08-01 13:39:35.000000000 +0000 @@ -3,14 +3,133 @@ usr/bin/gimp-console usr/bin/gimp-console-?.?? usr/bin/gimp-test-clipboard-?.? -usr/lib/*/gimp/gimp-debug-tool-?.? usr/lib/gimp/ -usr/lib/*/gimp/2.0/environ/ usr/lib/gimp/2.0/ -usr/lib/*/gimp/2.0/modules/ usr/lib/gimp/2.0/ -usr/lib/*/gimp/2.0/interpreters/ usr/lib/gimp/2.0/ +usr/lib/gimp/gimp-debug-tool-?.? +usr/lib/gimp/2.0/environ/ +usr/lib/gimp/2.0/modules/ +usr/lib/gimp/2.0/interpreters/ usr/share/applications usr/share/man/man1/gimp.1 usr/share/man/man1/gimp-?.??.1 usr/share/man/man1/gimp-console.1 usr/share/man/man1/gimp-console-?.??.1 usr/share/metainfo -usr/lib/*/gimp/2.0/plug-ins/ usr/lib/gimp/2.0/ +usr/lib/gimp/2.0/plug-ins/align-layers +usr/lib/gimp/2.0/plug-ins/animation-optimize +usr/lib/gimp/2.0/plug-ins/animation-play +usr/lib/gimp/2.0/plug-ins/blinds +usr/lib/gimp/2.0/plug-ins/blur +usr/lib/gimp/2.0/plug-ins/border-average +usr/lib/gimp/2.0/plug-ins/busy-dialog +usr/lib/gimp/2.0/plug-ins/cartoon +usr/lib/gimp/2.0/plug-ins/checkerboard +usr/lib/gimp/2.0/plug-ins/cml-explorer +usr/lib/gimp/2.0/plug-ins/color-cube-analyze +usr/lib/gimp/2.0/plug-ins/color-enhance +usr/lib/gimp/2.0/plug-ins/colorify +usr/lib/gimp/2.0/plug-ins/colormap-remap +usr/lib/gimp/2.0/plug-ins/compose +usr/lib/gimp/2.0/plug-ins/contrast-retinex +usr/lib/gimp/2.0/plug-ins/crop-zealous +usr/lib/gimp/2.0/plug-ins/curve-bend +usr/lib/gimp/2.0/plug-ins/decompose +usr/lib/gimp/2.0/plug-ins/depth-merge +usr/lib/gimp/2.0/plug-ins/despeckle +usr/lib/gimp/2.0/plug-ins/destripe +usr/lib/gimp/2.0/plug-ins/edge-dog +usr/lib/gimp/2.0/plug-ins/emboss +usr/lib/gimp/2.0/plug-ins/file-aa +usr/lib/gimp/2.0/plug-ins/file-bmp +usr/lib/gimp/2.0/plug-ins/file-cel +usr/lib/gimp/2.0/plug-ins/file-compressor +usr/lib/gimp/2.0/plug-ins/file-csource +usr/lib/gimp/2.0/plug-ins/file-darktable +usr/lib/gimp/2.0/plug-ins/file-dds +usr/lib/gimp/2.0/plug-ins/file-desktop-link +usr/lib/gimp/2.0/plug-ins/file-dicom +usr/lib/gimp/2.0/plug-ins/file-exr +usr/lib/gimp/2.0/plug-ins/file-faxg3 +usr/lib/gimp/2.0/plug-ins/file-fits +usr/lib/gimp/2.0/plug-ins/file-fli +usr/lib/gimp/2.0/plug-ins/file-gbr +usr/lib/gimp/2.0/plug-ins/file-gegl +usr/lib/gimp/2.0/plug-ins/file-gif-load +usr/lib/gimp/2.0/plug-ins/file-gif-save +usr/lib/gimp/2.0/plug-ins/file-gih +usr/lib/gimp/2.0/plug-ins/file-glob +usr/lib/gimp/2.0/plug-ins/file-header +usr/lib/gimp/2.0/plug-ins/file-heif +usr/lib/gimp/2.0/plug-ins/file-html-table +usr/lib/gimp/2.0/plug-ins/file-ico +usr/lib/gimp/2.0/plug-ins/file-jp2-load +usr/lib/gimp/2.0/plug-ins/file-jpeg +usr/lib/gimp/2.0/plug-ins/file-mng +usr/lib/gimp/2.0/plug-ins/file-pat +usr/lib/gimp/2.0/plug-ins/file-pcx +usr/lib/gimp/2.0/plug-ins/file-pdf-load +usr/lib/gimp/2.0/plug-ins/file-pdf-save +usr/lib/gimp/2.0/plug-ins/file-pix +usr/lib/gimp/2.0/plug-ins/file-png +usr/lib/gimp/2.0/plug-ins/file-pnm +usr/lib/gimp/2.0/plug-ins/file-ps +usr/lib/gimp/2.0/plug-ins/file-psd +usr/lib/gimp/2.0/plug-ins/file-psp +usr/lib/gimp/2.0/plug-ins/file-raw-data +usr/lib/gimp/2.0/plug-ins/file-raw-placeholder +usr/lib/gimp/2.0/plug-ins/file-rawtherapee +usr/lib/gimp/2.0/plug-ins/file-sgi +usr/lib/gimp/2.0/plug-ins/file-sunras +usr/lib/gimp/2.0/plug-ins/file-svg +usr/lib/gimp/2.0/plug-ins/file-tga +usr/lib/gimp/2.0/plug-ins/file-tiff +usr/lib/gimp/2.0/plug-ins/file-webp +usr/lib/gimp/2.0/plug-ins/file-wmf +usr/lib/gimp/2.0/plug-ins/file-xbm +usr/lib/gimp/2.0/plug-ins/file-xmc +usr/lib/gimp/2.0/plug-ins/file-xpm +usr/lib/gimp/2.0/plug-ins/file-xwd +usr/lib/gimp/2.0/plug-ins/film +usr/lib/gimp/2.0/plug-ins/filter-pack +usr/lib/gimp/2.0/plug-ins/flame +usr/lib/gimp/2.0/plug-ins/fractal-explorer +usr/lib/gimp/2.0/plug-ins/fractal-trace +usr/lib/gimp/2.0/plug-ins/gfig +usr/lib/gimp/2.0/plug-ins/gimpressionist +usr/lib/gimp/2.0/plug-ins/goat-exercise +usr/lib/gimp/2.0/plug-ins/gradient-flare +usr/lib/gimp/2.0/plug-ins/gradient-map +usr/lib/gimp/2.0/plug-ins/grid +usr/lib/gimp/2.0/plug-ins/guillotine +usr/lib/gimp/2.0/plug-ins/help +usr/lib/gimp/2.0/plug-ins/hot +usr/lib/gimp/2.0/plug-ins/ifs-compose +usr/lib/gimp/2.0/plug-ins/imagemap +usr/lib/gimp/2.0/plug-ins/jigsaw +usr/lib/gimp/2.0/plug-ins/lighting +usr/lib/gimp/2.0/plug-ins/mail +usr/lib/gimp/2.0/plug-ins/map-object +usr/lib/gimp/2.0/plug-ins/max-rgb +usr/lib/gimp/2.0/plug-ins/metadata-editor +usr/lib/gimp/2.0/plug-ins/metadata-viewer +usr/lib/gimp/2.0/plug-ins/nl-filter +usr/lib/gimp/2.0/plug-ins/pagecurl +usr/lib/gimp/2.0/plug-ins/photocopy +usr/lib/gimp/2.0/plug-ins/plugin-browser +usr/lib/gimp/2.0/plug-ins/print +usr/lib/gimp/2.0/plug-ins/procedure-browser +usr/lib/gimp/2.0/plug-ins/qbist +usr/lib/gimp/2.0/plug-ins/sample-colorize +usr/lib/gimp/2.0/plug-ins/screenshot +usr/lib/gimp/2.0/plug-ins/script-fu +usr/lib/gimp/2.0/plug-ins/selection-to-path +usr/lib/gimp/2.0/plug-ins/sharpen +usr/lib/gimp/2.0/plug-ins/smooth-palette +usr/lib/gimp/2.0/plug-ins/softglow +usr/lib/gimp/2.0/plug-ins/sparkle +usr/lib/gimp/2.0/plug-ins/sphere-designer +usr/lib/gimp/2.0/plug-ins/tile +usr/lib/gimp/2.0/plug-ins/tile-small +usr/lib/gimp/2.0/plug-ins/unit-editor +usr/lib/gimp/2.0/plug-ins/van-gogh-lic +usr/lib/gimp/2.0/plug-ins/warp +usr/lib/gimp/2.0/plug-ins/wavelet-decompose +usr/lib/gimp/2.0/plug-ins/web-browser diff -Nru gimp-2.10.34/debian/libgimp2.0-dev.install gimp-2.10.34/debian/libgimp2.0-dev.install --- gimp-2.10.34/debian/libgimp2.0-dev.install 2023-02-18 18:08:37.000000000 +0000 +++ gimp-2.10.34/debian/libgimp2.0-dev.install 2023-02-18 18:08:37.000000000 +0000 @@ -1,5 +1,5 @@ -usr/lib/*/*.so -usr/lib/*/pkgconfig/*.pc +usr/lib/*.so usr/lib/x86_64-linux-gnu +usr/lib/pkgconfig/*.pc usr/lib/x86_64-linux-gnu/pkgconfig usr/share/man/man1/gimptool-?.?.1 usr/share/aclocal/gimp-?.?.m4 usr/include/ diff -Nru gimp-2.10.34/debian/libgimp2.0.install gimp-2.10.34/debian/libgimp2.0.install --- gimp-2.10.34/debian/libgimp2.0.install 2023-02-18 18:08:37.000000000 +0000 +++ gimp-2.10.34/debian/libgimp2.0.install 2023-02-18 18:08:37.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/lib*.so.* +usr/lib/lib*.so.* usr/lib/x86_64-linux-gnu usr/share/locale/*/LC_MESSAGES/*-libgimp.mo diff -Nru gimp-2.10.34/debian/rules gimp-2.10.34/debian/rules --- gimp-2.10.34/debian/rules 2023-02-18 18:08:37.000000000 +0000 +++ gimp-2.10.34/debian/rules 2023-02-18 18:08:37.000000000 +0000 @@ -1,4 +1,5 @@ #!/usr/bin/make -f + include /usr/share/dpkg/architecture.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 @@ -12,10 +13,12 @@ %: dh $@ +# Don't switch to Multi-Arch yet because of potential incompatibility with +# third-party add-ons override_dh_auto_configure: dh_auto_configure -- \ - --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gimp \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib/gimp \ --disable-static \ --disable-python \ --disable-check-update \ @@ -30,17 +33,24 @@ dh_autoreconf --as-needed # exclude since we manually add the Suggests in debian/control -override_dh_shlibdeps: - dh_shlibdeps -Xdebian/libgimp2.0/usr/lib/$(DEB_HOST_MULTIARCH) \ +override_dh_shlibdeps: + dh_shlibdeps -Xusr/lib/gimp/2.0/modules/libcontroller-midi.so \ + -Xdebian/libgimp2.0/usr/lib/ \ + -Xdebian/libgimp2.0/usr/lib/*/libgimpui-2.0.so.0.1000.34 \ + -Xusr/lib/*/libgimpwidgets-2.0.so.0.1000.34 \ -Xdebian/libgimp2.0-dev/usr/bin/gimptool-2.0 \ - -Xusr/lib/$(DEB_HOST_MULTIARCH)/gimp/2.0/modules \ + -Xusr/lib/gimp/2.0/modules \ -Xusr/bin/gimp-2.10 \ - -Xusr/lib/$(DEB_HOST_MULTIARCH)/gimp/2.0/plug-ins \ + -Xusr/lib/gimp/2.0/plug-ins \ -Xusr/bin/gimp-console-2.10 \ - -Xusr/lib/$(DEB_HOST_MULTIARCH)/gimp/gimp-debug-tool-2.0 + -Xusr/lib/gimp/gimp-debug-tool-2.0 override_dh_makeshlibs: - dh_makeshlibs -X/usr/lib/gimp/$(DEB_HOST_MULTIARCH)/2.0/modules -- -c4 + dh_makeshlibs -X/usr/lib/gimp/2.0/modules -- -c4 execute_before_dh_install: find debian/tmp -name '*.la' -print -delete + +override_dh_install: + sed -i -e "s/x86_64-linux-gnu/$(DEB_HOST_MULTIARCH)/g" debian/*.install + dh_install