From 07b6fe2e9df5f9eb9283de35bd6d30aa34d1fb90 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 19:02:32 +0200 Subject: Reverting t64 migration for backports. Signed-off-by: Daniel Baumann --- debian/control | 17 +++++++---------- debian/libmagic1.bug-control | 1 + debian/libmagic1.bug-presubj | 22 ++++++++++++++++++++++ debian/libmagic1.install | 3 +++ debian/libmagic1.links | 5 +++++ debian/libmagic1.symbols | 20 ++++++++++++++++++++ debian/libmagic1t64.bug-control | 1 - debian/libmagic1t64.bug-presubj | 22 ---------------------- debian/libmagic1t64.install | 3 --- debian/libmagic1t64.links | 5 ----- debian/libmagic1t64.lintian-overrides | 1 - debian/libmagic1t64.symbols | 20 -------------------- 12 files changed, 58 insertions(+), 62 deletions(-) create mode 100644 debian/libmagic1.bug-control create mode 100644 debian/libmagic1.bug-presubj create mode 100644 debian/libmagic1.install create mode 100644 debian/libmagic1.links create mode 100644 debian/libmagic1.symbols delete mode 100644 debian/libmagic1t64.bug-control delete mode 100644 debian/libmagic1t64.bug-presubj delete mode 100644 debian/libmagic1t64.install delete mode 100644 debian/libmagic1t64.links delete mode 100644 debian/libmagic1t64.lintian-overrides delete mode 100644 debian/libmagic1t64.symbols diff --git a/debian/control b/debian/control index 137adda..a999532 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/file Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/file XSBC-Original-Vcs-Browser: https://git.in-ulm.de/cbiedl/file XSBC-Original-Vcs-Git: https://git.in-ulm.de/cbiedl/file.git -Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), +Build-Depends: debhelper-compat (= 13), libbz2-dev, liblzma-dev, zlib1g-dev, @@ -20,7 +20,7 @@ Section: utils Package: file Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - libmagic1t64 (= ${binary:Version}), + libmagic1 (= ${binary:Version}), Breaks: debhelper (<< 12.2~), Multi-Arch: foreign @@ -30,10 +30,7 @@ Description: Recognize the type of data in a file using "magic" numbers . This package contains the file program itself. -Package: libmagic1t64 -Provides: ${t64:Provides} -Replaces: libmagic1 -Breaks: libmagic1 (<< ${source:Version}) +Package: libmagic1 Architecture: any Pre-Depends: ${misc:Pre-Depends}, @@ -52,22 +49,22 @@ Package: libmagic-mgc Architecture: any Depends: ${misc:Depends}, Breaks: - libmagic1t64 (<< 1:5.28-4~), + libmagic1 (<< 1:5.28-4~), Replaces: - libmagic1t64 (<< 1:5.28-4~), + libmagic1 (<< 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 libmagic1t64 in order to meet the multiarch + been separated from libmagic1 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}, - libmagic1t64 (= ${binary:Version}), + libmagic1 (= ${binary:Version}), Suggests: file, Section: libdevel diff --git a/debian/libmagic1.bug-control b/debian/libmagic1.bug-control new file mode 100644 index 0000000..5febadd --- /dev/null +++ b/debian/libmagic1.bug-control @@ -0,0 +1 @@ +Submit-As: file diff --git a/debian/libmagic1.bug-presubj b/debian/libmagic1.bug-presubj new file mode 100644 index 0000000..104abcb --- /dev/null +++ b/debian/libmagic1.bug-presubj @@ -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 --git a/debian/libmagic1.install b/debian/libmagic1.install new file mode 100644 index 0000000..5037686 --- /dev/null +++ b/debian/libmagic1.install @@ -0,0 +1,3 @@ +etc +usr/lib/*/*.so.* +usr/share/man/man5 diff --git a/debian/libmagic1.links b/debian/libmagic1.links new file mode 100644 index 0000000..418e942 --- /dev/null +++ b/debian/libmagic1.links @@ -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 --git a/debian/libmagic1.symbols b/debian/libmagic1.symbols new file mode 100644 index 0000000..8dda93e --- /dev/null +++ b/debian/libmagic1.symbols @@ -0,0 +1,20 @@ +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 --git a/debian/libmagic1t64.bug-control b/debian/libmagic1t64.bug-control deleted file mode 100644 index 5febadd..0000000 --- a/debian/libmagic1t64.bug-control +++ /dev/null @@ -1 +0,0 @@ -Submit-As: file diff --git a/debian/libmagic1t64.bug-presubj b/debian/libmagic1t64.bug-presubj deleted file mode 100644 index 104abcb..0000000 --- a/debian/libmagic1t64.bug-presubj +++ /dev/null @@ -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 --git a/debian/libmagic1t64.install b/debian/libmagic1t64.install deleted file mode 100644 index 5037686..0000000 --- a/debian/libmagic1t64.install +++ /dev/null @@ -1,3 +0,0 @@ -etc -usr/lib/*/*.so.* -usr/share/man/man5 diff --git a/debian/libmagic1t64.links b/debian/libmagic1t64.links deleted file mode 100644 index 418e942..0000000 --- a/debian/libmagic1t64.links +++ /dev/null @@ -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 --git a/debian/libmagic1t64.lintian-overrides b/debian/libmagic1t64.lintian-overrides deleted file mode 100644 index fb7dd2e..0000000 --- a/debian/libmagic1t64.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libmagic1t64: package-name-doesnt-match-sonames libmagic1 diff --git a/debian/libmagic1t64.symbols b/debian/libmagic1t64.symbols deleted file mode 100644 index c2de0ea..0000000 --- a/debian/libmagic1t64.symbols +++ /dev/null @@ -1,20 +0,0 @@ -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 -- cgit v1.2.3