Merging debian version 2.10.36-3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 37 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index ee8427e..57db772 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gimp (2.10.36-3) unstable; urgency=medium
+
+  [ Lukas Märdian ]
+  * Rename libraries for 64-bit time_t transition (Closes: #1062125)
+
+  [ Jeremy Bícha ]
+  * Build-depend on dpkg-dev (>= 1.22.5)
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Sat, 02 Mar 2024 17:37:14 -0500
+
 gimp (2.10.36-2~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 1046cf0..68b36e2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ XSBC-Original-Uploaders: Hideki Yamane <henrich@debian.org>, Jeremy Bícha <jbic
 Bugs: mailto:maintainers@lists.progress-linux.org
 Build-Depends: debhelper-compat (= 13),
                desktop-file-utils <!nocheck>,
+               dpkg-dev (>= 1.22.5),
                gegl (>= 1:0.4.38),
                gettext,
                glib-networking,
@@ -70,8 +71,8 @@ Homepage: https://www.gimp.org/
 
 Package: gimp
 Architecture: any
-Depends: libgimp2.0 (>= ${source:Upstream-Version}),
-         libgimp2.0 (<= ${source:Upstream-Version}-z),
+Depends: libgimp2.0t64 (>= ${source:Upstream-Version}),
+         libgimp2.0t64 (<= ${source:Upstream-Version}-z),
          gimp-data (>= ${source:Upstream-Version}),
          gimp-data (<= ${source:Upstream-Version}-z),
          graphviz,
@@ -113,7 +114,10 @@ Description: Data files for GIMP
  This package contains architecture-independent supporting data files
  for use with GIMP.
 
-Package: libgimp2.0
+Package: libgimp2.0t64
+Provides: ${t64:Provides}
+Replaces: libgimp2.0
+Breaks: libgimp2.0 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -131,7 +135,7 @@ Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgegl-dev (>= 1:0.4.38),
-         libgimp2.0 (= ${binary:Version}),
+         libgimp2.0t64 (= ${binary:Version}),
          libgtk2.0-dev (>= 2.12.5),
          pkg-config
 Suggests: libgimp2.0-doc
diff --git a/debian/libgimp2.0.install b/debian/libgimp2.0t64.install
index f9ea5a8..f9ea5a8 100644
--- a/debian/libgimp2.0.install
+++ b/debian/libgimp2.0t64.install
diff --git a/debian/libgimp2.0t64.lintian-overrides b/debian/libgimp2.0t64.lintian-overrides
new file mode 100644
index 0000000..27c0ed2
--- /dev/null
+++ b/debian/libgimp2.0t64.lintian-overrides
@@ -0,0 +1 @@
+libgimp2.0t64: package-name-doesnt-match-sonames libgimp2.0
diff --git a/debian/libgimp2.0.symbols b/debian/libgimp2.0t64.symbols
index ab28066..0174b20 100644
--- a/debian/libgimp2.0.symbols
+++ b/debian/libgimp2.0t64.symbols
@@ -1,5 +1,5 @@
-libgimp-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimp-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  _gimp_tile_backend_plugin_get_type@Base 2.10.0
  _gimp_tile_backend_plugin_new@Base 2.10.0
  _writechannel@Base 2.4.0
@@ -941,8 +941,8 @@ libgimp-2.0.so.0 libgimp2.0 #MINVER#
  gimp_vectors_to_selection@Base 2.4.0
  gimp_version@Base 2.4.0
  gimp_wm_class@Base 2.4.0
-libgimpbase-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimpbase-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  _gimp_unit_vtable@Base 2.4.0
  gimp_add_mask_type_compat_get_type@Base 2.10.0
  gimp_add_mask_type_get_type@Base 2.4.0
@@ -1187,8 +1187,8 @@ libgimpbase-2.0.so.0 libgimp2.0 #MINVER#
  gp_tile_ack_write@Base 2.4.0
  gp_tile_data_write@Base 2.4.0
  gp_tile_req_write@Base 2.4.0
-libgimpcolor-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimpcolor-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  gimp_adaptive_supersample_area@Base 2.4.0
  gimp_bilinear@Base 2.4.0
  gimp_bilinear_16@Base 2.4.0
@@ -1316,8 +1316,8 @@ libgimpcolor-2.0.so.0 libgimp2.0 #MINVER#
  gimp_rgba_subtract@Base 2.4.0
  gimp_value_get_rgb@Base 2.4.0
  gimp_value_set_rgb@Base 2.4.0
-libgimpconfig-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimpconfig-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  gimp_color_config_get_cmyk_color_profile@Base 2.10.0
  gimp_color_config_get_display_bpc@Base 2.10.0
  gimp_color_config_get_display_color_profile@Base 2.10.0
@@ -1411,8 +1411,8 @@ libgimpconfig-2.0.so.0 libgimp2.0 #MINVER#
  gimp_scanner_parse_string@Base 2.4.0
  gimp_scanner_parse_string_no_validate@Base 2.4.0
  gimp_scanner_parse_token@Base 2.4.0
-libgimpmath-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimpmath-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  gimp_matrix2_determinant@Base 2.10.18
  gimp_matrix2_get_type@Base 2.4.0
  gimp_matrix2_identity@Base 2.4.0
@@ -1490,8 +1490,8 @@ libgimpmath-2.0.so.0 libgimp2.0 #MINVER#
  gimp_vector_2d_to_3d@Base 2.4.0
  gimp_vector_2d_to_3d_val@Base 2.4.0
  gimp_vector_3d_to_2d@Base 2.4.0
-libgimpmodule-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimpmodule-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  gimp_module_db_get_load_inhibit@Base 2.4.0
  gimp_module_db_get_type@Base 2.4.0
  gimp_module_db_load@Base 2.4.0
@@ -1509,8 +1509,8 @@ libgimpmodule-2.0.so.0 libgimp2.0 #MINVER#
  gimp_module_register_enum@Base 2.4.0
  gimp_module_set_load_inhibit@Base 2.4.0
  gimp_module_state_name@Base 2.4.0
-libgimpthumb-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimpthumb-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  gimp_thumb_ensure_thumb_dir@Base 2.4.0
  gimp_thumb_ensure_thumb_dir_local@Base 2.4.0
  gimp_thumb_error_quark@Base 2.4.0
@@ -1542,8 +1542,8 @@ libgimpthumb-2.0.so.0 libgimp2.0 #MINVER#
  gimp_thumbnail_set_uri@Base 2.4.0
  gimp_thumbs_delete_for_uri@Base 2.4.0
  gimp_thumbs_delete_for_uri_local@Base 2.4.0
-libgimpui-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimpui-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  _gimpui_marshal_VOID__STRING_BOOLEAN@Base 2.4.0
  _gimpui_marshal_VOID__STRING_DOUBLE_INT_INT_INT_INT_POINTER_BOOLEAN@Base 2.4.0
  _gimpui_marshal_VOID__STRING_INT_INT_INT_POINTER_BOOLEAN@Base 2.4.0
@@ -1637,8 +1637,8 @@ libgimpui-2.0.so.0 libgimp2.0 #MINVER#
  gimp_zoom_preview_new_from_drawable_id@Base 2.10.0
  gimp_zoom_preview_new_with_model@Base 2.4.0
  gimp_zoom_preview_new_with_model_from_drawable_id@Base 2.10.0
-libgimpwidgets-2.0.so.0 libgimp2.0 #MINVER#
-* Build-Depends-Package: libgimp2.0-dev
+libgimpwidgets-2.0.so.0 libgimp2.0t64 #MINVER#
+* Build-Depends-Package: libgimp2.0t64-dev
  _gimp_ensure_modules_func@Base 2.4.0
  _gimp_get_background_func@Base 2.4.0
  _gimp_get_foreground_func@Base 2.4.0