From dfad8470dbaec7841c5318e8d4fa66e97c7b93a2 Mon Sep 17 00:00:00 2001 From: Andrew Garner Date: Mon, 14 Jan 2013 16:29:55 +0000 Subject: [PATCH] further updating contrib/debian This should now build cleanly across ubuntu lucid/10.04+ and on debian/squeeze+ python-support will be used on lucid, and dh_sphinxdoc is not run on distributions that have python-sphinx < 1.0.7+dfsg. On older distributions lacking dh_sphinxdoc, we manually install the documentation as needed and attempt to patch up the same files as dh_sphinxdoc --- contrib/debian/changelog | 53 ++-------------------------------------- contrib/debian/control | 51 +++++++++++++++++++++++++------------- contrib/debian/rules | 16 +++++++++--- 3 files changed, 49 insertions(+), 71 deletions(-) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 9155a9d0..f20641ef 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,55 +1,6 @@ holland (1.0.8-1) unstable; urgency=low + [ Andrew Garner ] * New upstream release - -- Andrew Garner 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 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 Sat, 05 May 2012 11:12:27 -0500 - -holland (1.0.6-1) unstable; urgency=low - - * New upstream release - * Added holland-pgdump - - -- Andrew Garner Tue, 11 Jan 2011 23:05:37 -0500 - -holland (1.0.3-1) unstable; urgency=low - - * New upstream release - - -- Andrew Garner Tue, 13 Jul 2010 15:44:00 -0500 - -holland (0.9.9-3) unstable; urgency=low - - * Added python-sphinx build dependency - * Fixed typo in holland.lib.mysql egg-info path - - -- Andrew Garner Tue, 11 May 2010 18:15:29 -0500 - -holland (0.9.9-2) unstable; urgency=low - - * Remove .egg file dependency - - -- Andrew Garner Sun, 09 May 2010 04:36:17 -0500 - -holland (0.9.9-1) unstable; urgency=low - - * Initial release - - -- Andrew Garner Sun, 09 May 2010 03:52:44 -0500 + -- Andrew Garner Fri, 11 Jan 2013 16:37:42 +0000 diff --git a/contrib/debian/control b/contrib/debian/control index ee9644b4..959736de 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,17 +1,22 @@ Source: holland Section: utils Priority: optional -Maintainer: Andrew Garner -Build-Depends: debhelper (>= 7.0.50), quilt -Build-Depends-Indep: python (>= 2.6.6-3), python-sphinx, - python-setuptools, libjs-jquery +Maintainer: Andrew Garner +Build-Depends: debhelper (>= 7.0.50), + quilt +Build-Depends-Indep: python (>= 2.6), + python-sphinx, + python-setuptools (>= 0.6b3), + libjs-jquery Homepage: http://hollandbackup.org Standards-Version: 3.9.2 Package: holland Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources +Depends: python-pkg-resources, + ${misc:Depends}, + ${python:Depends} Description: pluggable backup manager Pluggable backup framework which focuses on, but is not limited to, highly configurable database backups. @@ -31,7 +36,10 @@ Description: pluggable backup manager Package: holland-common Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), python-mysqldb (>= 1.2) +Depends: holland (>= ${binary:Version}), + python-mysqldb (>= 1.2), + ${misc:Depends}, + ${python:Depends} Recommends: mysql-client Description: Holland Common Library Plugins This package provides the common holland plugins that are generally used by @@ -39,32 +47,41 @@ Description: Holland Common Library Plugins Package: holland-mysqldump Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), holland-common(>= ${source:Version}), mysql-client +Depends: holland (>= ${binary:Version}), + holland-common (>= ${binary:Version}), + mysql-client, + ${misc:Depends}, + ${python:Depends} Description: Holland MySQL Dump Backup Provider Plugin This package provides the holland mysqldump plugin. -Package: holland-example -Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}) -Description: Holland Example Backup Provider Plugin - This package provides the holland example plugin. - Package: holland-mysqllvm Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), holland-common (>= ${source:Version}) +Depends: holland (>= ${binary:Version}), + holland-common (>= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} 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: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), holland-common (>= ${source:Version}), mysql-client +Depends: holland (>= ${binary:Version}), + holland-common (>= ${binary:Version}), + mysql-client, + ${misc:Depends}, + ${python:Depends} Description: Holland xtrabackup Backup plugin This package provides the holland xtrabackup plugin. Package: holland-pgdump Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, holland (>= ${source:Version}), holland-common(>= ${source:Version}) -Description: Holland Postgres Backup Provider Plugin +Depends: holland (>= ${binary:Version}), + holland-common (>= ${binary:Version}), + postgresql-client-common | postgresql-xc-client, + ${misc:Depends}, + ${python:Depends} +description: Holland Postgres Backup Provider Plugin This package provides the holland pgdump plugin. diff --git a/contrib/debian/rules b/contrib/debian/rules index 2357f6f4..4f949366 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -2,8 +2,16 @@ export DH_VERBOSE=1 +# Lucid does not have dh_python2, but we would like to be able to use this +# rules file to build on lucid as well. Thus the branching logic. +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") + +WITH_SPHINXDOC = $(shell test -f /usr/bin/dh_sphinxdoc && echo "--with sphinxdoc") + %: - dh $@ --with quilt --with sphinxdoc --with python2 --buildsystem=python_distutils + dh $@ \ + --with quilt \ + ${WITH_SPHINXDOC} ${WITH_PYTHON2} --buildsystem=python_distutils override_dh_auto_clean: rm -rf docs/html/ @@ -38,10 +46,12 @@ override_dh_auto_install: override_dh_installdocs: dh_installdocs - # Remove embedded copy of libjs-jquery + # Remove embedded copy of libjs-jquery, if sphinxdocs will not + if [ ! ${WITH_SPHINXDOC} ]; then \ cd debian/holland/usr/share/doc/holland/html/_static \ && rm jquery.js \ - && ln -s ../../../../javascript/jquery/jquery.js . + && ln -s ../../../../javascript/jquery/jquery.js .; \ + fi override_dh_compress: dh_compress -X.txt