[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, for-review, updated. debian/2.7.0-1-31-g53f0717

[Apollon Oikonomopoulos]

The following commit has been merged in the for-review branch:
commit 53f07173de53f399862e41f38424935e0583747d
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Tue Jul 16 18:30:11 2013 +0300

    Change the private module dir again to /usr/share/ganeti
    
    According to the Debian Pyton Policy, /usr/lib/ganeti should be used for
    arch-dependent modules only.

diff --git a/debian/NEWS b/debian/NEWS
index b049f73..c0c536a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -8,7 +8,7 @@ ganeti (2.7.0-2) unstable; urgency=low
   module. This is done because the Ganeti internal APIs are not guaranteed to
   be stable and direct use by 3rd-party applications is discouraged. Thus, any
   3rd-party programs importing Ganeti's Python code, should now live under
-  /usr/lib/ganeti or include /usr/lib/ganeti in Python's sys.path.
+  /usr/share/ganeti or include /usr/share/ganeti in Python's sys.path.
 
   The RAPI client library, being the only stable external API, is now shipped
   as a public module in its own package, python-ganeti-rapi.
diff --git a/debian/changelog b/debian/changelog
index 3ae82b6..1c98a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ ganeti (2.7.0-2) UNRELEASED; urgency=low
     - Switch from dh_pysupport to dh_python2
     - Run the upstream test suite during build
   * Ship the majority of the Python code in a private module under
-    /usr/lib/ganeti
+    /usr/share/ganeti
   * Ship the RAPI client as a separate package (python-ganeti-rapi)
   * Ship the HTML documentation as ganeti-doc
     - Depend on libjs-underscore instead of embedding a copy
diff --git a/debian/ganeti.install b/debian/ganeti.install
index 410d254..80772a7 100644
--- a/debian/ganeti.install
+++ b/debian/ganeti.install
@@ -4,18 +4,24 @@ usr/share/man/man8/ganeti-*
 
 usr/lib/ganeti/
 
-usr/lib/python*/dist-packages/ganeti	/usr/lib/ganeti
-usr/sbin/gnt-*				/usr/lib/ganeti
-usr/sbin/ganeti-*			/usr/lib/ganeti
+usr/lib/python*/dist-packages/ganeti	/usr/share/ganeti
+usr/sbin/gnt-*				/usr/share/ganeti
+usr/sbin/ganeti-*			/usr/share/ganeti
 
-usr/lib/ganeti/tools/burnin		/usr/lib/ganeti
-usr/lib/ganeti/tools/cfgshell		/usr/lib/ganeti
-usr/lib/ganeti/tools/cfgupgrade		/usr/lib/ganeti
-usr/lib/ganeti/tools/cfgupgrade12	/usr/lib/ganeti
-usr/lib/ganeti/tools/cluster-merge	/usr/lib/ganeti
-usr/lib/ganeti/tools/confd-client	/usr/lib/ganeti
-usr/lib/ganeti/tools/lvmstrap		/usr/lib/ganeti
-usr/lib/ganeti/tools/move-instance	/usr/lib/ganeti
-usr/lib/ganeti/tools/node-cleanup	/usr/lib/ganeti
-usr/lib/ganeti/tools/ovfconverter	/usr/lib/ganeti
-usr/lib/ganeti/tools/sanitize-config	/usr/lib/ganeti
+usr/lib/ganeti/check-cert-expired	/usr/share/ganeti
+usr/lib/ganeti/ensure-dirs		/usr/share/ganeti
+usr/lib/ganeti/import-export		/usr/share/ganeti
+usr/lib/ganeti/node-daemon-setup	/usr/share/ganeti
+usr/lib/ganeti/prepare-node-join	/usr/share/ganeti
+
+usr/lib/ganeti/tools/burnin		/usr/share/ganeti
+usr/lib/ganeti/tools/cfgshell		/usr/share/ganeti
+usr/lib/ganeti/tools/cfgupgrade		/usr/share/ganeti
+usr/lib/ganeti/tools/cfgupgrade12	/usr/share/ganeti
+usr/lib/ganeti/tools/cluster-merge	/usr/share/ganeti
+usr/lib/ganeti/tools/confd-client	/usr/share/ganeti
+usr/lib/ganeti/tools/lvmstrap		/usr/share/ganeti
+usr/lib/ganeti/tools/move-instance	/usr/share/ganeti
+usr/lib/ganeti/tools/node-cleanup	/usr/share/ganeti
+usr/lib/ganeti/tools/ovfconverter	/usr/share/ganeti
+usr/lib/ganeti/tools/sanitize-config	/usr/share/ganeti
diff --git a/debian/ganeti.links b/debian/ganeti.links
index 5400eb9..d65530a 100644
--- a/debian/ganeti.links
+++ b/debian/ganeti.links
@@ -1,28 +1,34 @@
-usr/lib/ganeti/gnt-debug usr/sbin/gnt-debug
-usr/lib/ganeti/gnt-job usr/sbin/gnt-job
-usr/lib/ganeti/gnt-os usr/sbin/gnt-os
-usr/lib/ganeti/ganeti-noded usr/sbin/ganeti-noded
-usr/lib/ganeti/gnt-instance usr/sbin/gnt-instance
-usr/lib/ganeti/ganeti-cleaner usr/sbin/ganeti-cleaner
-usr/lib/ganeti/gnt-cluster usr/sbin/gnt-cluster
-usr/lib/ganeti/gnt-node usr/sbin/gnt-node
-usr/lib/ganeti/ganeti-watcher usr/sbin/ganeti-watcher
-usr/lib/ganeti/ganeti-rapi usr/sbin/ganeti-rapi
-usr/lib/ganeti/ganeti-listrunner usr/sbin/ganeti-listrunner
-usr/lib/ganeti/ganeti-masterd usr/sbin/ganeti-masterd
-usr/lib/ganeti/gnt-network usr/sbin/gnt-network
-usr/lib/ganeti/gnt-backup usr/sbin/gnt-backup
-usr/lib/ganeti/gnt-group usr/sbin/gnt-group
-usr/lib/ganeti/gnt-storage usr/sbin/gnt-storage
+usr/share/ganeti/gnt-debug usr/sbin/gnt-debug
+usr/share/ganeti/gnt-job usr/sbin/gnt-job
+usr/share/ganeti/gnt-os usr/sbin/gnt-os
+usr/share/ganeti/ganeti-noded usr/sbin/ganeti-noded
+usr/share/ganeti/gnt-instance usr/sbin/gnt-instance
+usr/share/ganeti/ganeti-cleaner usr/sbin/ganeti-cleaner
+usr/share/ganeti/gnt-cluster usr/sbin/gnt-cluster
+usr/share/ganeti/gnt-node usr/sbin/gnt-node
+usr/share/ganeti/ganeti-watcher usr/sbin/ganeti-watcher
+usr/share/ganeti/ganeti-rapi usr/sbin/ganeti-rapi
+usr/share/ganeti/ganeti-listrunner usr/sbin/ganeti-listrunner
+usr/share/ganeti/ganeti-masterd usr/sbin/ganeti-masterd
+usr/share/ganeti/gnt-network usr/sbin/gnt-network
+usr/share/ganeti/gnt-backup usr/sbin/gnt-backup
+usr/share/ganeti/gnt-group usr/sbin/gnt-group
+usr/share/ganeti/gnt-storage usr/sbin/gnt-storage
 
-usr/lib/ganeti/burnin usr/lib/ganeti/tools/burnin
-usr/lib/ganeti/cfgshell usr/lib/ganeti/tools/cfgshell
-usr/lib/ganeti/cfgupgrade usr/lib/ganeti/tools/cfgupgrade
-usr/lib/ganeti/cfgupgrade12 usr/lib/ganeti/tools/cfgupgrade12
-usr/lib/ganeti/cluster-merge usr/lib/ganeti/tools/cluster-merge
-usr/lib/ganeti/confd-client usr/lib/ganeti/tools/confd-client
-usr/lib/ganeti/lvmstrap usr/lib/ganeti/tools/lvmstrap
-usr/lib/ganeti/move-instance usr/lib/ganeti/tools/move-instance
-usr/lib/ganeti/node-cleanup usr/lib/ganeti/tools/node-cleanup
-usr/lib/ganeti/ovfconverter usr/lib/ganeti/tools/ovfconverter
-usr/lib/ganeti/sanitize-config usr/lib/ganeti/tools/sanitize-config
+usr/share/ganeti/check-cert-expired	/usr/lib/ganeti/check-cert-expired
+usr/share/ganeti/ensure-dirs		/usr/lib/ganeti/ensure-dirs
+usr/share/ganeti/import-export		/usr/lib/ganeti/import-export
+usr/share/ganeti/node-daemon-setup	/usr/lib/ganeti/node-daemon-setup
+usr/share/ganeti/prepare-node-join	/usr/lib/ganeti/prepare-node-join
+
+usr/share/ganeti/burnin usr/lib/ganeti/tools/burnin
+usr/share/ganeti/cfgshell usr/lib/ganeti/tools/cfgshell
+usr/share/ganeti/cfgupgrade usr/lib/ganeti/tools/cfgupgrade
+usr/share/ganeti/cfgupgrade12 usr/lib/ganeti/tools/cfgupgrade12
+usr/share/ganeti/cluster-merge usr/lib/ganeti/tools/cluster-merge
+usr/share/ganeti/confd-client usr/lib/ganeti/tools/confd-client
+usr/share/ganeti/lvmstrap usr/lib/ganeti/tools/lvmstrap
+usr/share/ganeti/move-instance usr/lib/ganeti/tools/move-instance
+usr/share/ganeti/node-cleanup usr/lib/ganeti/tools/node-cleanup
+usr/share/ganeti/ovfconverter usr/lib/ganeti/tools/ovfconverter
+usr/share/ganeti/sanitize-config usr/lib/ganeti/tools/sanitize-config

-- 
Ganeti packaging