Reverting t64 migration for backports.

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

28 files changed, 28 insertions, 64 deletions

diff --git a/debian/control b/debian/control
index 6fd60fe..32af3ed 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ XSBC-Original-Uploaders:
  Ferenc Wágner <wferi@debian.org>,
  Adrian Vondendriesch <adrian.vondendriesch@credativ.de>,
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: dpkg-dev (>= 1.22.5),
+Build-Depends:
  cluster-glue-dev,
  debhelper-compat (= 13),
  dh-exec,
@@ -184,10 +184,7 @@ Description: cluster resource manager HTML documentation
   * the Pacemaker Explained book and
   * the Pacemaker Remote book.
 
-Package: libcib27t64
-Provides: ${t64:Provides}
-Replaces: libcib27
-Breaks: libcib27 (<< ${source:Version})
+Package: libcib27
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -199,10 +196,7 @@ Description: cluster resource manager CIB library
  .
  This package contains the Cluster Information Base library.
 
-Package: libcrmcluster29t64
-Provides: ${t64:Provides}
-Replaces: libcrmcluster29
-Breaks: libcrmcluster29 (<< ${source:Version})
+Package: libcrmcluster29
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -214,10 +208,7 @@ Description: cluster resource manager cluster library
  .
  This package contains the cluster library.
 
-Package: libcrmcommon34t64
-Provides: ${t64:Provides}
-Replaces: libcrmcommon34
-Breaks: libcrmcommon34 (<< ${source:Version})
+Package: libcrmcommon34
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -229,10 +220,7 @@ Description: cluster resource manager common library
  .
  This package contains the common library.
 
-Package: libcrmservice28t64
-Provides: ${t64:Provides}
-Replaces: libcrmservice28
-Breaks: libcrmservice28 (<< ${source:Version})
+Package: libcrmservice28
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -244,10 +232,7 @@ Description: cluster resource manager service library
  .
  This package contains the service library.
 
-Package: liblrmd28t64
-Provides: ${t64:Provides}
-Replaces: liblrmd28
-Breaks: liblrmd28 (<< ${source:Version})
+Package: liblrmd28
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -259,10 +244,7 @@ Description: cluster resource manager LRMD library
  .
  This package contains the Local Resource Manager Daemon library.
 
-Package: libpacemaker1t64
-Provides: ${t64:Provides}
-Replaces: libpacemaker1
-Breaks: libpacemaker1 (<< ${source:Version})
+Package: libpacemaker1
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -275,10 +257,7 @@ Description: cluster resource manager utility library
  This package contains the utility library resulting from the merge
  of libpengine and libtransitioner.
 
-Package: libpe-rules26t64
-Provides: ${t64:Provides}
-Replaces: libpe-rules26
-Breaks: libpe-rules26 (<< ${source:Version})
+Package: libpe-rules26
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -290,10 +269,7 @@ Description: cluster resource manager Policy Engine rules library
  .
  This package contains the Policy Engine rules library.
 
-Package: libpe-status28t64
-Provides: ${t64:Provides}
-Replaces: libpe-status28
-Breaks: libpe-status28 (<< ${source:Version})
+Package: libpe-status28
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -305,10 +281,7 @@ Description: cluster resource manager Policy Engine status library
  .
  This package contains the Policy Engine status library.
 
-Package: libstonithd26t64
-Provides: ${t64:Provides}
-Replaces: libstonithd26
-Breaks: libstonithd26 (<< ${source:Version})
+Package: libstonithd26
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -343,15 +316,15 @@ Multi-Arch: same
 Section: libdevel
 Depends:
  ${misc:Depends},
- libcib27t64 (= ${binary:Version}),
- libcrmcluster29t64 (= ${binary:Version}),
- libcrmcommon34t64 (= ${binary:Version}),
- libcrmservice28t64 (= ${binary:Version}),
- liblrmd28t64 (= ${binary:Version}),
- libpacemaker1t64 (= ${binary:Version}),
- libpe-rules26t64 (= ${binary:Version}),
- libpe-status28t64 (= ${binary:Version}),
- libstonithd26t64 (= ${binary:Version}),
+ libcib27 (= ${binary:Version}),
+ libcrmcluster29 (= ${binary:Version}),
+ libcrmcommon34 (= ${binary:Version}),
+ libcrmservice28 (= ${binary:Version}),
+ liblrmd28 (= ${binary:Version}),
+ libpacemaker1 (= ${binary:Version}),
+ libpe-rules26 (= ${binary:Version}),
+ libpe-status28 (= ${binary:Version}),
+ libstonithd26 (= ${binary:Version}),
 # we include headers from these:
  libcpg-dev,
  libglib2.0-dev,
diff --git a/debian/libcib27t64.install b/debian/libcib27.install
index c4c7f15..c4c7f15 100644
--- a/debian/libcib27t64.install
+++ b/debian/libcib27.install
diff --git a/debian/libcib27t64.symbols b/debian/libcib27.symbols
index be0fc47..899b862 100644
--- a/debian/libcib27t64.symbols
+++ b/debian/libcib27.symbols
@@ -1,4 +1,4 @@
-libcib.so.27 libcib27t64 #MINVER#
+libcib.so.27 libcib27 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  cib__clean_up_connection@Base 2.1.4
  cib__config_changed_v1@Base 2.1.6
diff --git a/debian/libcib27t64.lintian-overrides b/debian/libcib27t64.lintian-overrides
deleted file mode 100644
index cddf222..0000000
--- a/debian/libcib27t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcib27t64: package-name-doesnt-match-sonames libcib27
diff --git a/debian/libcrmcluster29t64.install b/debian/libcrmcluster29.install
index b3ad577..b3ad577 100644
--- a/debian/libcrmcluster29t64.install
+++ b/debian/libcrmcluster29.install
diff --git a/debian/libcrmcluster29t64.symbols b/debian/libcrmcluster29.symbols
index e6557a9..6574ea0 100644
--- a/debian/libcrmcluster29t64.symbols
+++ b/debian/libcrmcluster29.symbols
@@ -1,4 +1,4 @@
-libcrmcluster.so.29 libcrmcluster29t64 #MINVER#
+libcrmcluster.so.29 libcrmcluster29 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  cluster_connect_cpg@Base 1.1.10
  cluster_disconnect_cpg@Base 1.1.10
diff --git a/debian/libcrmcluster29t64.lintian-overrides b/debian/libcrmcluster29t64.lintian-overrides
deleted file mode 100644
index 8c79aa6..0000000
--- a/debian/libcrmcluster29t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcrmcluster29t64: package-name-doesnt-match-sonames libcrmcluster29
diff --git a/debian/libcrmcommon34t64.install b/debian/libcrmcommon34.install
index 612e360..612e360 100644
--- a/debian/libcrmcommon34t64.install
+++ b/debian/libcrmcommon34.install
diff --git a/debian/libcrmcommon34t64.symbols b/debian/libcrmcommon34.symbols
index 0539d05..b00f283 100644
--- a/debian/libcrmcommon34t64.symbols
+++ b/debian/libcrmcommon34.symbols
@@ -1,4 +1,4 @@
-libcrmcommon.so.34 libcrmcommon34t64 #MINVER#
+libcrmcommon.so.34 libcrmcommon34 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  add_message_xml@Base 1.1.9
  add_node_copy@Base 1.1.9
diff --git a/debian/libcrmcommon34t64.lintian-overrides b/debian/libcrmcommon34t64.lintian-overrides
deleted file mode 100644
index 9005ec8..0000000
--- a/debian/libcrmcommon34t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcrmcommon34t64: package-name-doesnt-match-sonames libcrmcommon34
diff --git a/debian/libcrmservice28t64.install b/debian/libcrmservice28.install
index 8910f1e..8910f1e 100644
--- a/debian/libcrmservice28t64.install
+++ b/debian/libcrmservice28.install
diff --git a/debian/libcrmservice28t64.symbols b/debian/libcrmservice28.symbols
index 8c00230..f3210a1 100644
--- a/debian/libcrmservice28t64.symbols
+++ b/debian/libcrmservice28.symbols
@@ -1,4 +1,4 @@
-libcrmservice.so.28 libcrmservice28t64 #MINVER#
+libcrmservice.so.28 libcrmservice28 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  get_directory_list@Base 1.1.13
  resources_action_create@Base 1.1.13
diff --git a/debian/libcrmservice28t64.lintian-overrides b/debian/libcrmservice28t64.lintian-overrides
deleted file mode 100644
index 6ce04f0..0000000
--- a/debian/libcrmservice28t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcrmservice28t64: package-name-doesnt-match-sonames libcrmservice28
diff --git a/debian/liblrmd28t64.install b/debian/liblrmd28.install
index c553ddc..c553ddc 100644
--- a/debian/liblrmd28t64.install
+++ b/debian/liblrmd28.install
diff --git a/debian/liblrmd28t64.symbols b/debian/liblrmd28.symbols
index 5625a2e..7bae4e0 100644
--- a/debian/liblrmd28t64.symbols
+++ b/debian/liblrmd28.symbols
@@ -1,4 +1,4 @@
-liblrmd.so.28 liblrmd28t64 #MINVER#
+liblrmd.so.28 liblrmd28 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  lrmd__init_remote_key@Base 2.1.1
  lrmd__metadata_async@Base 2.1.5
diff --git a/debian/liblrmd28t64.lintian-overrides b/debian/liblrmd28t64.lintian-overrides
deleted file mode 100644
index 0ccce55..0000000
--- a/debian/liblrmd28t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-liblrmd28t64: package-name-doesnt-match-sonames liblrmd28
diff --git a/debian/libpacemaker1t64.install b/debian/libpacemaker1.install
index 71c739c..71c739c 100644
--- a/debian/libpacemaker1t64.install
+++ b/debian/libpacemaker1.install
diff --git a/debian/libpacemaker1t64.symbols b/debian/libpacemaker1.symbols
index 40f2d83..88adb98 100644
--- a/debian/libpacemaker1t64.symbols
+++ b/debian/libpacemaker1.symbols
@@ -1,4 +1,4 @@
-libpacemaker.so.1 libpacemaker1t64 #MINVER#
+libpacemaker.so.1 libpacemaker1 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  clone_action_flags@Base 1.1.14~rc4
  clone_append_meta@Base 1.1.14~rc4
diff --git a/debian/libpacemaker1t64.lintian-overrides b/debian/libpacemaker1t64.lintian-overrides
deleted file mode 100644
index 5ff868d..0000000
--- a/debian/libpacemaker1t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libpacemaker1t64: package-name-doesnt-match-sonames libpacemaker1
diff --git a/debian/libpe-rules26t64.install b/debian/libpe-rules26.install
index 7cc301b..7cc301b 100644
--- a/debian/libpe-rules26t64.install
+++ b/debian/libpe-rules26.install
diff --git a/debian/libpe-rules26t64.symbols b/debian/libpe-rules26.symbols
index 3a27153..2a31c7f 100644
--- a/debian/libpe-rules26t64.symbols
+++ b/debian/libpe-rules26.symbols
@@ -1,4 +1,4 @@
-libpe_rules.so.26 libpe-rules26t64 #MINVER#
+libpe_rules.so.26 libpe-rules26 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  add_hash_param@Base 1.0.10
  fail2text@Base 1.0.10
diff --git a/debian/libpe-rules26t64.lintian-overrides b/debian/libpe-rules26t64.lintian-overrides
deleted file mode 100644
index 892d400..0000000
--- a/debian/libpe-rules26t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libpe-rules26t64: package-name-doesnt-match-sonames libpe-rules26
diff --git a/debian/libpe-status28t64.install b/debian/libpe-status28.install
index 4d92e65..4d92e65 100644
--- a/debian/libpe-status28t64.install
+++ b/debian/libpe-status28.install
diff --git a/debian/libpe-status28t64.symbols b/debian/libpe-status28.symbols
index 1a8b8c5..6a1b193 100644
--- a/debian/libpe-status28t64.symbols
+++ b/debian/libpe-status28.symbols
@@ -1,4 +1,4 @@
-libpe_status.so.28 libpe-status28t64 #MINVER#
+libpe_status.so.28 libpe-status28 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  add_hash_param@Base 1.1.14~rc4
  add_tag_ref@Base 1.1.14~rc4
diff --git a/debian/libpe-status28t64.lintian-overrides b/debian/libpe-status28t64.lintian-overrides
deleted file mode 100644
index 3ad32ea..0000000
--- a/debian/libpe-status28t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libpe-status28t64: package-name-doesnt-match-sonames libpe-status28
diff --git a/debian/libstonithd26t64.install b/debian/libstonithd26.install
index f88790f..f88790f 100644
--- a/debian/libstonithd26t64.install
+++ b/debian/libstonithd26.install
diff --git a/debian/libstonithd26t64.symbols b/debian/libstonithd26.symbols
index 16caf25..8bca120 100644
--- a/debian/libstonithd26t64.symbols
+++ b/debian/libstonithd26.symbols
@@ -1,4 +1,4 @@
-libstonithd.so.26 libstonithd26t64 #MINVER#
+libstonithd.so.26 libstonithd26 #MINVER#
 * Build-Depends-Package: pacemaker-dev
  create_device_registration_xml@Base 1.1.9
  create_level_registration_xml@Base 1.1.9
diff --git a/debian/libstonithd26t64.lintian-overrides b/debian/libstonithd26t64.lintian-overrides
deleted file mode 100644
index 53861ba..0000000
--- a/debian/libstonithd26t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libstonithd26t64: package-name-doesnt-match-sonames libstonithd26