diff -Nru dlm-4.0.7/debian/changelog dlm-4.0.7/debian/changelog
--- dlm-4.0.7/debian/changelog 2017-02-07 15:26:51.000000000 -0800
+++ dlm-4.0.7/debian/changelog 2017-05-03 16:48:18.000000000 -0700
@@ -1,3 +1,14 @@
+dlm (4.0.7-1ubuntu2) artful; urgency=medium
+
+ * Rename dlm -> dlm-controld (LP: #1669133).
+ - The dlm transitional package will need to be kept until 18.04
+ releases.
+ * Drop:
+ - d/control,dlm.install, rules: Rename dlm-controld -> dlm inline
+ with packaging history in Ubuntu
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com> Wed, 03 May 2017 16:48:18 -0700
+
dlm (4.0.7-1ubuntu1) zesty; urgency=medium
* Resync with Debian unstable.
diff -Nru dlm-4.0.7/debian/control dlm-4.0.7/debian/control
--- dlm-4.0.7/debian/control 2017-02-07 15:26:51.000000000 -0800
+++ dlm-4.0.7/debian/control 2017-05-03 16:48:14.000000000 -0700
@@ -19,7 +19,7 @@
Vcs-Git: https://anonscm.debian.org/git/debian-ha/dlm.git
Vcs-Browser: https://anonscm.debian.org/cgit/debian-ha/dlm.git/
-Package: dlm
+Package: dlm-controld
Architecture: linux-any
Depends:
corosync,
@@ -28,8 +28,10 @@
# we're taking over /usr/sbin/dlm_{controld,tool}
Breaks:
cman,
+ dlm (<< 4.0.7-1ubuntu2~),
Replaces:
cman,
+ dlm (<< 4.0.7-1ubuntu2~),
Description: Distributed Lock Manager control daemon
DLM is a symmetric general-purpose distributed lock manager.
The lock manager itself is a kernel module.
@@ -85,3 +87,12 @@
.
This package contains the headers and other necessary files to build
applications or libraries that use the DLM control library.
+
+Package: dlm
+Architecture: all
+Depends: dlm-controld, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: transitional package dlm-controld
+ This is a transitional package. It can safely be removed.
+
diff -Nru dlm-4.0.7/debian/dlm-controld.install dlm-4.0.7/debian/dlm-controld.install
--- dlm-4.0.7/debian/dlm-controld.install 1969-12-31 16:00:00.000000000 -0800
+++ dlm-4.0.7/debian/dlm-controld.install 2017-02-07 15:26:51.000000000 -0800
@@ -0,0 +1,5 @@
+debian/configfs.conf usr/lib/modules-load.d
+usr/lib/udev/rules.d/51-dlm.rules lib/udev/rules.d
+usr/sbin
+usr/share/man/man5
+usr/share/man/man8
diff -Nru dlm-4.0.7/debian/dlm.install dlm-4.0.7/debian/dlm.install
--- dlm-4.0.7/debian/dlm.install 2017-02-07 15:26:51.000000000 -0800
+++ dlm-4.0.7/debian/dlm.install 1969-12-31 16:00:00.000000000 -0800
@@ -1,5 +0,0 @@
-debian/configfs.conf usr/lib/modules-load.d
-usr/lib/udev/rules.d/51-dlm.rules lib/udev/rules.d
-usr/sbin
-usr/share/man/man5
-usr/share/man/man8
diff -Nru dlm-4.0.7/debian/rules dlm-4.0.7/debian/rules
--- dlm-4.0.7/debian/rules 2017-02-07 15:26:51.000000000 -0800
+++ dlm-4.0.7/debian/rules 2017-05-03 16:48:18.000000000 -0700
@@ -14,8 +14,8 @@
override_dh_auto_install:
dh_auto_install -- LIBNUM=/lib/$(DEB_HOST_MULTIARCH)
-DEFDIR=debian/dlm/etc/default
-SDDIR= debian/dlm/lib/systemd/system
+DEFDIR=debian/dlm-controld/etc/default
+SDDIR= debian/dlm-controld/lib/systemd/system
override_dh_install:
dh_install --fail-missing
mkdir -p "$(DEFDIR)" "$(SDDIR)"