Commit 15f7346f authored by anarcat's avatar anarcat

rename packages to *2 to allow coexistence with 1.x

parent 28f31dbd
......@@ -41,7 +41,7 @@ case "$1" in
adduser --quiet aegir www-data
if [ -d /etc/sudoers.d ]; then
ucf --debconf-ok /usr/share/doc/aegir-cluster-slave/examples/example.sudoers /etc/sudoers.d/aegir
ucf --debconf-ok /usr/share/doc/aegir-cluster-slave2/examples/example.sudoers /etc/sudoers.d/aegir
ucfr aegir-provision /etc/sudoers.d/aegir
chmod 440 /etc/sudoers.d/aegir
else
......
......@@ -40,12 +40,12 @@ case "$1" in
adduser --quiet aegir www-data
if [ -d /etc/sudoers.d ]; then
ucf --debconf-ok /usr/share/doc/aegir-provision/examples/example.sudoers /etc/sudoers.d/aegir
ucf --debconf-ok /usr/share/doc/aegir-provision2/examples/example.sudoers /etc/sudoers.d/aegir
ucfr aegir-provision /etc/sudoers.d/aegir
chmod 440 /etc/sudoers.d/aegir
else
echo "running an older version of sudo"
echo "copy content of /usr/share/doc/aegir-provision/examples/example.sudoers into /etc/sudoers for aegir to run properly"
echo "copy content of /usr/share/doc/aegir-provision2/examples/example.sudoers into /etc/sudoers for aegir to run properly"
fi
# fix permissions on installed directories
......
aegir-provision (2.0~alpha1) experimental; urgency=low
aegir-provision2 (2.0~alpha1) experimental; urgency=low
* first alpha release of the 2.x branch, release notes too long to
document here: http://community.aegirproject.org/2.0-alpha1
......
Source: aegir-provision
Source: aegir-provision2
Section: admin
Priority: optional
Maintainer: Antoine Beaupré <anarcat@debian.org>
......@@ -9,11 +9,13 @@ Homepage: http://aegirproject.org/
Vcs-git: http://git.drupal.org/project/provision.git
Vcs-browser: http://drupalcode.org/project/provision.git
Package: aegir-provision
Package: aegir-provision2
Architecture: all
Depends: ${misc:Depends}, drush (>= 5.5), php5-mysql, mysql-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf
Recommends: mysql-server, rsync
Suggests: drush-make
Conflicts: aegir-provision
Replaces: aegir-provision
Description: mass Drupal hosting system - backend
A set of contributed modules for Drupal that aims to solve the
problem of managing a large number of Drupal sites. It does this by
......@@ -27,10 +29,12 @@ Description: mass Drupal hosting system - backend
files. It can be installed standalone although it is usually
installed with the hostmaster frontend.
Package: aegir-hostmaster
Package: aegir-hostmaster2
Architecture: all
Depends: ${misc:Depends}, drush (>= 5.5), php5-mysql, apache2 | nginx, libapache2-mod-php5 | php5-fpm, aegir-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6)
Depends: ${misc:Depends}, drush (>= 5.5), php5-mysql, apache2 | nginx, libapache2-mod-php5 | php5-fpm, aegir-provision2 (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6)
Recommends: php5-gd, php5
Conflicts: aegir-hostmaster
Replaces: aegir-hostmaster
Description: mass Drupal hosting system - frontend
A set of contributed modules for Drupal that aims to solve the
problem of managing a large number of Drupal sites. It does this by
......@@ -47,9 +51,11 @@ Description: mass Drupal hosting system - frontend
and provision and as such doesn't bundle any files itself. Everything
is downloaded on the fly during the install.
Package: aegir
Package: aegir2
Architecture: all
Depends: ${misc:Depends}, aegir-provision (>= ${source:Version}), aegir-hostmaster (>= ${source:Version})
Depends: ${misc:Depends}, aegir-provision2 (>= ${source:Version}), aegir-hostmaster2 (>= ${source:Version})
Conflicts: aegir
Replaces: aegir
Description: mass Drupal hosting system
A set of contributed modules for Drupal that aims to solve the
problem of managing a large number of Drupal sites. It does this by
......@@ -61,10 +67,12 @@ Description: mass Drupal hosting system
This meta-package will install both the frontend (aegir-hostmaster)
and the backend (aegir-provision).
Package: aegir-cluster-slave
Package: aegir-cluster-slave2
Architecture: all
Depends: ${misc:Depends}, php5-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5, rsync, nfs-client, mysql-client
Recommends: php5-gd, php5
Conflicts: aegir-cluster-slave
Replaces: aegir-cluster-slave
Description: web frontend for the Aegir hosting system
Configuration of lightweight slave servers for the Aegir "pack"
clustering system.
......
......@@ -8,13 +8,13 @@
dh $@
override_dh_install:
cp -r "$(CURDIR)/db/" "$(CURDIR)/dns/" "$(CURDIR)/http/" "$(CURDIR)/aegir.make" "$(CURDIR)/platform/" "$(CURDIR)/Provision/" "$(CURDIR)/Symfony/" "$(CURDIR)"/*.inc "$(CURDIR)"/*.php "$(CURDIR)"/*.info "$(CURDIR)/debian/aegir-provision/usr/share/drush/commands/provision/"
cp -r "$(CURDIR)/db/" "$(CURDIR)/dns/" "$(CURDIR)/http/" "$(CURDIR)/aegir.make" "$(CURDIR)/platform/" "$(CURDIR)/Provision/" "$(CURDIR)/Symfony/" "$(CURDIR)"/*.inc "$(CURDIR)"/*.php "$(CURDIR)"/*.info "$(CURDIR)/debian/aegir-provision2/usr/share/drush/commands/provision/"
# We need this nasty hack, because we added a directory.
# TODO: this is really lame, there must be a better way to do this?
if [ -d "$(CURDIR)/provision-tests" ]; then cp -r "$(CURDIR)/provision-tests/" "$(CURDIR)/debian/aegir-provision/usr/share/drush/commands/provision/"; fi
if [ -d "$(CURDIR)/provision-tests" ]; then cp -r "$(CURDIR)/provision-tests/" "$(CURDIR)/debian/aegir-provision2/usr/share/drush/commands/provision/"; fi
cp "$(CURDIR)/debian/aegir-provision.lintian" "$(CURDIR)/debian/aegir-provision/usr/share/lintian/overrides/aegir-provision"
cp "$(CURDIR)/debian/aegir-provision2.lintian" "$(CURDIR)/debian/aegir-provision2/usr/share/lintian/overrides/aegir-provision"
override_dh_installinit:
dh_installinit --name=hosting-queued
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment