Rename archipelago-kernel-dkms to archipelago-modules-dkms

diff --git a/debian/archipelago-kernel-dkms.install.in b/debian/archipelago-kernel-dkms.install.in
deleted file mode 100644 (file)
index 33cf6fa..0000000
--- a/debian/archipelago-kernel-dkms.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/src/archipelago-kernel-dkms-#VERSION#
-debian/archipelago-kernel-dkms-files/Makefile usr/src/archipelago-kernel-dkms-#VERSION#
-

diff --git a/debian/archipelago-kernel-dkms.lintian-overrides b/debian/archipelago-kernel-dkms.lintian-overrides
deleted file mode 100644 (file)
index 4cc6cbb..0000000
--- a/debian/archipelago-kernel-dkms.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-archipelago-kernel-dkms binary: new-package-should-close-itp-bug

diff --git a/debian/archipelago-kernel-dkms-files/Makefile b/debian/archipelago-modules-dkms-files/Makefile
similarity index 100%
rename from debian/archipelago-kernel-dkms-files/Makefile
rename to debian/archipelago-modules-dkms-files/Makefile

diff --git a/debian/archipelago-kernel-dkms.dkms b/debian/archipelago-modules-dkms.dkms
similarity index 95%
rename from debian/archipelago-kernel-dkms.dkms
rename to debian/archipelago-modules-dkms.dkms
index be637b4..01cc983 100644 (file)
--- a/debian/archipelago-kernel-dkms.dkms
+++ b/debian/archipelago-modules-dkms.dkms
@@ -1,5 +1,5 @@
 PACKAGE_VERSION="#MODULE_VERSION#"
-PACKAGE_NAME="archipelago-kernel-dkms"
+PACKAGE_NAME="archipelago-modules-dkms"
 CLEAN="make clean"
 
 BUILT_MODULE_NAME[0]="xseg_posix"

diff --git a/debian/archipelago-modules-dkms.install.in b/debian/archipelago-modules-dkms.install.in
new file mode 100644 (file)
index 0000000..76166ce
--- /dev/null
+++ b/debian/archipelago-modules-dkms.install.in
@@ -0,0 +1,3 @@
+usr/src/archipelago-modules-dkms-#VERSION#
+debian/archipelago-modules-dkms-files/Makefile usr/src/archipelago-modules-dkms-#VERSION#
+

diff --git a/debian/archipelago-modules-dkms.lintian-overrides b/debian/archipelago-modules-dkms.lintian-overrides
new file mode 100644 (file)
index 0000000..64ba464
--- /dev/null
+++ b/debian/archipelago-modules-dkms.lintian-overrides
@@ -0,0 +1 @@
+archipelago-modules-dkms binary: new-package-should-close-itp-bug

diff --git a/debian/archipelago-kernel-dkms.postinst b/debian/archipelago-modules-dkms.postinst
similarity index 100%
rename from debian/archipelago-kernel-dkms.postinst
rename to debian/archipelago-modules-dkms.postinst

diff --git a/debian/archipelago-kernel-dkms.prerm b/debian/archipelago-modules-dkms.prerm
similarity index 100%
rename from debian/archipelago-kernel-dkms.prerm
rename to debian/archipelago-modules-dkms.prerm

diff --git a/debian/archipelago-modules-source-files/control.in b/debian/archipelago-modules-source-files/control.in
index d30d279..8506720 100644 (file)
--- a/debian/archipelago-modules-source-files/control.in
+++ b/debian/archipelago-modules-source-files/control.in
@@ -14,7 +14,7 @@ Description: Provides archipelago-modules infrastructure for #KVERS#
 
 Package: archipelago-modules
 Architecture: all
-Conflicts: archipelago-kernel-dkms
+Conflicts: archipelago-modules-dkms
 Depends: archipelago-modules-#KVERS#(=${binary:Version})
 Description: Provides archipelago-modules infrastructure
  Extended Description here

diff --git a/debian/archipelago-modules-source.install b/debian/archipelago-modules-source.install
index 825dc3c..5ef60d8 100644 (file)
--- a/debian/archipelago-modules-source.install
+++ b/debian/archipelago-modules-source.install
@@ -1,4 +1,4 @@
-usr/src/archipelago-kernel-dkms-*/xseg usr/src/modules/archipelago-modules/
+usr/src/archipelago-modules-dkms-*/xseg usr/src/modules/archipelago-modules/
 debian/changelog usr/src/modules/archipelago-modules/debian/
 debian/copyright usr/src/modules/archipelago-modules/debian/
 debian/compat usr/src/modules/archipelago-modules/debian/

diff --git a/debian/control b/debian/control
index 68092e2..73eaabf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Depends: ${misc:Depends},  ${shlibs:Depends}, ${python:Depends},
  libxseg0(=${binary:Version}), python-xseg(=${binary:Version}),
  python-archipelago(=${binary:Version}),
  librados2(=0.56.3+grnet-1),
- archipelago-modules(=${binary:Version}) | archipelago-kernel-dkms(=${binary:Version})
+ archipelago-modules(=${binary:Version}) | archipelago-modules-dkms(=${binary:Version})
 Description:  Provides archipelago infrastructure
  Extended Description here
 
@@ -62,7 +62,7 @@ Depends: ${misc:Depends}, python(>=2.6), archipelago(=${binary:Version}),
 Description:  Provides archipelago ganeti ext storage scripts
  Extended Description here
 
-Package: archipelago-kernel-dkms
+Package: archipelago-modules-dkms
 Architecture: any
 Depends: ${misc:Depends}, dkms(>=2.1.0.0), linux-headers-amd64(>= 3.2)
 Conflicts: archipelago-modules

diff --git a/debian/rules b/debian/rules
index 7970e41..c9ccb66 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,8 @@ override_dh_fixperms:
 #      chmod 0750 $(DESTDIR)/var/log/ganeti/extstorage
 
 override_dh_install:
-       cat debian/archipelago-kernel-dkms.install.in | sed "s/#VERSION#/$(VERSION)/g" \
-               > debian/archipelago-kernel-dkms.install
+       cat debian/archipelago-modules-dkms.install.in | sed "s/#VERSION#/$(VERSION)/g" \
+               > debian/archipelago-modules-dkms.install
        dh_install
        (cd debian/archipelago-modules-source/usr/src \
                && chown -R root:root modules \