From ff8e2c9689e06422dbb2fef1ed647bc08810b231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 17 Oct 2013 11:07:15 -0400 Subject: [PATCH] finish package rename --- ...-cluster-slave2.config => aegir2-cluster-slave.config} | 0 ...egir-cluster-slave2.dirs => aegir2-cluster-slave.dirs} | 0 ...ster-slave2.examples => aegir2-cluster-slave.examples} | 0 ...ster-slave2.postinst => aegir2-cluster-slave.postinst} | 0 ...-cluster-slave2.postrm => aegir2-cluster-slave.postrm} | 0 ...ir-cluster-slave2.prerm => aegir2-cluster-slave.prerm} | 0 ...er-slave2.templates => aegir2-cluster-slave.templates} | 0 ...{aegir-hostmaster2.config => aegir2-hostmaster.config} | 0 ...-queued.init => aegir2-hostmaster.hosting-queued.init} | 0 ...ir-hostmaster2.postinst => aegir2-hostmaster.postinst} | 0 ...-hostmaster2.templates => aegir2-hostmaster.templates} | 0 debian/{aegir-provision2.dirs => aegir2-provision.dirs} | 0 debian/{aegir-provision2.docs => aegir2-provision.docs} | 0 ...egir-provision2.examples => aegir2-provision.examples} | 0 ...{aegir-provision2.lintian => aegir2-provision.lintian} | 0 ...egir-provision2.postinst => aegir2-provision.postinst} | 0 .../{aegir-provision2.postrm => aegir2-provision.postrm} | 0 ...{aegir-provision2.preinst => aegir2-provision.preinst} | 0 debian/control | 8 ++++---- debian/rules | 6 +++--- 20 files changed, 7 insertions(+), 7 deletions(-) rename debian/{aegir-cluster-slave2.config => aegir2-cluster-slave.config} (100%) rename debian/{aegir-cluster-slave2.dirs => aegir2-cluster-slave.dirs} (100%) rename debian/{aegir-cluster-slave2.examples => aegir2-cluster-slave.examples} (100%) rename debian/{aegir-cluster-slave2.postinst => aegir2-cluster-slave.postinst} (100%) rename debian/{aegir-cluster-slave2.postrm => aegir2-cluster-slave.postrm} (100%) rename debian/{aegir-cluster-slave2.prerm => aegir2-cluster-slave.prerm} (100%) rename debian/{aegir-cluster-slave2.templates => aegir2-cluster-slave.templates} (100%) rename debian/{aegir-hostmaster2.config => aegir2-hostmaster.config} (100%) rename debian/{aegir-hostmaster2.hosting-queued.init => aegir2-hostmaster.hosting-queued.init} (100%) rename debian/{aegir-hostmaster2.postinst => aegir2-hostmaster.postinst} (100%) rename debian/{aegir-hostmaster2.templates => aegir2-hostmaster.templates} (100%) rename debian/{aegir-provision2.dirs => aegir2-provision.dirs} (100%) rename debian/{aegir-provision2.docs => aegir2-provision.docs} (100%) rename debian/{aegir-provision2.examples => aegir2-provision.examples} (100%) rename debian/{aegir-provision2.lintian => aegir2-provision.lintian} (100%) rename debian/{aegir-provision2.postinst => aegir2-provision.postinst} (100%) rename debian/{aegir-provision2.postrm => aegir2-provision.postrm} (100%) rename debian/{aegir-provision2.preinst => aegir2-provision.preinst} (100%) diff --git a/debian/aegir-cluster-slave2.config b/debian/aegir2-cluster-slave.config similarity index 100% rename from debian/aegir-cluster-slave2.config rename to debian/aegir2-cluster-slave.config diff --git a/debian/aegir-cluster-slave2.dirs b/debian/aegir2-cluster-slave.dirs similarity index 100% rename from debian/aegir-cluster-slave2.dirs rename to debian/aegir2-cluster-slave.dirs diff --git a/debian/aegir-cluster-slave2.examples b/debian/aegir2-cluster-slave.examples similarity index 100% rename from debian/aegir-cluster-slave2.examples rename to debian/aegir2-cluster-slave.examples diff --git a/debian/aegir-cluster-slave2.postinst b/debian/aegir2-cluster-slave.postinst similarity index 100% rename from debian/aegir-cluster-slave2.postinst rename to debian/aegir2-cluster-slave.postinst diff --git a/debian/aegir-cluster-slave2.postrm b/debian/aegir2-cluster-slave.postrm similarity index 100% rename from debian/aegir-cluster-slave2.postrm rename to debian/aegir2-cluster-slave.postrm diff --git a/debian/aegir-cluster-slave2.prerm b/debian/aegir2-cluster-slave.prerm similarity index 100% rename from debian/aegir-cluster-slave2.prerm rename to debian/aegir2-cluster-slave.prerm diff --git a/debian/aegir-cluster-slave2.templates b/debian/aegir2-cluster-slave.templates similarity index 100% rename from debian/aegir-cluster-slave2.templates rename to debian/aegir2-cluster-slave.templates diff --git a/debian/aegir-hostmaster2.config b/debian/aegir2-hostmaster.config similarity index 100% rename from debian/aegir-hostmaster2.config rename to debian/aegir2-hostmaster.config diff --git a/debian/aegir-hostmaster2.hosting-queued.init b/debian/aegir2-hostmaster.hosting-queued.init similarity index 100% rename from debian/aegir-hostmaster2.hosting-queued.init rename to debian/aegir2-hostmaster.hosting-queued.init diff --git a/debian/aegir-hostmaster2.postinst b/debian/aegir2-hostmaster.postinst similarity index 100% rename from debian/aegir-hostmaster2.postinst rename to debian/aegir2-hostmaster.postinst diff --git a/debian/aegir-hostmaster2.templates b/debian/aegir2-hostmaster.templates similarity index 100% rename from debian/aegir-hostmaster2.templates rename to debian/aegir2-hostmaster.templates diff --git a/debian/aegir-provision2.dirs b/debian/aegir2-provision.dirs similarity index 100% rename from debian/aegir-provision2.dirs rename to debian/aegir2-provision.dirs diff --git a/debian/aegir-provision2.docs b/debian/aegir2-provision.docs similarity index 100% rename from debian/aegir-provision2.docs rename to debian/aegir2-provision.docs diff --git a/debian/aegir-provision2.examples b/debian/aegir2-provision.examples similarity index 100% rename from debian/aegir-provision2.examples rename to debian/aegir2-provision.examples diff --git a/debian/aegir-provision2.lintian b/debian/aegir2-provision.lintian similarity index 100% rename from debian/aegir-provision2.lintian rename to debian/aegir2-provision.lintian diff --git a/debian/aegir-provision2.postinst b/debian/aegir2-provision.postinst similarity index 100% rename from debian/aegir-provision2.postinst rename to debian/aegir2-provision.postinst diff --git a/debian/aegir-provision2.postrm b/debian/aegir2-provision.postrm similarity index 100% rename from debian/aegir-provision2.postrm rename to debian/aegir2-provision.postrm diff --git a/debian/aegir-provision2.preinst b/debian/aegir2-provision.preinst similarity index 100% rename from debian/aegir-provision2.preinst rename to debian/aegir2-provision.preinst diff --git a/debian/control b/debian/control index 2c82a9a3..0b9018c2 100644 --- a/debian/control +++ b/debian/control @@ -29,12 +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-hostmaster2 +Package: aegir2-hostmaster Architecture: all 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 +Conflicts: aegir-hostmaster, aegir-hostmaster2 +Replaces: aegir-hostmaster, aegir-hostmaster2 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 @@ -53,7 +53,7 @@ Description: mass Drupal hosting system - frontend Package: aegir2 Architecture: all -Depends: ${misc:Depends}, aegir-provision2 (>= ${source:Version}), aegir-hostmaster2 (>= ${source:Version}) +Depends: ${misc:Depends}, aegir2-provision (>= ${source:Version}), aegir2-hostmaster (>= ${source:Version}) Conflicts: aegir Replaces: aegir Description: mass Drupal hosting system diff --git a/debian/rules b/debian/rules index dfe4012c..11ac29c6 100755 --- a/debian/rules +++ b/debian/rules @@ -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-provision2/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/aegir2-provision/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-provision2/usr/share/drush/commands/provision/"; fi + if [ -d "$(CURDIR)/provision-tests" ]; then cp -r "$(CURDIR)/provision-tests/" "$(CURDIR)/debian/aegir2-provision/usr/share/drush/commands/provision/"; fi - cp "$(CURDIR)/debian/aegir-provision2.lintian" "$(CURDIR)/debian/aegir-provision2/usr/share/lintian/overrides/aegir-provision" + cp "$(CURDIR)/debian/aegir2-provision.lintian" "$(CURDIR)/debian/aegir2-provision/usr/share/lintian/overrides/aegir-provision" override_dh_installinit: dh_installinit --name=hosting-queued -- GitLab