Source: libmtp
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-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru libmtp-1.1.21/debian/changelog libmtp-1.1.21/debian/changelog
--- libmtp-1.1.21/debian/changelog      2024-01-09 19:51:19.000000000 +0000
+++ libmtp-1.1.21/debian/changelog      2024-02-28 14:18:19.000000000 +0000
@@ -1,3 +1,10 @@
+libmtp (1.1.21-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062451
+
+ -- Benjamin Drung <[email protected]>  Wed, 28 Feb 2024 14:18:19 +0000
+
 libmtp (1.1.21-3) unstable; urgency=medium
 
   * Delete files with dh_clean (Closes: #1049296)
diff -Nru libmtp-1.1.21/debian/control libmtp-1.1.21/debian/control
--- libmtp-1.1.21/debian/control        2024-01-09 19:51:19.000000000 +0000
+++ libmtp-1.1.21/debian/control        2024-02-28 14:18:19.000000000 +0000
@@ -3,7 +3,7 @@
 Uploaders: Dylan Aïssi <[email protected]>
 Section: libs
 Priority: optional
-Build-Depends: autoconf,
+Build-Depends: dpkg-dev (>= 1.22.5), autoconf,
                automake,
                chrpath,
                debhelper-compat (= 13),
@@ -20,7 +20,10 @@
 Homepage: https://libmtp.sourceforge.net/
 Rules-Requires-Root: no
 
-Package: libmtp9
+Package: libmtp9t64
+Provides: ${t64:Provides}
+Replaces: libmtp9
+Breaks: libmtp9 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: libmtp-common,
@@ -55,10 +58,10 @@
 Package: libmtp-runtime
 Architecture: linux-any
 Depends: libmtp-common,
-         libmtp9 (= ${binary:Version}),
+         libmtp9t64 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Enhances: libmtp9
+Enhances: libmtp9t64
 Description: Media Transfer Protocol (MTP) runtime tools
  libmtp is a library for communicating with MTP aware devices in POSIX
  compliant operating systems.  It implements MTP Basic, the subset
@@ -76,7 +79,7 @@
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libmtp9 (= ${binary:Version}),
+Depends: libmtp9t64 (= ${binary:Version}),
          libusb-1.0-0-dev,
          ${misc:Depends}
 Description: Media Transfer Protocol (MTP) development files
@@ -111,7 +114,7 @@
 Section: utils
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Enhances: libmtp9
+Enhances: libmtp9t64
 Description: Media Transfer Protocol (MTP) library tools
  libmtp is a library for communicating with MTP aware devices in POSIX
  compliant operating systems.  It implements MTP Basic, the subset
diff -Nru libmtp-1.1.21/debian/libmtp9.docs libmtp-1.1.21/debian/libmtp9.docs
--- libmtp-1.1.21/debian/libmtp9.docs   2024-01-09 19:51:19.000000000 +0000
+++ libmtp-1.1.21/debian/libmtp9.docs   1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-AUTHORS
-README
-TODO
diff -Nru libmtp-1.1.21/debian/libmtp9.install 
libmtp-1.1.21/debian/libmtp9.install
--- libmtp-1.1.21/debian/libmtp9.install        2024-01-09 19:51:19.000000000 
+0000
+++ libmtp-1.1.21/debian/libmtp9.install        1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-usr/lib/*/*.so.*
diff -Nru libmtp-1.1.21/debian/libmtp9.symbols 
libmtp-1.1.21/debian/libmtp9.symbols
--- libmtp-1.1.21/debian/libmtp9.symbols        2024-01-09 19:51:19.000000000 
+0000
+++ libmtp-1.1.21/debian/libmtp9.symbols        1970-01-01 00:00:00.000000000 
+0000
@@ -1,122 +0,0 @@
-libmtp.so.9 #PACKAGE# #MINVER#
-* Build-Depends-Package: libmtp-dev
- LIBMTP_BeginEditObject@Base 1.1.6
- LIBMTP_Check_Capability@Base 1.1.9
- LIBMTP_Check_Specific_Device@Base 1.1.0
- LIBMTP_Clear_Errorstack@Base 1.1.0
- LIBMTP_Copy_Object@Base 1.1.16
- LIBMTP_Create_Folder@Base 1.1.0
- LIBMTP_Create_New_Album@Base 1.1.0
- LIBMTP_Create_New_Playlist@Base 1.1.0
- LIBMTP_Custom_Operation@Base 1.1.16
- LIBMTP_Delete_Object@Base 1.1.0
- LIBMTP_Detect_Raw_Devices@Base 1.1.0
- LIBMTP_Dump_Device_Info@Base 1.1.0
- LIBMTP_Dump_Errorstack@Base 1.1.0
- LIBMTP_EndEditObject@Base 1.1.6
- LIBMTP_Find_Folder@Base 1.1.0
- LIBMTP_Format_Storage@Base 1.1.0
- LIBMTP_FreeMemory@Base 1.1.21
- LIBMTP_GetPartialObject@Base 1.1.6
- LIBMTP_Get_Album@Base 1.1.0
- LIBMTP_Get_Album_List@Base 1.1.0
- LIBMTP_Get_Album_List_For_Storage@Base 1.1.0
- LIBMTP_Get_Allowed_Property_Values@Base 1.1.0
- LIBMTP_Get_Batterylevel@Base 1.1.0
- LIBMTP_Get_Children@Base 1.1.21
- LIBMTP_Get_Connected_Devices@Base 1.1.0
- LIBMTP_Get_Device@Base 1.1.18
- LIBMTP_Get_Device_By_ID@Base 1.1.21
- LIBMTP_Get_Device_By_SerialNumber@Base 1.1.21
- LIBMTP_Get_Device_Certificate@Base 1.1.0
- LIBMTP_Get_Deviceversion@Base 1.1.0
- LIBMTP_Get_Errorstack@Base 1.1.0
- LIBMTP_Get_File_To_File@Base 1.1.0
- LIBMTP_Get_File_To_File_Descriptor@Base 1.1.0
- LIBMTP_Get_File_To_Handler@Base 1.1.3
- LIBMTP_Get_Filelisting@Base 1.1.0
- LIBMTP_Get_Filelisting_With_Callback@Base 1.1.0
- LIBMTP_Get_Filemetadata@Base 1.1.0
- LIBMTP_Get_Files_And_Folders@Base 1.1.0
- LIBMTP_Get_Filetype_Description@Base 1.1.0
- LIBMTP_Get_First_Device@Base 1.1.0
- LIBMTP_Get_Folder_List@Base 1.1.0
- LIBMTP_Get_Folder_List_For_Storage@Base 1.1.0
- LIBMTP_Get_Friendlyname@Base 1.1.0
- LIBMTP_Get_Manufacturername@Base 1.1.0
- LIBMTP_Get_Modelname@Base 1.1.0
- LIBMTP_Get_Playlist@Base 1.1.0
- LIBMTP_Get_Playlist_List@Base 1.1.0
- LIBMTP_Get_Property_Description@Base 1.1.0
- LIBMTP_Get_Representative_Sample@Base 1.1.0
- LIBMTP_Get_Representative_Sample_Format@Base 1.1.0
- LIBMTP_Get_Secure_Time@Base 1.1.0
- LIBMTP_Get_Serialnumber@Base 1.1.0
- LIBMTP_Get_Storage@Base 1.1.0
- LIBMTP_Get_String_From_Object@Base 1.1.0
- LIBMTP_Get_Supported_Devices_List@Base 1.1.0
- LIBMTP_Get_Supported_Filetypes@Base 1.1.0
- LIBMTP_Get_Syncpartner@Base 1.1.0
- LIBMTP_Get_Thumbnail@Base 1.1.5
- LIBMTP_Get_Track_To_File@Base 1.1.0
- LIBMTP_Get_Track_To_File_Descriptor@Base 1.1.0
- LIBMTP_Get_Track_To_Handler@Base 1.1.3
- LIBMTP_Get_Tracklisting@Base 1.1.0
- LIBMTP_Get_Tracklisting_With_Callback@Base 1.1.0
- LIBMTP_Get_Tracklisting_With_Callback_For_Storage@Base 1.1.0
- LIBMTP_Get_Trackmetadata@Base 1.1.0
- LIBMTP_Get_u16_From_Object@Base 1.1.0
- LIBMTP_Get_u32_From_Object@Base 1.1.0
- LIBMTP_Get_u64_From_Object@Base 1.1.0
- LIBMTP_Get_u8_From_Object@Base 1.1.0
- LIBMTP_Handle_Events_Timeout_Completed@Base 1.1.12
- LIBMTP_Init@Base 1.1.0
- LIBMTP_Is_Property_Supported@Base 1.1.0
- LIBMTP_Move_Object@Base 1.1.16
- LIBMTP_Number_Devices_In_List@Base 1.1.0
- LIBMTP_Open_Raw_Device@Base 1.1.0
- LIBMTP_Open_Raw_Device_Uncached@Base 1.1.0
- LIBMTP_Read_Event@Base 1.1.5
- LIBMTP_Read_Event_Async@Base 1.1.12
- LIBMTP_Release_Device@Base 1.1.0
- LIBMTP_Release_Device_List@Base 1.1.0
- LIBMTP_Reset_Device@Base 1.1.0
- LIBMTP_SendPartialObject@Base 1.1.6
- LIBMTP_Send_File_From_File@Base 1.1.0
- LIBMTP_Send_File_From_File_Descriptor@Base 1.1.0
- LIBMTP_Send_File_From_Handler@Base 1.1.3
- LIBMTP_Send_Representative_Sample@Base 1.1.0
- LIBMTP_Send_Track_From_File@Base 1.1.0
- LIBMTP_Send_Track_From_File_Descriptor@Base 1.1.0
- LIBMTP_Send_Track_From_Handler@Base 1.1.3
- LIBMTP_Set_Album_Name@Base 1.1.0
- LIBMTP_Set_Debug@Base 1.1.0
- LIBMTP_Set_File_Name@Base 1.1.0
- LIBMTP_Set_Folder_Name@Base 1.1.0
- LIBMTP_Set_Friendlyname@Base 1.1.0
- LIBMTP_Set_Object_Filename@Base 1.1.0
- LIBMTP_Set_Object_String@Base 1.1.0
- LIBMTP_Set_Object_u16@Base 1.1.0
- LIBMTP_Set_Object_u32@Base 1.1.0
- LIBMTP_Set_Object_u8@Base 1.1.0
- LIBMTP_Set_Playlist_Name@Base 1.1.0
- LIBMTP_Set_Syncpartner@Base 1.1.0
- LIBMTP_Set_Track_Name@Base 1.1.0
- LIBMTP_Track_Exists@Base 1.1.0
- LIBMTP_TruncateObject@Base 1.1.6
- LIBMTP_Update_Album@Base 1.1.0
- LIBMTP_Update_Playlist@Base 1.1.0
- LIBMTP_Update_Track_Metadata@Base 1.1.0
- LIBMTP_destroy_album_t@Base 1.1.0
- LIBMTP_destroy_allowed_values_t@Base 1.1.0
- LIBMTP_destroy_file_t@Base 1.1.0
- LIBMTP_destroy_filesampledata_t@Base 1.1.0
- LIBMTP_destroy_folder_t@Base 1.1.0
- LIBMTP_destroy_playlist_t@Base 1.1.0
- LIBMTP_destroy_track_t@Base 1.1.0
- LIBMTP_new_album_t@Base 1.1.0
- LIBMTP_new_file_t@Base 1.1.0
- LIBMTP_new_filesampledata_t@Base 1.1.0
- LIBMTP_new_folder_t@Base 1.1.0
- LIBMTP_new_playlist_t@Base 1.1.0
- LIBMTP_new_track_t@Base 1.1.0
diff -Nru libmtp-1.1.21/debian/libmtp9t64.docs 
libmtp-1.1.21/debian/libmtp9t64.docs
--- libmtp-1.1.21/debian/libmtp9t64.docs        1970-01-01 00:00:00.000000000 
+0000
+++ libmtp-1.1.21/debian/libmtp9t64.docs        2024-01-09 19:51:19.000000000 
+0000
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff -Nru libmtp-1.1.21/debian/libmtp9t64.install 
libmtp-1.1.21/debian/libmtp9t64.install
--- libmtp-1.1.21/debian/libmtp9t64.install     1970-01-01 00:00:00.000000000 
+0000
+++ libmtp-1.1.21/debian/libmtp9t64.install     2024-01-09 19:51:19.000000000 
+0000
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff -Nru libmtp-1.1.21/debian/libmtp9t64.lintian-overrides 
libmtp-1.1.21/debian/libmtp9t64.lintian-overrides
--- libmtp-1.1.21/debian/libmtp9t64.lintian-overrides   1970-01-01 
00:00:00.000000000 +0000
+++ libmtp-1.1.21/debian/libmtp9t64.lintian-overrides   2024-02-28 
14:17:52.000000000 +0000
@@ -0,0 +1 @@
+libmtp9t64: package-name-doesnt-match-sonames libmtp9
diff -Nru libmtp-1.1.21/debian/libmtp9t64.symbols 
libmtp-1.1.21/debian/libmtp9t64.symbols
--- libmtp-1.1.21/debian/libmtp9t64.symbols     1970-01-01 00:00:00.000000000 
+0000
+++ libmtp-1.1.21/debian/libmtp9t64.symbols     2024-02-28 14:17:52.000000000 
+0000
@@ -0,0 +1,122 @@
+libmtp.so.9 #PACKAGE# #MINVER#
+* Build-Depends-Package: libmtp-dev
+ LIBMTP_BeginEditObject@Base 1.1.6
+ LIBMTP_Check_Capability@Base 1.1.9
+ LIBMTP_Check_Specific_Device@Base 1.1.0
+ LIBMTP_Clear_Errorstack@Base 1.1.0
+ LIBMTP_Copy_Object@Base 1.1.16
+ LIBMTP_Create_Folder@Base 1.1.0
+ LIBMTP_Create_New_Album@Base 1.1.0
+ LIBMTP_Create_New_Playlist@Base 1.1.0
+ LIBMTP_Custom_Operation@Base 1.1.16
+ LIBMTP_Delete_Object@Base 1.1.0
+ LIBMTP_Detect_Raw_Devices@Base 1.1.0
+ LIBMTP_Dump_Device_Info@Base 1.1.0
+ LIBMTP_Dump_Errorstack@Base 1.1.0
+ LIBMTP_EndEditObject@Base 1.1.6
+ LIBMTP_Find_Folder@Base 1.1.0
+ LIBMTP_Format_Storage@Base 1.1.0
+ LIBMTP_FreeMemory@Base 1.1.21
+ LIBMTP_GetPartialObject@Base 1.1.6
+ LIBMTP_Get_Album@Base 1.1.0
+ LIBMTP_Get_Album_List@Base 1.1.0
+ LIBMTP_Get_Album_List_For_Storage@Base 1.1.0
+ LIBMTP_Get_Allowed_Property_Values@Base 1.1.0
+ LIBMTP_Get_Batterylevel@Base 1.1.0
+ LIBMTP_Get_Children@Base 1.1.21
+ LIBMTP_Get_Connected_Devices@Base 1.1.0
+ LIBMTP_Get_Device@Base 1.1.18
+ LIBMTP_Get_Device_By_ID@Base 1.1.21
+ LIBMTP_Get_Device_By_SerialNumber@Base 1.1.21
+ LIBMTP_Get_Device_Certificate@Base 1.1.0
+ LIBMTP_Get_Deviceversion@Base 1.1.0
+ LIBMTP_Get_Errorstack@Base 1.1.0
+ LIBMTP_Get_File_To_File@Base 1.1.0
+ LIBMTP_Get_File_To_File_Descriptor@Base 1.1.0
+ LIBMTP_Get_File_To_Handler@Base 1.1.3
+ LIBMTP_Get_Filelisting@Base 1.1.0
+ LIBMTP_Get_Filelisting_With_Callback@Base 1.1.0
+ LIBMTP_Get_Filemetadata@Base 1.1.0
+ LIBMTP_Get_Files_And_Folders@Base 1.1.0
+ LIBMTP_Get_Filetype_Description@Base 1.1.0
+ LIBMTP_Get_First_Device@Base 1.1.0
+ LIBMTP_Get_Folder_List@Base 1.1.0
+ LIBMTP_Get_Folder_List_For_Storage@Base 1.1.0
+ LIBMTP_Get_Friendlyname@Base 1.1.0
+ LIBMTP_Get_Manufacturername@Base 1.1.0
+ LIBMTP_Get_Modelname@Base 1.1.0
+ LIBMTP_Get_Playlist@Base 1.1.0
+ LIBMTP_Get_Playlist_List@Base 1.1.0
+ LIBMTP_Get_Property_Description@Base 1.1.0
+ LIBMTP_Get_Representative_Sample@Base 1.1.0
+ LIBMTP_Get_Representative_Sample_Format@Base 1.1.0
+ LIBMTP_Get_Secure_Time@Base 1.1.0
+ LIBMTP_Get_Serialnumber@Base 1.1.0
+ LIBMTP_Get_Storage@Base 1.1.0
+ LIBMTP_Get_String_From_Object@Base 1.1.0
+ LIBMTP_Get_Supported_Devices_List@Base 1.1.0
+ LIBMTP_Get_Supported_Filetypes@Base 1.1.0
+ LIBMTP_Get_Syncpartner@Base 1.1.0
+ LIBMTP_Get_Thumbnail@Base 1.1.5
+ LIBMTP_Get_Track_To_File@Base 1.1.0
+ LIBMTP_Get_Track_To_File_Descriptor@Base 1.1.0
+ LIBMTP_Get_Track_To_Handler@Base 1.1.3
+ LIBMTP_Get_Tracklisting@Base 1.1.0
+ LIBMTP_Get_Tracklisting_With_Callback@Base 1.1.0
+ LIBMTP_Get_Tracklisting_With_Callback_For_Storage@Base 1.1.0
+ LIBMTP_Get_Trackmetadata@Base 1.1.0
+ LIBMTP_Get_u16_From_Object@Base 1.1.0
+ LIBMTP_Get_u32_From_Object@Base 1.1.0
+ LIBMTP_Get_u64_From_Object@Base 1.1.0
+ LIBMTP_Get_u8_From_Object@Base 1.1.0
+ LIBMTP_Handle_Events_Timeout_Completed@Base 1.1.12
+ LIBMTP_Init@Base 1.1.0
+ LIBMTP_Is_Property_Supported@Base 1.1.0
+ LIBMTP_Move_Object@Base 1.1.16
+ LIBMTP_Number_Devices_In_List@Base 1.1.0
+ LIBMTP_Open_Raw_Device@Base 1.1.0
+ LIBMTP_Open_Raw_Device_Uncached@Base 1.1.0
+ LIBMTP_Read_Event@Base 1.1.5
+ LIBMTP_Read_Event_Async@Base 1.1.12
+ LIBMTP_Release_Device@Base 1.1.0
+ LIBMTP_Release_Device_List@Base 1.1.0
+ LIBMTP_Reset_Device@Base 1.1.0
+ LIBMTP_SendPartialObject@Base 1.1.6
+ LIBMTP_Send_File_From_File@Base 1.1.0
+ LIBMTP_Send_File_From_File_Descriptor@Base 1.1.0
+ LIBMTP_Send_File_From_Handler@Base 1.1.3
+ LIBMTP_Send_Representative_Sample@Base 1.1.0
+ LIBMTP_Send_Track_From_File@Base 1.1.0
+ LIBMTP_Send_Track_From_File_Descriptor@Base 1.1.0
+ LIBMTP_Send_Track_From_Handler@Base 1.1.3
+ LIBMTP_Set_Album_Name@Base 1.1.0
+ LIBMTP_Set_Debug@Base 1.1.0
+ LIBMTP_Set_File_Name@Base 1.1.0
+ LIBMTP_Set_Folder_Name@Base 1.1.0
+ LIBMTP_Set_Friendlyname@Base 1.1.0
+ LIBMTP_Set_Object_Filename@Base 1.1.0
+ LIBMTP_Set_Object_String@Base 1.1.0
+ LIBMTP_Set_Object_u16@Base 1.1.0
+ LIBMTP_Set_Object_u32@Base 1.1.0
+ LIBMTP_Set_Object_u8@Base 1.1.0
+ LIBMTP_Set_Playlist_Name@Base 1.1.0
+ LIBMTP_Set_Syncpartner@Base 1.1.0
+ LIBMTP_Set_Track_Name@Base 1.1.0
+ LIBMTP_Track_Exists@Base 1.1.0
+ LIBMTP_TruncateObject@Base 1.1.6
+ LIBMTP_Update_Album@Base 1.1.0
+ LIBMTP_Update_Playlist@Base 1.1.0
+ LIBMTP_Update_Track_Metadata@Base 1.1.0
+ LIBMTP_destroy_album_t@Base 1.1.0
+ LIBMTP_destroy_allowed_values_t@Base 1.1.0
+ LIBMTP_destroy_file_t@Base 1.1.0
+ LIBMTP_destroy_filesampledata_t@Base 1.1.0
+ LIBMTP_destroy_folder_t@Base 1.1.0
+ LIBMTP_destroy_playlist_t@Base 1.1.0
+ LIBMTP_destroy_track_t@Base 1.1.0
+ LIBMTP_new_album_t@Base 1.1.0
+ LIBMTP_new_file_t@Base 1.1.0
+ LIBMTP_new_filesampledata_t@Base 1.1.0
+ LIBMTP_new_folder_t@Base 1.1.0
+ LIBMTP_new_playlist_t@Base 1.1.0
+ LIBMTP_new_track_t@Base 1.1.0
diff -Nru libmtp-1.1.21/debian/rules libmtp-1.1.21/debian/rules
--- libmtp-1.1.21/debian/rules  2024-01-09 19:51:19.000000000 +0000
+++ libmtp-1.1.21/debian/rules  2024-02-28 14:18:18.000000000 +0000
@@ -75,7 +75,7 @@
 override_dh_installdeb-arch:
        # Remove rpath from the library
        chrpath --delete \
-               
$(debdir)/libmtp$(SOVERSION)/usr/lib/$(DEB_HOST_MULTIARCH)/libmtp.so.*.*
+               
$(debdir)/libmtp$(SOVERSION)t64/usr/lib/$(DEB_HOST_MULTIARCH)/libmtp.so.*.*
        # Remove rpath from programs
        chrpath --delete $(debdir)/mtp-tools/usr/bin/*
        dh_installdeb

Reply via email to