Debian files fixes

- comment synnefo configuration files placed in /etc/synnefo
- added proper pydist-overrides files
- other minor fixes/improvements

diff --git a/snf-pithos-app/debian/pydist-overrides b/snf-pithos-app/debian/pydist-overrides
new file mode 100644 (file)
index 0000000..3f4cc83
--- /dev/null
+++ b/snf-pithos-app/debian/pydist-overrides
@@ -0,0 +1,4 @@
+snf-common snf-common
+snf-pithos-lib snf-pithos-lib
+snf-pithos-backend snf-pithos-backend
+Django python-django

diff --git a/snf-pithos-app/debian/rules b/snf-pithos-app/debian/rules
index a617da6..cd32ba0 100755 (executable)
--- a/snf-pithos-app/debian/rules
+++ b/snf-pithos-app/debian/rules
@@ -11,9 +11,10 @@ override_dh_auto_install:
        mkdir -p debian/$(package)/etc/synnefo
 
        cp pithos/api/settings.py \
-                       debian/$(package)/etc/synnefo/20-snf-pithos-app_api.conf;  \
+                       debian/$(package)/etc/synnefo/20-snf-pithos-app_api.conf;
        cp pithos/ui/settings.py \
-                       debian/$(package)/etc/synnefo/20-snf-pithos-app_ui.conf;  \
+                       debian/$(package)/etc/synnefo/20-snf-pithos-app_ui.conf;
+       sed -i 's/^/#/' debian/$(package)/etc/synnefo/*.conf;
 
        for py in $(shell pyversions -vr debian/control); do \
                rm debian/$(package)/usr/lib/python$$py/*-packages/*-nspkg.pth; \

diff --git a/snf-pithos-backend/debian/pydist-overrides b/snf-pithos-backend/debian/pydist-overrides
new file mode 100644 (file)
index 0000000..1c0b44e
--- /dev/null
+++ b/snf-pithos-backend/debian/pydist-overrides
@@ -0,0 +1,2 @@
+snf-common snf-common
+snf-pithos-lib snf-pithos-lib

diff --git a/snf-pithos-backend/debian/rules b/snf-pithos-backend/debian/rules
index ea81f93..78d1917 100755 (executable)
--- a/snf-pithos-backend/debian/rules
+++ b/snf-pithos-backend/debian/rules
@@ -12,7 +12,9 @@ override_dh_auto_install:
        mkdir -p debian/$(package)/etc/synnefo
 
        cp pithos/backends/settings.py \
-                       debian/$(package)/etc/synnefo/10-snf-pithos-backend_backends.conf;  \
+                       debian/$(package)/etc/synnefo/10-snf-pithos-backend_backends.conf;
+       sed -i 's/^/#/' debian/$(package)/etc/synnefo/*.conf;
+
 
        for py in $(shell pyversions -vr debian/control); do \
                rm debian/$(package)/usr/lib/python$$py/*-packages/*-nspkg.pth; \

diff --git a/snf-pithos-lib/debian/pydist-overrides b/snf-pithos-lib/debian/pydist-overrides
new file mode 100644 (file)
index 0000000..f2d2f82
--- /dev/null
+++ b/snf-pithos-lib/debian/pydist-overrides
@@ -0,0 +1 @@
+snf-common snf-common

diff --git a/snf-pithos-lib/debian/rules b/snf-pithos-lib/debian/rules
index 93855fe..bd6403b 100755 (executable)
--- a/snf-pithos-lib/debian/rules
+++ b/snf-pithos-lib/debian/rules
@@ -4,7 +4,6 @@
        dh $@ --with python2
 
 package=snf-pithos-lib
-config_lvl=00
 
 override_dh_auto_install:
        dh_auto_install

diff --git a/snf-pithos-tools/debian/pydist-overrides b/snf-pithos-tools/debian/pydist-overrides
new file mode 100644 (file)
index 0000000..1c0b44e
--- /dev/null
+++ b/snf-pithos-tools/debian/pydist-overrides
@@ -0,0 +1,2 @@
+snf-common snf-common
+snf-pithos-lib snf-pithos-lib