update contrib/debian package

contrib/debian/README.source

@@ -0,0 +1,2 @@
+This package uses the patch management system quilt as documented in
+/usr/share/doc/quilt/README.source.

contrib/debian/changelog

@@ -1,3 +1,27 @@
+holland (1.0.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andrew Garner <[email protected]>  Wed, 09 Jan 2013 15:10:45 +0000
+
+holland (1.0.6-3) unstable; urgency=low
+
+  * Installed holland command as /usr/sbin/holland to fix regression from 
+    previous releases 
+
+ -- Andrew Garner <[email protected]>  Wed, 30 May 2012 15:10:45 +0000
+
+holland (1.0.6-2) unstable; urgency=low
+
+  * Adding missing ${python:Depends} to all subpackages
+  * Removed mysql-client version requirement
+  * Removed python-support dependency and use dh_python2
+  * Remove namespace_package support
+  * Build sphinx html documentation
+  * Add missing mysqldump-lvm.conf global plugin config
+
+ -- Andrew Garner <[email protected]>  Sat, 05 May 2012 11:12:27 -0500
+
 holland (1.0.6-1) unstable; urgency=low
 
   * New upstream release

contrib/debian/control

@@ -2,20 +2,18 @@ Source: holland
 Section: utils
 Priority: optional
 Maintainer: Andrew Garner <[email protected]>
-Build-Depends: 
- debhelper (>= 5), 
- python (>= 2.3.5-11),
- python-setuptools (>= 0.6b3-1~), 
- python-sphinx (>= 0.4)
-Build-Depends-Indep: python-support (>= 0.5.6)
-Standards-Version: 3.8.0
-XS-Homepage: https://gforge.rackspace.com/gf/project/holland/
+Build-Depends: debhelper (>= 7.0.50), quilt
+Build-Depends-Indep: python (>= 2.6.6-3), python-sphinx,
+ python-setuptools, libjs-jquery
+Homepage: http://hollandbackup.org
+Standards-Version: 3.9.2
+
 
 Package: holland
 Architecture: all 
-Depends: ${python:Depends}, python-pkg-resources (>= 0.6b3-1~)
-Description: A pluggable backup utility
- A pluggable backup framework which focuses on, but is not limited to, highly 
+Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources
+Description: pluggable backup manager
+ Pluggable backup framework which focuses on, but is not limited to, highly 
  configurable database backups.
  .
  Holland Mythos
@@ -30,56 +28,43 @@ Description: A pluggable backup utility
  The ocean represents our customers, and the rising tide of MySQL backup needs 
  at Rackspace.
  .
- The dike represents Rackspace.
 
 Package: holland-common
 Architecture: all
-Depends: holland (>= ${source:Version}), python-mysqldb (>= 1.2)
+Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), python-mysqldb (>= 1.2)
 Recommends: mysql-client
 Description: Holland Common Library Plugins
  This package provides the common holland plugins that are generally used by
  other plugins.
 
 Package: holland-mysqldump
 Architecture: all
-Depends: holland (>= ${source:Version}), holland-common(>= ${source:Version}), mysql-client
+Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), holland-common(>= ${source:Version}), mysql-client
 Description: Holland MySQL Dump Backup Provider Plugin
  This package provides the holland mysqldump plugin. 
 
 Package: holland-example
 Architecture: all
-Depends: holland (>= ${source:Version})
+Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version})
 Description: Holland Example Backup Provider Plugin 
  This package provides the holland example plugin. 
 
-Package: holland-maatkit
-Architecture: all
-Depends: holland (>= ${source:Version}), maatkit, holland-common (>= ${source:Version})
-Description: Holland Maatkit Library Plugins
- This package provides the holland maatkit plugin. 
-
-Package: holland-mysqlhotcopy
-Architecture: all
-Depends: holland (>= ${source:Version}), holland-common (>= ${source:Version})
-Description: Holland MySQL Hot Copy Backup Provider Plugin 
- This package provides the Holland mysqlhotcopy plugin. 
-
 Package: holland-mysqllvm
 Architecture: all
-Depends: holland (>= ${source:Version}), holland-common (>= ${source:Version})
+Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), holland-common (>= ${source:Version})
 Replaces: holland-mysql-lvm
 Description: Holland MySQL Hot Copy Backup Provider Plugin 
  This package provides the Holland mysql-lvm plugin. 
 
 Package: holland-xtrabackup
 Architecture: all
-Depends: holland (>= ${source:Version}), holland-common (>= ${source:Version}), mysql-client
+Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), holland-common (>= ${source:Version}), mysql-client
 Description: Holland xtrabackup Backup plugin
  This package provides the holland xtrabackup plugin.
 
 Package: holland-pgdump
 Architecture: all
-Depends: holland (>= ${source:Version}), holland-common(>= ${source:Version})
+Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), holland-common(>= ${source:Version})
 Description: Holland Postgres Backup Provider Plugin
  This package provides the holland pgdump plugin. 
 

contrib/debian/holland-common.install

@@ -0,0 +1,8 @@
+debian/tmp/usr/lib/python*.*/*-packages/holland/lib/compression.py*
+debian/tmp/usr/lib/python*.*/*-packages/holland/lib/which.py*
+debian/tmp/usr/lib/python*.*/*-packages/holland/lib/safefilename.py*
+debian/tmp/usr/lib/python*.*/*-packages/holland/lib/multidict.py*
+debian/tmp/usr/lib/python*.*/*-packages/holland/lib/archive/
+debian/tmp/usr/lib/python*.*/*-packages/holland/lib/mysql/
+debian/tmp/usr/lib/python*.*/*-packages/holland.lib.common-*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/holland.lib.mysql-*.egg-info

contrib/debian/holland-example.install

@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/python*.*/*-packages/holland.backup.example-*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/holland/backup/example.py*
+config/providers/example.conf etc/holland/providers/

contrib/debian/holland-mysqldump.install

@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/python*.*/*-packages/holland.backup.mysqldump-*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/holland/backup/mysqldump/
+config/providers/mysqldump.conf etc/holland/providers/

contrib/debian/holland-mysqllvm.install

@@ -0,0 +1,6 @@
+debian/tmp/usr/lib/python*.*/*-packages/holland.backup.mysql_lvm-*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/holland/backup/mysql_lvm/
+debian/tmp/usr/lib/python*.*/*-packages/holland.lib.lvm-*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/holland/lib/lvm/
+config/providers/mysql-lvm.conf etc/holland/providers/
+config/providers/mysqldump-lvm.conf etc/holland/providers/

contrib/debian/holland-pgdump.install

@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/python*.*/*-packages/holland.backup.pgdump-*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/holland/backup/pgdump/
+config/providers/pgdump.conf etc/holland/providers/

contrib/debian/holland-xtrabackup.install

@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/python*.*/*-packages/holland.backup.xtrabackup-*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/holland/backup/xtrabackup/
+config/providers/xtrabackup.conf etc/holland/providers/

contrib/debian/holland.docs

@@ -1,2 +1,2 @@
 README
-docs/build/text
+docs/html

contrib/debian/holland.install

@@ -0,0 +1,11 @@
+debian/tmp/usr/lib/python*.*/*-packages/holland-*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/holland/core/
+debian/tmp/usr/lib/python*.*/*-packages/holland/__init__.py
+debian/tmp/usr/lib/python*.*/*-packages/holland/lib/__init__.py
+debian/tmp/usr/lib/python*.*/*-packages/holland/backup/__init__.py
+debian/tmp/usr/lib/python*.*/*-packages/holland/commands/*.py
+debian/tmp/usr/bin/holland usr/sbin/
+config/holland.conf etc/holland/
+config/README etc/holland/
+config/providers/README etc/holland/providers/
+config/backupsets/default.conf etc/holland/backupsets/

contrib/debian/patches/100-holland-disable-namespaces.patch

@@ -0,0 +1,49 @@
+diff --git a/holland/__init__.py b/holland/__init__.py
+index b0d6433..792d600 100644
+--- a/holland/__init__.py
++++ b/holland/__init__.py
+@@ -1 +1 @@
+-__import__('pkg_resources').declare_namespace(__name__)
+\ No newline at end of file
++#
+diff --git a/holland/backup/__init__.py b/holland/backup/__init__.py
+index b528f0a..792d600 100644
+--- a/holland/backup/__init__.py
++++ b/holland/backup/__init__.py
+@@ -1,6 +1 @@
+-try:
+-    import pkg_resources
+-    pkg_resources.declare_namespace(__name__)
+-except ImportError:
+-    from pkgutil import extend_path
+-    __path__ = extend_path(__path__, __name__)
++#
+diff --git a/holland/commands/__init__.py b/holland/commands/__init__.py
+index de40ea7..792d600 100644
+--- a/holland/commands/__init__.py
++++ b/holland/commands/__init__.py
+@@ -1 +1 @@
+-__import__('pkg_resources').declare_namespace(__name__)
++#
+diff --git a/holland/lib/__init__.py b/holland/lib/__init__.py
+index b528f0a..792d600 100644
+--- a/holland/lib/__init__.py
++++ b/holland/lib/__init__.py
+@@ -1,6 +1 @@
+-try:
+-    import pkg_resources
+-    pkg_resources.declare_namespace(__name__)
+-except ImportError:
+-    from pkgutil import extend_path
+-    __path__ = extend_path(__path__, __name__)
++#
+diff --git a/setup.py b/setup.py
+index 7fe171f..7a41544 100644
+--- a/setup.py
++++ b/setup.py
+@@ -37,5 +37,4 @@ setup(name="holland",
+       purge = holland.commands.purge:Purge
+       #restore = holland.commands.restore:Restore
+       """,
+-      namespace_packages=['holland', 'holland.backup', 'holland.lib', 'holland.commands'],
+       )

contrib/debian/patches/series

@@ -0,0 +1 @@
+100-holland-disable-namespaces.patch