Merge branch 'release/debian/0.999-12.2'debian/0.999-12.2debian/trixie

5 files changed, 13 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 4f381f9..fd02368 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xsane (0.999-12.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch from Jeremy Bícha to stop building and installing the gimp
+    plugin, as it's not compatible anymore with Gimp 3.0.  Closes: #1088080
+  * Build-Depend on libjpeg-dev instead of a versioned libjpeg-turbo-dev.
+    Closes: #1089018
+
+ -- Mattia Rizzolo <mattia@debian.org>  Mon, 03 Feb 2025 14:21:04 +0100
+
 xsane (0.999-12.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 20d07b5..d5dc69c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Standards-Version: 4.6.0.0
 Build-Depends:
  debhelper-compat (= 13),
  gettext,
- libgimp2.0-dev,
+ libgtk2.0-dev,
  libgtk-3-dev,
- libjpeg62-turbo-dev,
+ libjpeg-dev,
  liblcms2-dev,
  libpng-dev,
  libsane-dev (>= 1.0.27),
diff --git a/debian/rules b/debian/rules
index a078a1d..09bfbbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-gimp
+	dh_auto_configure -- --disable-gimp
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/debian/xsane.dirs b/debian/xsane.dirs
index 92dda21..bfe3372 100644
--- a/debian/xsane.dirs
+++ b/debian/xsane.dirs
@@ -1,4 +1,3 @@
-usr/lib/gimp/2.0/plug-ins
 usr/share/pixmaps
 usr/share/icons/hicolor/256x256/apps
 usr/share/applications
diff --git a/debian/xsane.install b/debian/xsane.install
index b38ccc3..394f661 100644
--- a/debian/xsane.install
+++ b/debian/xsane.install
@@ -3,5 +3,4 @@ debian/xsane.png usr/share/icons/hicolor/256x256/apps
 usr/bin
 usr/share/man
 debian/ocr-scripts usr/share/xsane
-usr/bin/xsane usr/lib/gimp/2.0/plug-ins/xsane
 src/xsane-startimage.pnm usr/share/sane/xsane