rename archipelagos to archipelago

diff --git a/debian/README b/debian/README
index 3d94a95..9d3aa89 100644 (file)
--- a/debian/README
+++ b/debian/README
@@ -1,4 +1,4 @@
-The Debian Package archipelagos
+The Debian Package archipelago
 ------------------------------
 
 Comments regarding the Package

diff --git a/debian/archipelagos-ganeti.install b/debian/archipelago-ganeti.install
similarity index 100%
rename from debian/archipelagos-ganeti.install
rename to debian/archipelago-ganeti.install

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

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

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

diff --git a/debian/archipelagos-kernel-dkms.install b/debian/archipelago-kernel-dkms.install
similarity index 98%
rename from debian/archipelagos-kernel-dkms.install
rename to debian/archipelago-kernel-dkms.install
index aac1e25..7a74454 100644 (file)
--- a/debian/archipelagos-kernel-dkms.install
+++ b/debian/archipelago-kernel-dkms.install
@@ -37,8 +37,7 @@ xseg/peers/user/monitor.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
 xseg/peers/user/mpeer.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
 xseg/peers/user/mpeer.h usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
 xseg/peers/user/mt-mapperd.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mt-mapperd.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mt-mapperd.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
+xseg/peers/user/mt-pfiled.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
 xseg/peers/user/mt-sosd.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
 xseg/peers/user/mt-vlmcd.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user
 xseg/peers/user/peer.c usr/src/archipelagos-kernel-dkms-0.1.1/xseg/peers/user

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

diff --git a/debian/archipelagos.default b/debian/archipelago.default
similarity index 95%
rename from debian/archipelagos.default
rename to debian/archipelago.default
index 84b1e93..3d5a75a 100644 (file)
--- a/debian/archipelagos.default
+++ b/debian/archipelago.default
@@ -25,7 +25,7 @@ VPORT_END=403
 # peers
 
 LOGS_PATH="/srv/archip/logs"
-#PIDFILE_PATH="/var/run/archipelagos"
+#PIDFILE_PATH="/var/run/archipelago"
 
 BLOCKER="mt-sosd"
 MAPPER="mt-mapperd"

diff --git a/debian/archipelagos.install b/debian/archipelago.install
similarity index 100%
rename from debian/archipelagos.install
rename to debian/archipelago.install

diff --git a/debian/archipelago.lintian-overrides b/debian/archipelago.lintian-overrides
new file mode 100644 (file)
index 0000000..f9f8466
--- /dev/null
+++ b/debian/archipelago.lintian-overrides
@@ -0,0 +1,3 @@
+archipelago binary: new-package-should-close-itp-bug
+archipelago binary: non-dev-pkg-with-shlib-symlink
+archipelago binary: package-name-doesnt-match-sonames 

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

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

diff --git a/debian/archipelagos.lintian-overrides b/debian/archipelagos.lintian-overrides
deleted file mode 100644 (file)
index 2a045d6..0000000
--- a/debian/archipelagos.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-archipelagos binary: new-package-should-close-itp-bug
-archipelagos binary: non-dev-pkg-with-shlib-symlink
-archipelagos binary: package-name-doesnt-match-sonames 

diff --git a/debian/changelog b/debian/changelog
index 38ecd53..a6045da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-archipelagos (0.1.1-1) unstable; urgency=low
+archipelago (0.1.1-1) unstable; urgency=low
 
   * Initial release
 

diff --git a/debian/control b/debian/control
index 96b84fc..0f60434 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: archipelagos
+Source: archipelago
 Section: otherosfs
 Priority: extra
 Maintainer: Filippos Giannakos <philipgian@grnet.gr>
@@ -11,21 +11,23 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Xseg library
  Extended Description here
 
-Package: archipelagos
+Package: archipelago
 Architecture: amd64
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libxseg0, libgcrypt11(>=1.4.5-2), libst1(>=1.9-3), librados2(>=0.48.2), python-psutil(>=0.1.3), python-argparse
-Description:  Provides archipelagos infrastructure
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
+        libxseg0, libgcrypt11(>=1.4.5-2), libst1(>=1.9-3),
+        librados2(>=0.48.2), python-psutil(>=0.1.3), python-argparse
+Description:  Provides archipelago infrastructure
  Extended Description here
 
-Package: archipelagos-ganeti
+Package: archipelago-ganeti
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, archipelagos
-Description:  Provides archipelagos ganeti ext storage scripts
+Depends: ${misc:Depends}, ${python:Depends}, archipelago
+Description:  Provides archipelago ganeti ext storage scripts
  Extended Description here
 
-Package: archipelagos-kernel-dkms
+Package: archipelago-kernel-dkms
 Architecture: all
-Depends: ${misc:Depends}, archipelagos(=0.1.1-1)
-Description:  Provides archipelagos-kernel infrastructure
+Depends: ${misc:Depends}, archipelago(=0.1.1-1)
+Description:  Provides archipelago-kernel infrastructure
  Extended Description here
 

diff --git a/make_install_file.sh b/make_install_file.sh
index a9b387d..96b50cf 100755 (executable)
--- a/make_install_file.sh
+++ b/make_install_file.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 VERSION=$(head -n 1 debian/changelog | sed -r 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/g')
-INSTALL_PATH="usr/src/archipelagos-kernel-dkms-$VERSION"
+INSTALL_PATH="usr/src/archipelago-kernel-dkms-$VERSION"
 
-echo "debian/archipelagos-kernel-dkms-files/Makefile $INSTALL_PATH"
+echo "debian/archipelago-kernel-dkms-files/Makefile $INSTALL_PATH"
 git ls-files --directory xseg | sed 's/.*git.*//' | sed 's,\(.*\)\/\(.*\),\1\/\2 '"$INSTALL_PATH"'\/\1,'
 #find xseg -path "*git*" -prune -o -type f -a -print | sed 's,\(.*\)\/\(.*\),\1\/\2 '"$INSTALL_PATH"'\/\1,'
 

diff --git a/make_pkg.sh b/make_pkg.sh
index 6c1f685..8ca4062 100755 (executable)
--- a/make_pkg.sh
+++ b/make_pkg.sh
@@ -1,8 +1,8 @@
 #!/bin/bash 
 
 
-./make_install_file.sh > debian/archipelagos-kernel-dkms.install 
-git add debian/archipelagos-kernel-dkms.install 
+./make_install_file.sh > debian/archipelago-kernel-dkms.install 
+git add debian/archipelago-kernel-dkms.install 
 git-buildpackage --git-upstream-branch=$1 \
                 --git-debian-branch=$2 \
                 --git-export=INDEX \