[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1062998: tumbler: NMU diff for 64-bit time_t transition



Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru tumbler-4.18.1/debian/changelog tumbler-4.18.1/debian/changelog
--- tumbler-4.18.1/debian/changelog	2023-06-13 06:37:06.000000000 +0000
+++ tumbler-4.18.1/debian/changelog	2024-02-28 19:55:41.000000000 +0000
@@ -1,3 +1,10 @@
+tumbler (4.18.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062998
+
+ -- Steve Langasek <vorlon@debian.org>  Wed, 28 Feb 2024 19:55:41 +0000
+
 tumbler (4.18.1-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru tumbler-4.18.1/debian/control tumbler-4.18.1/debian/control
--- tumbler-4.18.1/debian/control	2023-06-13 06:35:49.000000000 +0000
+++ tumbler-4.18.1/debian/control	2024-02-28 19:55:41.000000000 +0000
@@ -3,7 +3,7 @@
 Section: xfce
 Maintainer: Debian Xfce Maintainers <debian-xfce@lists.debian.org>
 Uploaders: Yves-Alexis Perez <corsac@debian.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                gtk-doc-tools,
                intltool (>= 0.31),
                libcurl4-gnutls-dev,
@@ -56,7 +56,7 @@
 Package: tumbler-common
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: libtumbler-1-0
+Suggests: libtumbler-1-0t64
 Multi-Arch: foreign
 Description: D-Bus thumbnailing service (common files)
  Tumbler is a D-Bus service for applications to request thumbnails for various
@@ -64,7 +64,10 @@
  .
  This package contains files common to the various binary packages.
 
-Package: libtumbler-1-0
+Package: libtumbler-1-0t64
+Provides: ${t64:Provides}
+Replaces: libtumbler-1-0
+Breaks: libtumbler-1-0 (<< ${source:Version})
 Section: libs
 Architecture: any
 Pre-depends: ${misc:Pre-Depends}
@@ -81,7 +84,7 @@
 Section: libdevel
 Architecture: any
 Depends: libglib2.0-dev,
-         libtumbler-1-0 (= ${binary:Version}),
+         libtumbler-1-0t64 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Multi-Arch: same
diff -Nru tumbler-4.18.1/debian/libtumbler-1-0.install tumbler-4.18.1/debian/libtumbler-1-0.install
--- tumbler-4.18.1/debian/libtumbler-1-0.install	2022-09-16 08:49:58.000000000 +0000
+++ tumbler-4.18.1/debian/libtumbler-1-0.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/libtumbler-1.so.*
diff -Nru tumbler-4.18.1/debian/libtumbler-1-0.symbols tumbler-4.18.1/debian/libtumbler-1-0.symbols
--- tumbler-4.18.1/debian/libtumbler-1-0.symbols	2022-09-16 09:05:17.000000000 +0000
+++ tumbler-4.18.1/debian/libtumbler-1-0.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-libtumbler-1.so.0 libtumbler-1-0 #MINVER#
-* Build-Depends-Package: libtumbler-1-dev
- tumbler_abstract_thumbnailer_get_type@Base 0.1.0
- tumbler_cache_cleanup@Base 0.1.0
- tumbler_cache_copy@Base 0.1.0
- tumbler_cache_delete@Base 0.1.0
- tumbler_cache_get_default@Base 0.1.0
- tumbler_cache_get_flavor@Base 0.1.0
- tumbler_cache_get_flavors@Base 0.1.0
- tumbler_cache_get_thumbnail@Base 0.1.0
- tumbler_cache_get_type@Base 0.1.0
- tumbler_cache_is_thumbnail@Base 0.1.0
- tumbler_cache_move@Base 0.1.0
- tumbler_cache_plugin_get_cache@Base 0.1.0
- tumbler_cache_plugin_get_default@Base 0.1.0
- tumbler_cache_plugin_get_type@Base 0.1.0
- tumbler_check_version@Base 0.1.0
- tumbler_colorspace_get_type@Base 0.1.0
- tumbler_file_info_array_copy@Base 0.1.0
- tumbler_file_info_array_free@Base 0.1.0
- tumbler_file_info_array_new_with_flavor@Base 0.1.0
- tumbler_file_info_get_mime_type@Base 0.1.0
- tumbler_file_info_get_mtime@Base 0.1.0
- tumbler_file_info_get_thumbnail@Base 0.1.0
- tumbler_file_info_get_type@Base 0.1.0
- tumbler_file_info_get_uri@Base 0.1.0
- tumbler_file_info_load@Base 0.1.0
- tumbler_file_info_needs_update@Base 0.1.0
- tumbler_file_info_new@Base 0.1.0
- tumbler_major_version@Base 0.1.0
-##
-# marshal_* are used by tumblerd
- tumbler_marshal_VOID__STRING_UINT_INT_STRING@Base 4.17.2
- tumbler_marshal_VOID__UINT_BOXED_STRING@Base 0.1.2
- tumbler_marshal_VOID__UINT_BOXED_UINT_INT_STRING_STRING@Base 4.17.2
- tumbler_marshal_VOID__UINT_STRING@Base 0.1.0
-##
- tumbler_micro_version@Base 0.1.0
- tumbler_minor_version@Base 0.1.0
- tumbler_provider_factory_get_default@Base 0.1.0
- tumbler_provider_factory_get_providers@Base 0.1.0
- tumbler_provider_factory_get_type@Base 0.1.0
- tumbler_provider_plugin_get_type@Base 0.1.0
- tumbler_thumbnail_flavor_get_name@Base 0.1.0
- tumbler_thumbnail_flavor_get_size@Base 0.1.0
- tumbler_thumbnail_flavor_get_type@Base 0.1.0
- tumbler_thumbnail_flavor_new@Base 0.1.0
- tumbler_thumbnail_flavor_new_large@Base 0.1.0
- tumbler_thumbnail_flavor_new_normal@Base 0.1.0
- tumbler_thumbnail_flavor_new_x_large@Base 4.17.2
- tumbler_thumbnail_flavor_new_xx_large@Base 4.17.2
- tumbler_thumbnail_format_get_type@Base 0.1.0
- tumbler_thumbnail_get_flavor@Base 0.1.0
- tumbler_thumbnail_get_type@Base 0.1.0
- tumbler_thumbnail_load@Base 0.1.0
- tumbler_thumbnail_needs_update@Base 0.1.0
- tumbler_thumbnail_save_file@Base 0.1.0
- tumbler_thumbnail_save_image_data@Base 0.1.0
- tumbler_thumbnailer_array_copy@Base 0.1.0
- tumbler_thumbnailer_array_free@Base 0.1.0
- tumbler_thumbnailer_create@Base 0.1.0
- tumbler_thumbnailer_get_hash_keys@Base 0.1.0
- tumbler_thumbnailer_get_max_file_size@Base 0.1.27
- tumbler_thumbnailer_get_mime_types@Base 0.1.0
- tumbler_thumbnailer_get_priority@Base 0.1.27
- tumbler_thumbnailer_get_type@Base 0.1.0
- tumbler_thumbnailer_get_uri_schemes@Base 0.1.0
- tumbler_thumbnailer_provider_get_thumbnailers@Base 0.1.0
- tumbler_thumbnailer_provider_get_type@Base 0.1.0
- tumbler_thumbnailer_supports_hash_key@Base 0.1.0
- tumbler_thumbnailer_supports_location@Base 0.1.27
- tumbler_util_dump_strv@Base 4.17.2
- tumbler_util_dump_strvs_side_by_side@Base 4.17.2
- tumbler_util_get_settings@Base 0.1.27
- tumbler_util_get_supported_uri_schemes@Base 0.1.0
- tumbler_util_get_thumbnailer_dirs@Base 4.17.2
- tumbler_util_guess_is_sparse@Base 0.2.4
- tumbler_util_is_debug_logging_enabled@Base 4.17.2
- tumbler_util_locations_from_strv@Base 4.17.2
- tumbler_util_object_ref@Base 4.17.2
- tumbler_util_scale_pixbuf@Base 4.17.2
- tumbler_util_size_prepared@Base 4.17.2
- tumbler_util_toggle_stderr@Base 4.17.2
diff -Nru tumbler-4.18.1/debian/libtumbler-1-0t64.install tumbler-4.18.1/debian/libtumbler-1-0t64.install
--- tumbler-4.18.1/debian/libtumbler-1-0t64.install	1970-01-01 00:00:00.000000000 +0000
+++ tumbler-4.18.1/debian/libtumbler-1-0t64.install	2022-09-16 08:49:58.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libtumbler-1.so.*
diff -Nru tumbler-4.18.1/debian/libtumbler-1-0t64.lintian-overrides tumbler-4.18.1/debian/libtumbler-1-0t64.lintian-overrides
--- tumbler-4.18.1/debian/libtumbler-1-0t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ tumbler-4.18.1/debian/libtumbler-1-0t64.lintian-overrides	2024-02-28 19:54:02.000000000 +0000
@@ -0,0 +1 @@
+libtumbler-1-0t64: package-name-doesnt-match-sonames libtumbler-1-0
diff -Nru tumbler-4.18.1/debian/libtumbler-1-0t64.symbols tumbler-4.18.1/debian/libtumbler-1-0t64.symbols
--- tumbler-4.18.1/debian/libtumbler-1-0t64.symbols	1970-01-01 00:00:00.000000000 +0000
+++ tumbler-4.18.1/debian/libtumbler-1-0t64.symbols	2024-02-28 19:54:02.000000000 +0000
@@ -0,0 +1,83 @@
+libtumbler-1.so.0 libtumbler-1-0t64 #MINVER#
+* Build-Depends-Package: libtumbler-1-dev
+ tumbler_abstract_thumbnailer_get_type@Base 0.1.0
+ tumbler_cache_cleanup@Base 0.1.0
+ tumbler_cache_copy@Base 0.1.0
+ tumbler_cache_delete@Base 0.1.0
+ tumbler_cache_get_default@Base 0.1.0
+ tumbler_cache_get_flavor@Base 0.1.0
+ tumbler_cache_get_flavors@Base 0.1.0
+ tumbler_cache_get_thumbnail@Base 0.1.0
+ tumbler_cache_get_type@Base 0.1.0
+ tumbler_cache_is_thumbnail@Base 0.1.0
+ tumbler_cache_move@Base 0.1.0
+ tumbler_cache_plugin_get_cache@Base 0.1.0
+ tumbler_cache_plugin_get_default@Base 0.1.0
+ tumbler_cache_plugin_get_type@Base 0.1.0
+ tumbler_check_version@Base 0.1.0
+ tumbler_colorspace_get_type@Base 0.1.0
+ tumbler_file_info_array_copy@Base 0.1.0
+ tumbler_file_info_array_free@Base 0.1.0
+ tumbler_file_info_array_new_with_flavor@Base 0.1.0
+ tumbler_file_info_get_mime_type@Base 0.1.0
+ tumbler_file_info_get_mtime@Base 0.1.0
+ tumbler_file_info_get_thumbnail@Base 0.1.0
+ tumbler_file_info_get_type@Base 0.1.0
+ tumbler_file_info_get_uri@Base 0.1.0
+ tumbler_file_info_load@Base 0.1.0
+ tumbler_file_info_needs_update@Base 0.1.0
+ tumbler_file_info_new@Base 0.1.0
+ tumbler_major_version@Base 0.1.0
+##
+# marshal_* are used by tumblerd
+ tumbler_marshal_VOID__STRING_UINT_INT_STRING@Base 4.17.2
+ tumbler_marshal_VOID__UINT_BOXED_STRING@Base 0.1.2
+ tumbler_marshal_VOID__UINT_BOXED_UINT_INT_STRING_STRING@Base 4.17.2
+ tumbler_marshal_VOID__UINT_STRING@Base 0.1.0
+##
+ tumbler_micro_version@Base 0.1.0
+ tumbler_minor_version@Base 0.1.0
+ tumbler_provider_factory_get_default@Base 0.1.0
+ tumbler_provider_factory_get_providers@Base 0.1.0
+ tumbler_provider_factory_get_type@Base 0.1.0
+ tumbler_provider_plugin_get_type@Base 0.1.0
+ tumbler_thumbnail_flavor_get_name@Base 0.1.0
+ tumbler_thumbnail_flavor_get_size@Base 0.1.0
+ tumbler_thumbnail_flavor_get_type@Base 0.1.0
+ tumbler_thumbnail_flavor_new@Base 0.1.0
+ tumbler_thumbnail_flavor_new_large@Base 0.1.0
+ tumbler_thumbnail_flavor_new_normal@Base 0.1.0
+ tumbler_thumbnail_flavor_new_x_large@Base 4.17.2
+ tumbler_thumbnail_flavor_new_xx_large@Base 4.17.2
+ tumbler_thumbnail_format_get_type@Base 0.1.0
+ tumbler_thumbnail_get_flavor@Base 0.1.0
+ tumbler_thumbnail_get_type@Base 0.1.0
+ tumbler_thumbnail_load@Base 0.1.0
+ tumbler_thumbnail_needs_update@Base 0.1.0
+ tumbler_thumbnail_save_file@Base 0.1.0
+ tumbler_thumbnail_save_image_data@Base 0.1.0
+ tumbler_thumbnailer_array_copy@Base 0.1.0
+ tumbler_thumbnailer_array_free@Base 0.1.0
+ tumbler_thumbnailer_create@Base 0.1.0
+ tumbler_thumbnailer_get_hash_keys@Base 0.1.0
+ tumbler_thumbnailer_get_max_file_size@Base 0.1.27
+ tumbler_thumbnailer_get_mime_types@Base 0.1.0
+ tumbler_thumbnailer_get_priority@Base 0.1.27
+ tumbler_thumbnailer_get_type@Base 0.1.0
+ tumbler_thumbnailer_get_uri_schemes@Base 0.1.0
+ tumbler_thumbnailer_provider_get_thumbnailers@Base 0.1.0
+ tumbler_thumbnailer_provider_get_type@Base 0.1.0
+ tumbler_thumbnailer_supports_hash_key@Base 0.1.0
+ tumbler_thumbnailer_supports_location@Base 0.1.27
+ tumbler_util_dump_strv@Base 4.17.2
+ tumbler_util_dump_strvs_side_by_side@Base 4.17.2
+ tumbler_util_get_settings@Base 0.1.27
+ tumbler_util_get_supported_uri_schemes@Base 0.1.0
+ tumbler_util_get_thumbnailer_dirs@Base 4.17.2
+ tumbler_util_guess_is_sparse@Base 0.2.4
+ tumbler_util_is_debug_logging_enabled@Base 4.17.2
+ tumbler_util_locations_from_strv@Base 4.17.2
+ tumbler_util_object_ref@Base 4.17.2
+ tumbler_util_scale_pixbuf@Base 4.17.2
+ tumbler_util_size_prepared@Base 4.17.2
+ tumbler_util_toggle_stderr@Base 4.17.2
diff -Nru tumbler-4.18.1/debian/rules tumbler-4.18.1/debian/rules
--- tumbler-4.18.1/debian/rules	2022-12-15 22:53:26.000000000 +0000
+++ tumbler-4.18.1/debian/rules	2024-02-28 19:55:40.000000000 +0000
@@ -13,7 +13,7 @@
 	DEB_BUILD_OPTIONS=notrimdch dh_installchangelogs NEWS
 
 override_dh_makeshlibs:
-	dh_makeshlibs -p libtumbler-1-0 -X usr/lib/$(DEB_HOST_MULTIARCH)/tumbler-1/plugins
+	dh_makeshlibs -p libtumbler-1-0t64 -X usr/lib/$(DEB_HOST_MULTIARCH)/tumbler-1/plugins
 
 override_dh_missing:
 	dh_missing --list-missing -X .la

Reply to: