Source: file
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 file-5.45/debian/changelog file-5.45/debian/changelog
--- file-5.45/debian/changelog  2023-09-03 09:40:05.000000000 +0000
+++ file-5.45/debian/changelog  2024-03-01 11:59:20.000000000 +0000
@@ -1,3 +1,10 @@
+file (1:5.45-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063113
+
+ -- Benjamin Drung <bdr...@debian.org>  Fri, 01 Mar 2024 11:59:20 +0000
+
 file (1:5.45-2) unstable; urgency=medium
 
   * Upload to unstable
diff -Nru file-5.45/debian/control file-5.45/debian/control
--- file-5.45/debian/control    2023-09-03 09:39:49.000000000 +0000
+++ file-5.45/debian/control    2024-03-01 11:59:20.000000000 +0000
@@ -4,7 +4,7 @@
 Standards-Version: 4.6.2
 Vcs-Browser: https://git.in-ulm.de/cbiedl/file
 Vcs-Git: https://git.in-ulm.de/cbiedl/file.git
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
     libbz2-dev,
     liblzma-dev,
     zlib1g-dev,
@@ -15,7 +15,7 @@
 Package: file
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
-    libmagic1 (= ${binary:Version}),
+    libmagic1t64 (= ${binary:Version}),
 Breaks:
     debhelper (<< 12.2~),
 Multi-Arch: foreign
@@ -25,7 +25,10 @@
  .
  This package contains the file program itself.
 
-Package: libmagic1
+Package: libmagic1t64
+Provides: ${t64:Provides}
+Replaces: libmagic1
+Breaks: libmagic1 (<< ${source:Version})
 Architecture: any
 Pre-Depends:
     ${misc:Pre-Depends},
@@ -44,22 +47,22 @@
 Architecture: any
 Depends: ${misc:Depends},
 Breaks:
-    libmagic1 (<< 1:5.28-4~),
+    libmagic1t64 (<< 1:5.28-4~),
 Replaces:
-    libmagic1 (<< 1:5.28-4~),
+    libmagic1t64 (<< 1:5.28-4~),
 Section: libs
 Priority: optional
 Multi-Arch: foreign
 Description: File type determination library using "magic" numbers (compiled 
magic file)
  This package provides the compiled magic file "magic.mgc". It has
- been separated from libmagic1 in order to meet the multiarch
+ been separated from libmagic1t64 in order to meet the multiarch
  requirements without breaking applications that expect this file
  at its absolute path.
 
 Package: libmagic-dev
 Architecture: any
 Depends: ${misc:Depends},
-    libmagic1 (= ${binary:Version}),
+    libmagic1t64 (= ${binary:Version}),
 Suggests:
     file,
 Section: libdevel
diff -Nru file-5.45/debian/libmagic1.bug-control 
file-5.45/debian/libmagic1.bug-control
--- file-5.45/debian/libmagic1.bug-control      2010-02-01 13:26:27.000000000 
+0000
+++ file-5.45/debian/libmagic1.bug-control      1970-01-01 00:00:00.000000000 
+0000
@@ -1 +0,0 @@
-Submit-As: file
diff -Nru file-5.45/debian/libmagic1.bug-presubj 
file-5.45/debian/libmagic1.bug-presubj
--- file-5.45/debian/libmagic1.bug-presubj      2020-04-26 15:21:06.000000000 
+0000
+++ file-5.45/debian/libmagic1.bug-presubj      1970-01-01 00:00:00.000000000 
+0000
@@ -1,22 +0,0 @@
-Reporting missing or buggy detection
-
-* Suggested bug severities
-
-  - Missing detection (just 'data'), or enhancements: wishlist
-  - Mis-detection: normal
-  - Regressions: important
-  - Overall correct detection, but with some glitches: minor
-
-* Reproducers
-
-It's crucial to test whether a detection works as expected, or why it
-fails. So please provide something suitable: Attach a short sample, or
-send an information where to find it. As a last resort, provide a hex
-dump of the first 256 bytes. Your package maintainer will ask for more
-if necessary. Double-check this file neither contains sensitive data
-nor infringes a copyright.
-
-* File format descriptions
-
-For any file types not detected yet: Pointers to documents that
-describe the file format are a great help, too.
diff -Nru file-5.45/debian/libmagic1.install file-5.45/debian/libmagic1.install
--- file-5.45/debian/libmagic1.install  2016-07-18 21:04:10.000000000 +0000
+++ file-5.45/debian/libmagic1.install  1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-etc
-usr/lib/*/*.so.*
-usr/share/man/man5
diff -Nru file-5.45/debian/libmagic1.links file-5.45/debian/libmagic1.links
--- file-5.45/debian/libmagic1.links    2018-02-07 22:56:07.000000000 +0000
+++ file-5.45/debian/libmagic1.links    1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-
-# upstream and many applications expect the magic in /usr/share/misc/,
-# other in /usr/share/file/.
-# Provide symlinks in the hope everybody gets satisfied.
-usr/share/file/magic    usr/share/misc/magic
diff -Nru file-5.45/debian/libmagic1.symbols file-5.45/debian/libmagic1.symbols
--- file-5.45/debian/libmagic1.symbols  2019-07-07 16:07:17.000000000 +0000
+++ file-5.45/debian/libmagic1.symbols  1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-libmagic.so.1 libmagic1 #MINVER#
-* Build-Depends-Package: libmagic-dev
- magic_buffer@Base 5.12
- magic_check@Base 5.12
- magic_close@Base 5.12
- magic_compile@Base 5.12
- magic_descriptor@Base 5.12
- magic_errno@Base 5.12
- magic_error@Base 5.12
- magic_file@Base 5.12
- magic_getflags@Base 5.32
- magic_getparam@Base 5.21
- magic_getpath@Base 5.12
- magic_list@Base 5.12
- magic_load@Base 5.12
- magic_load_buffers@Base 5.20
- magic_open@Base 5.12
- magic_setflags@Base 5.12
- magic_setparam@Base 5.21
- magic_version@Base 5.13
diff -Nru file-5.45/debian/libmagic1t64.bug-control 
file-5.45/debian/libmagic1t64.bug-control
--- file-5.45/debian/libmagic1t64.bug-control   1970-01-01 00:00:00.000000000 
+0000
+++ file-5.45/debian/libmagic1t64.bug-control   2010-02-01 13:26:27.000000000 
+0000
@@ -0,0 +1 @@
+Submit-As: file
diff -Nru file-5.45/debian/libmagic1t64.bug-presubj 
file-5.45/debian/libmagic1t64.bug-presubj
--- file-5.45/debian/libmagic1t64.bug-presubj   1970-01-01 00:00:00.000000000 
+0000
+++ file-5.45/debian/libmagic1t64.bug-presubj   2020-04-26 15:21:06.000000000 
+0000
@@ -0,0 +1,22 @@
+Reporting missing or buggy detection
+
+* Suggested bug severities
+
+  - Missing detection (just 'data'), or enhancements: wishlist
+  - Mis-detection: normal
+  - Regressions: important
+  - Overall correct detection, but with some glitches: minor
+
+* Reproducers
+
+It's crucial to test whether a detection works as expected, or why it
+fails. So please provide something suitable: Attach a short sample, or
+send an information where to find it. As a last resort, provide a hex
+dump of the first 256 bytes. Your package maintainer will ask for more
+if necessary. Double-check this file neither contains sensitive data
+nor infringes a copyright.
+
+* File format descriptions
+
+For any file types not detected yet: Pointers to documents that
+describe the file format are a great help, too.
diff -Nru file-5.45/debian/libmagic1t64.install 
file-5.45/debian/libmagic1t64.install
--- file-5.45/debian/libmagic1t64.install       1970-01-01 00:00:00.000000000 
+0000
+++ file-5.45/debian/libmagic1t64.install       2016-07-18 21:04:10.000000000 
+0000
@@ -0,0 +1,3 @@
+etc
+usr/lib/*/*.so.*
+usr/share/man/man5
diff -Nru file-5.45/debian/libmagic1t64.links 
file-5.45/debian/libmagic1t64.links
--- file-5.45/debian/libmagic1t64.links 1970-01-01 00:00:00.000000000 +0000
+++ file-5.45/debian/libmagic1t64.links 2018-02-07 22:56:07.000000000 +0000
@@ -0,0 +1,5 @@
+
+# upstream and many applications expect the magic in /usr/share/misc/,
+# other in /usr/share/file/.
+# Provide symlinks in the hope everybody gets satisfied.
+usr/share/file/magic    usr/share/misc/magic
diff -Nru file-5.45/debian/libmagic1t64.lintian-overrides 
file-5.45/debian/libmagic1t64.lintian-overrides
--- file-5.45/debian/libmagic1t64.lintian-overrides     1970-01-01 
00:00:00.000000000 +0000
+++ file-5.45/debian/libmagic1t64.lintian-overrides     2024-03-01 
11:59:16.000000000 +0000
@@ -0,0 +1 @@
+libmagic1t64: package-name-doesnt-match-sonames libmagic1
diff -Nru file-5.45/debian/libmagic1t64.symbols 
file-5.45/debian/libmagic1t64.symbols
--- file-5.45/debian/libmagic1t64.symbols       1970-01-01 00:00:00.000000000 
+0000
+++ file-5.45/debian/libmagic1t64.symbols       2024-03-01 11:59:16.000000000 
+0000
@@ -0,0 +1,20 @@
+libmagic.so.1 libmagic1t64 #MINVER#
+* Build-Depends-Package: libmagic-dev
+ magic_buffer@Base 5.12
+ magic_check@Base 5.12
+ magic_close@Base 5.12
+ magic_compile@Base 5.12
+ magic_descriptor@Base 5.12
+ magic_errno@Base 5.12
+ magic_error@Base 5.12
+ magic_file@Base 5.12
+ magic_getflags@Base 5.32
+ magic_getparam@Base 5.21
+ magic_getpath@Base 5.12
+ magic_list@Base 5.12
+ magic_load@Base 5.12
+ magic_load_buffers@Base 5.20
+ magic_open@Base 5.12
+ magic_setflags@Base 5.12
+ magic_setparam@Base 5.21
+ magic_version@Base 5.13

Reply via email to