Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 6a8da91b7513d7bf4237fe04e370e9669c803397 2 parents 75a2fc4 + dfad847
@abg abg authored
View
53 contrib/debian/changelog
@@ -1,55 +1,6 @@
holland (1.0.8-1) unstable; urgency=low
+ [ Andrew Garner ]
* 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
- * Added holland-pgdump
-
- -- Andrew Garner <andrew.garner@rackspace.com> Tue, 11 Jan 2011 23:05:37 -0500
-
-holland (1.0.3-1) unstable; urgency=low
-
- * New upstream release
-
- -- Andrew Garner <andrew.garner@rackspace.com> 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 <andrew.garner@rackspace.com> Tue, 11 May 2010 18:15:29 -0500
-
-holland (0.9.9-2) unstable; urgency=low
-
- * Remove .egg file dependency
-
- -- Andrew Garner <andrew.garner@rackspace.com> Sun, 09 May 2010 04:36:17 -0500
-
-holland (0.9.9-1) unstable; urgency=low
-
- * Initial release
-
- -- Andrew Garner <andrew.garner@rackspace.com> Sun, 09 May 2010 03:52:44 -0500
+ -- Andrew Garner <muzazzi@gmail.com> Fri, 11 Jan 2013 16:37:42 +0000
View
51 contrib/debian/control
@@ -1,17 +1,22 @@
Source: holland
Section: utils
Priority: optional
-Maintainer: Andrew Garner <andrew.garner@rackspace.com>
-Build-Depends: debhelper (>= 7.0.50), quilt
-Build-Depends-Indep: python (>= 2.6.6-3), python-sphinx,
- python-setuptools, libjs-jquery
+Maintainer: Andrew Garner <muzazzi@gmail.com>
+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.
View
16 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
Please sign in to comment.
Something went wrong with that request. Please try again.