Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:holland-backup/holland

  • Loading branch information...
commit 75a2fc4e3378db1baa600737d2c369ee4d4d3f15 2 parents 2104b98 + cc63d62
Andrew Garner abg authored
Showing with 176 additions and 179 deletions.
  1. +2 −0  contrib/debian/README.source
  2. +24 −0 contrib/debian/changelog
  3. +15 −30 contrib/debian/control
  4. +0 −10 contrib/debian/holland-common.files
  5. +8 −0 contrib/debian/holland-common.install
  6. +0 −4 contrib/debian/holland-example.files
  7. +3 −0  contrib/debian/holland-example.install
  8. +0 −4 contrib/debian/holland-maatkit.files
  9. +0 −4 contrib/debian/holland-mysqldump.files
  10. +3 −0  contrib/debian/holland-mysqldump.install
  11. +0 −4 contrib/debian/holland-mysqlhotcopy.files
  12. +0 −7 contrib/debian/holland-mysqllvm.files
  13. +6 −0 contrib/debian/holland-mysqllvm.install
  14. +0 −4 contrib/debian/holland-pgdump.files
  15. +3 −0  contrib/debian/holland-pgdump.install
  16. +0 −4 contrib/debian/holland-xtrabackup.files
  17. +3 −0  contrib/debian/holland-xtrabackup.install
  18. +1 −1  contrib/debian/holland.docs
  19. +0 −9 contrib/debian/holland.files
  20. +11 −0 contrib/debian/holland.install
  21. +49 −0 contrib/debian/patches/100-holland-disable-namespaces.patch
  22. +1 −0  contrib/debian/patches/series
  23. +0 −1  contrib/debian/pyversions
  24. +47 −97 contrib/debian/rules
2  contrib/debian/README.source
View
@@ -0,0 +1,2 @@
+This package uses the patch management system quilt as documented in
+/usr/share/doc/quilt/README.source.
24 contrib/debian/changelog
View
@@ -1,3 +1,27 @@
+holland (1.0.8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Andrew Garner <andrew.garner@rackspace.com> 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 <andrew.garner@rackspace.com> 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 <andrew.garner@rackspace.com> Sat, 05 May 2012 11:12:27 -0500
+
holland (1.0.6-1) unstable; urgency=low
* New upstream release
45 contrib/debian/control
View
@@ -2,20 +2,18 @@ Source: holland
Section: utils
Priority: optional
Maintainer: Andrew Garner <andrew.garner@rackspace.com>
-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,11 +28,10 @@ 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
@@ -42,44 +39,32 @@ Description: Holland Common Library 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.
10 contrib/debian/holland-common.files
View
@@ -1,10 +0,0 @@
-usr/lib/python*.*/*-packages/holland/lib/compression.py*
-usr/lib/python*.*/*-packages/holland/lib/which.py*
-usr/lib/python*.*/*-packages/holland/lib/safefilename.py*
-usr/lib/python*.*/*-packages/holland/lib/multdict.py*
-usr/lib/python*.*/*-packages/holland/lib/archive/
-usr/lib/python*.*/*-packages/holland/lib/mysql/
-usr/lib/python*.*/*-packages/holland.lib.common-*.egg-info
-usr/lib/python*.*/*-packages/holland.lib.common-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland.lib.mysql-*.egg-info
-usr/lib/python*.*/*-packages/holland.lib.mysql-*-nspkg.pth
8 contrib/debian/holland-common.install
View
@@ -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
4 contrib/debian/holland-example.files
View
@@ -1,4 +0,0 @@
-usr/lib/python*.*/*-packages/holland.backup.example-*.egg-info
-usr/lib/python*.*/*-packages/holland.backup.example-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/backup/example.py*
-etc/holland/providers/example.conf
3  contrib/debian/holland-example.install
View
@@ -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/
4 contrib/debian/holland-maatkit.files
View
@@ -1,4 +0,0 @@
-usr/lib/python*.*/*-packages/holland.backup.maatkit-*.egg-info
-usr/lib/python*.*/*-packages/holland.backup.maatkit-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/backup/maatkit.py*
-etc/holland/providers/maatkit.conf
4 contrib/debian/holland-mysqldump.files
View
@@ -1,4 +0,0 @@
-usr/lib/python*.*/*-packages/holland.backup.mysqldump-*.egg-info
-usr/lib/python*.*/*-packages/holland.backup.mysqldump-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/backup/mysqldump/
-etc/holland/providers/mysqldump.conf
3  contrib/debian/holland-mysqldump.install
View
@@ -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/
4 contrib/debian/holland-mysqlhotcopy.files
View
@@ -1,4 +0,0 @@
-usr/lib/python*.*/*-packages/holland.backup.mysqlhotcopy-*.egg-info
-usr/lib/python*.*/*-packages/holland.backup.mysqlhotcopy-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/backup/mysqlhotcopy.py*
-etc/holland/providers/mysqlhotcopy.conf
7 contrib/debian/holland-mysqllvm.files
View
@@ -1,7 +0,0 @@
-usr/lib/python*.*/*-packages/holland.backup.mysql_lvm-*.egg-info
-usr/lib/python*.*/*-packages/holland.backup.mysql_lvm-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/backup/mysql_lvm/
-usr/lib/python*.*/*-packages/holland.lib.lvm-*.egg-info
-usr/lib/python*.*/*-packages/holland.lib.lvm-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/lib/lvm/
-etc/holland/providers/mysql-lvm.conf
6 contrib/debian/holland-mysqllvm.install
View
@@ -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/
4 contrib/debian/holland-pgdump.files
View
@@ -1,4 +0,0 @@
-usr/lib/python*.*/*-packages/holland.backup.pgdump-*.egg-info
-usr/lib/python*.*/*-packages/holland.backup.pgdump-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/backup/pgdump/
-etc/holland/providers/pgdump.conf
3  contrib/debian/holland-pgdump.install
View
@@ -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/
4 contrib/debian/holland-xtrabackup.files
View
@@ -1,4 +0,0 @@
-usr/lib/python*.*/*-packages/holland.backup.xtrabackup-*.egg-info
-usr/lib/python*.*/*-packages/holland.backup.xtrabackup-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/backup/xtrabackup/
-etc/holland/providers/xtrabackup.conf
3  contrib/debian/holland-xtrabackup.install
View
@@ -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/
2  contrib/debian/holland.docs
View
@@ -1,2 +1,2 @@
README
-docs/build/text
+docs/html
9 contrib/debian/holland.files
View
@@ -1,9 +0,0 @@
-usr/lib/python*.*/*-packages/holland-*.egg-info
-usr/lib/python*.*/*-packages/holland-*-nspkg.pth
-usr/lib/python*.*/*-packages/holland/core/
-usr/lib/python*.*/*-packages/holland/commands/*.py*
-etc/holland/holland.conf
-etc/holland/README
-etc/holland/providers/README
-etc/holland/backupsets/default.conf
-usr/sbin/holland
11 contrib/debian/holland.install
View
@@ -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/
49 contrib/debian/patches/100-holland-disable-namespaces.patch
View
@@ -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'],
+ )
1  contrib/debian/patches/series
View
@@ -0,0 +1 @@
+100-holland-disable-namespaces.patch
1  contrib/debian/pyversions
View
@@ -1 +0,0 @@
-2.3-
144 contrib/debian/rules
View
@@ -1,101 +1,51 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
--include /usr/share/python/python.mk
-
-PYTHON=python
-PLUGINDIR=/usr/share/holland/plugins
-SBINDIR=/usr/sbin
-HOLLAND_CORE=$(CURDIR)
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- @for ADDON in $(HOLLAND_CORE); \
- do cd $$ADDON ; \
- $(PYTHON) setup.py $(if $(DH_VERBOSE),,-q) clean; \
- done
-
- @for PLUGIN in $(shell ls -d $(CURDIR)/plugins/*/); \
- do cd $$PLUGIN ; \
- $(PYTHON) setup.py $(if $(DH_VERBOSE),,-q) clean; \
- done
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- cd docs && make text
- @for ADDON in $(HOLLAND_CORE); \
- do cd $$ADDON ; \
- $(PYTHON) setup.py $(if $(DH_VERBOSE),,-q) install \
- --no-compile \
- --prefix=/usr \
- --root=$(CURDIR)/debian/tmp \
- --install-scripts=$(SBINDIR) \
- --single-version-externally-managed \
- $(py_setup_install_args); \
- done
-
- @for PLUGIN in $(shell ls -d $(CURDIR)/plugins/*/); \
- do cd $$PLUGIN ; \
- $(PYTHON) setup.py $(if $(DH_VERBOSE),,-q) install \
- --no-compile \
- --prefix=/usr \
- --root=$(CURDIR)/debian/tmp \
- --install-scripts=$(SBINDIR) \
- --single-version-externally-managed \
- $(py_setup_install_args); \
- done
-
- mkdir -p $(CURDIR)/debian/tmp/etc/holland
- mkdir -p $(CURDIR)/debian/tmp/etc/holland/backupsets
- mkdir -p $(CURDIR)/debian/tmp/etc/holland/providers
- @for name in $(shell ls $(CURDIR)/config/); \
- do cp -a $(CURDIR)/config/$$name $(CURDIR)/debian/tmp/etc/holland; \
- done
-# This should probably be a patch
- @sed -i 's/^backupsets = default/backupsets = /g' $(CURDIR)/debian/tmp/etc/holland/holland.conf
-
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installchangelogs
+export DH_VERBOSE=1
+
+%:
+ dh $@ --with quilt --with sphinxdoc --with python2 --buildsystem=python_distutils
+
+override_dh_auto_clean:
+ rm -rf docs/html/
+ find -type d \( -name '*.egg-info' -or -name 'build' \) | xargs rm -fr
+ dh_auto_clean
+
+override_dh_auto_build:
+ dh_auto_build
+ dh_auto_build -Dplugins/holland.lib.common
+ dh_auto_build -Dplugins/holland.lib.mysql
+ dh_auto_build -Dplugins/holland.lib.lvm
+ dh_auto_build -Dplugins/holland.backup.mysqldump
+ dh_auto_build -Dplugins/holland.backup.mysql_lvm
+ dh_auto_build -Dplugins/holland.backup.pgdump
+ dh_auto_build -Dplugins/holland.backup.example
+ dh_auto_build -Dplugins/holland.backup.xtrabackup
+
+ # Build the HTML documentation.
+ PYTHONPATH=. sphinx-build -N -q -E -b html docs/source/ docs/html/
+
+override_dh_auto_install:
+ dh_auto_install -O--buildsystem=python_distutils
+ dh_auto_install -O--buildsystem=python_distutils -Dplugins/holland.lib.common
+ dh_auto_install -O--buildsystem=python_distutils -Dplugins/holland.lib.mysql
+ dh_auto_install -O--buildsystem=python_distutils -Dplugins/holland.lib.lvm
+ dh_auto_install -O--buildsystem=python_distutils -Dplugins/holland.backup.mysqldump
+ dh_auto_install -O--buildsystem=python_distutils -Dplugins/holland.backup.mysql_lvm
+ dh_auto_install -O--buildsystem=python_distutils -Dplugins/holland.backup.pgdump
+ dh_auto_install -O--buildsystem=python_distutils -Dplugins/holland.backup.example
+ dh_auto_install -O--buildsystem=python_distutils -Dplugins/holland.backup.xtrabackup
+ find debian/tmp/ \( -name '*.pth' -or -name 'namespace_packages.txt' \) -delete
+
+override_dh_installdocs:
dh_installdocs
- dh_installexamples
- dh_install
- dh_movefiles
- dh_installlogrotate
-# dh_installcron
- dh_installman
- dh_pysupport
- dh_link
- dh_strip
- dh_compress
- dh_fixperms -X etc/holland/backupsets -X var/log/holland
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ # Remove embedded copy of libjs-jquery
+ cd debian/holland/usr/share/doc/holland/html/_static \
+ && rm jquery.js \
+ && ln -s ../../../../javascript/jquery/jquery.js .
+
+override_dh_compress:
+ dh_compress -X.txt
-binary: binary-indep
-.PHONY: build clean binary install configure
+override_dh_python2:
+ # only build for current python version
+ dh_python2 -V $(shell pyversions -vd)
Please sign in to comment.
Something went wrong with that request. Please try again.