16 files changed, 34 insertions, 54 deletions

diff --git a/debian/control b/debian/control
index 53ee51d..2e49949 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ XSBC-Original-Uploaders:
  Valentin Vidic <vvidic@debian.org>,
  Ferenc Wágner <wferi@debian.org>,
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: dpkg-dev (>= 1.22.5),
+Build-Depends:
  debhelper-compat (= 13),
  asciidoctor,
  autoconf,
@@ -59,11 +59,11 @@ Depends: ${shlibs:Depends},
  adduser,
  bzip2,
  libtimedate-perl,
- liblrm2t64 (>= ${binary:Version}),
- libpils2t64 (>= ${binary:Version}),
- libplumb2t64 (>= ${binary:Version}),
- libplumbgpl2t64 (>= ${binary:Version}),
- libstonith1t64 (>= ${binary:Version}),
+ liblrm2 (>= ${binary:Version}),
+ libpils2 (>= ${binary:Version}),
+ libplumb2 (>= ${binary:Version}),
+ libplumbgpl2 (>= ${binary:Version}),
+ libstonith1 (>= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Suggests:
  ipmitool
@@ -94,75 +94,60 @@ Description: Development files for the cluster glue components
  If you are developing for cluster-glue, you probably want to
  install this package.
 
-Package: liblrm2t64
-Provides: ${t64:Provides}
-Replaces: liblrm2
-Breaks: liblrm2 (<< ${source:Version})
+Package: liblrm2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- liblrm2t64
+Description: Reusable cluster libraries -- liblrm2
  This package contains the lrm helper library from cluster-glue,
  the reusable cluster components package.
  .
  If you want to use the pacemaker cluster manager, than you want
  to install this package.
 
-Package: libpils2t64
-Provides: ${t64:Provides}
-Replaces: libpils2
-Breaks: libpils2 (<< ${source:Version})
+Package: libpils2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- libpils2t64
+Description: Reusable cluster libraries -- libpils2
  This package contains the pils library from cluster-glue, the
  reusable cluster components package.
  .
  If you want to use the pacemaker cluster manager, than you want
  to install this package.
 
-Package: libplumb2t64
-Provides: ${t64:Provides}
-Replaces: libplumb2
-Breaks: libplumb2 (<< ${source:Version})
+Package: libplumb2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- libplumb2t64
+Description: Reusable cluster libraries -- libplumb2
  This package contains the plumber library from cluster-glue, the
  reusable cluster components package.
  .
  If you want to use the pacemaker cluster manager, than you want
  to install this package.
 
-Package: libplumbgpl2t64
-Provides: ${t64:Provides}
-Replaces: libplumbgpl2
-Breaks: libplumbgpl2 (<< ${source:Version})
+Package: libplumbgpl2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- libplumbgpl2t64
+Description: Reusable cluster libraries -- libplumbgpl2
  This package contains the plumber library from cluster-glue,
  the reusable cluster components package, in the GPL version.
  .
  If you want to use the pacemaker cluster manager, than you want
  to install this package.
 
-Package: libstonith1t64
-Provides: ${t64:Provides}
-Replaces: libstonith1
-Breaks: libstonith1 (<< ${source:Version})
+Package: libstonith1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: Reusable cluster libraries -- libstonith1t64
+Description: Reusable cluster libraries -- libstonith1
  This package contains the stonith library from cluster-glue, the
  reusable cluster components package.
  .
@@ -173,61 +158,61 @@ Package: liblrm2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- liblrm2t64 (= ${binary:Version})
+ liblrm2 (= ${binary:Version})
 Description: Reusable cluster development files -- liblrm
  This package contains the development files of the lrm helper
  library from cluster-glue, the reusable cluster components
  package.
  .
- If you are developing with liblrm2t64, you probably want to
+ If you are developing with liblrm2, you probably want to
  install this package.
 
 Package: libpils2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libpils2t64 (= ${binary:Version}),
+ libpils2 (= ${binary:Version}),
  libltdl-dev
-Description: Reusable cluster development files -- libpils2t64
+Description: Reusable cluster development files -- libpils2
  This package contains the development files of the pils
  library from cluster-glue, the reusable cluster components
  package.
  .
- If you are developing with libpils2t64, you probably want to
+ If you are developing with libpils2, you probably want to
  install this package.
 
 Package: libplumb2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libplumb2t64 (= ${binary:Version})
-Description: Reusable cluster development files -- libplumb2t64
+ libplumb2 (= ${binary:Version})
+Description: Reusable cluster development files -- libplumb2
  This package contains the development files of the plumber
  library from cluster-glue, the reusable cluster components
  package.
  .
- If you are developing with libplumb2t64, you probably want to
+ If you are developing with libplumb2, you probably want to
  install this package.
 
 Package: libplumbgpl2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libplumbgpl2t64 (= ${binary:Version})
-Description: Reusable cluster development files -- libplumbgpl2t64
+ libplumbgpl2 (= ${binary:Version})
+Description: Reusable cluster development files -- libplumbgpl2
  This package contains the development files of the plumber
  library from cluster-glue, the reusable cluster components
  package, in the GPL version.
  .
- If you are developing with libplumbgpl2t64, you probably want to
+ If you are developing with libplumbgpl2, you probably want to
  install this package.
 
 Package: libstonith1-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libstonith1t64 (= ${binary:Version})
-Description: Reusable cluster development files -- libstonith1t64
+ libstonith1 (= ${binary:Version})
+Description: Reusable cluster development files -- libstonith1
  This package contains the development files of the stonith
  library from cluster-glue, the reusable cluster components
  package.
diff --git a/debian/liblrm2t64.install b/debian/liblrm2.install
index ab3ceb1..ab3ceb1 100644
--- a/debian/liblrm2t64.install
+++ b/debian/liblrm2.install
diff --git a/debian/liblrm2t64.symbols b/debian/liblrm2.symbols
index 4cd5746..98db2fc 100644
--- a/debian/liblrm2t64.symbols
+++ b/debian/liblrm2.symbols
@@ -1,4 +1,4 @@
-liblrm.so.2 liblrm2t64 #MINVER#
+liblrm.so.2 liblrm2 #MINVER#
 * Build-Depends-Package: liblrm2-dev
  closefiles@Base 0
  copy_str_table@Base 0
diff --git a/debian/liblrm2t64.lintian-overrides b/debian/liblrm2t64.lintian-overrides
deleted file mode 100644
index 5f49562..0000000
--- a/debian/liblrm2t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-liblrm2t64: package-name-doesnt-match-sonames liblrm2
diff --git a/debian/libpils2t64.install b/debian/libpils2.install
index f36befc..f36befc 100644
--- a/debian/libpils2t64.install
+++ b/debian/libpils2.install
diff --git a/debian/libpils2t64.symbols b/debian/libpils2.symbols
index be97d00..5557ca4 100644
--- a/debian/libpils2t64.symbols
+++ b/debian/libpils2.symbols
@@ -1,4 +1,4 @@
-libpils.so.2 libpils2t64 #MINVER#
+libpils.so.2 libpils2 #MINVER#
 * Build-Depends-Package: libpils2-dev
  DelPILPluginUniv@Base 0
  NewPILPluginUniv@Base 0
diff --git a/debian/libpils2t64.lintian-overrides b/debian/libpils2t64.lintian-overrides
deleted file mode 100644
index cd1aa96..0000000
--- a/debian/libpils2t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libpils2t64: package-name-doesnt-match-sonames libpils2
diff --git a/debian/libplumb2t64.install b/debian/libplumb2.install
index 574594c..574594c 100644
--- a/debian/libplumb2t64.install
+++ b/debian/libplumb2.install
diff --git a/debian/libplumb2t64.symbols b/debian/libplumb2.symbols
index 14c8238..c821b44 100644
--- a/debian/libplumb2t64.symbols
+++ b/debian/libplumb2.symbols
@@ -1,4 +1,4 @@
-libplumb.so.2 libplumb2t64 #MINVER#
+libplumb.so.2 libplumb2 #MINVER#
 * Build-Depends-Package: libplumb2-dev
  CompressFuncs@Base 0
  DisableProcLogging@Base 0
diff --git a/debian/libplumb2t64.lintian-overrides b/debian/libplumb2t64.lintian-overrides
deleted file mode 100644
index bd254d3..0000000
--- a/debian/libplumb2t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libplumb2t64: package-name-doesnt-match-sonames libplumb2
diff --git a/debian/libplumbgpl2t64.install b/debian/libplumbgpl2.install
index fab8102..fab8102 100644
--- a/debian/libplumbgpl2t64.install
+++ b/debian/libplumbgpl2.install
diff --git a/debian/libplumbgpl2t64.symbols b/debian/libplumbgpl2.symbols
index c78e11f..c68f399 100644
--- a/debian/libplumbgpl2t64.symbols
+++ b/debian/libplumbgpl2.symbols
@@ -1,4 +1,4 @@
-libplumbgpl.so.2 libplumbgpl2t64 #MINVER#
+libplumbgpl.so.2 libplumbgpl2 #MINVER#
 * Build-Depends-Package: libplumbgpl2-dev
  init_set_proc_title@Base 0
  nosuchfunctionname@Base 0
diff --git a/debian/libplumbgpl2t64.lintian-overrides b/debian/libplumbgpl2t64.lintian-overrides
deleted file mode 100644
index d5f74e7..0000000
--- a/debian/libplumbgpl2t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libplumbgpl2t64: package-name-doesnt-match-sonames libplumbgpl2
diff --git a/debian/libstonith1t64.install b/debian/libstonith1.install
index 6dda1c7..6dda1c7 100644
--- a/debian/libstonith1t64.install
+++ b/debian/libstonith1.install
diff --git a/debian/libstonith1t64.symbols b/debian/libstonith1.symbols
index c45f2f7..bb89df0 100644
--- a/debian/libstonith1t64.symbols
+++ b/debian/libstonith1.symbols
@@ -1,4 +1,4 @@
-libstonith.so.1 libstonith1t64 #MINVER#
+libstonith.so.1 libstonith1 #MINVER#
 * Build-Depends-Package: libstonith1-dev
  StonithPIsys@Base 0
  free_NVpair@Base 0
diff --git a/debian/libstonith1t64.lintian-overrides b/debian/libstonith1t64.lintian-overrides
deleted file mode 100644
index 77e0807..0000000
--- a/debian/libstonith1t64.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libstonith1t64: package-name-doesnt-match-sonames libstonith1