Reverting t64 migration for backports.

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

7 files changed, 8 insertions, 12 deletions

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/libmagic1t64.bug-control b/debian/libmagic1.bug-control
index 5febadd..5febadd 100644
--- a/debian/libmagic1t64.bug-control
+++ b/debian/libmagic1.bug-control
diff --git a/debian/libmagic1t64.bug-presubj b/debian/libmagic1.bug-presubj
index 104abcb..104abcb 100644
--- a/debian/libmagic1t64.bug-presubj
+++ b/debian/libmagic1.bug-presubj
diff --git a/debian/libmagic1t64.install b/debian/libmagic1.install
index 5037686..5037686 100644
--- a/debian/libmagic1t64.install
+++ b/debian/libmagic1.install
diff --git a/debian/libmagic1t64.links b/debian/libmagic1.links
index 418e942..418e942 100644
--- a/debian/libmagic1t64.links
+++ b/debian/libmagic1.links
diff --git a/debian/libmagic1t64.symbols b/debian/libmagic1.symbols
index c2de0ea..8dda93e 100644
--- a/debian/libmagic1t64.symbols
+++ b/debian/libmagic1.symbols
@@ -1,4 +1,4 @@
-libmagic.so.1 libmagic1t64 #MINVER#
+libmagic.so.1 libmagic1 #MINVER#
 * Build-Depends-Package: libmagic-dev
  magic_buffer@Base 5.12
  magic_check@Base 5.12
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