Reworking debconf stuff of merging former live-autobuild-manual and live-autobuild-images into a single live-build-cron.

1 files changed, 43 insertions, 17 deletions

diff --git a/debian/live-build-cron.templates b/debian/live-build-cron.templates
index 8e689c199..f088c3e6a 100644
--- a/debian/live-build-cron.templates
+++ b/debian/live-build-cron.templates
@@ -1,22 +1,28 @@
-Template: live-build-cron-images/title
+Template: live-build-cron/title
 Type: title
-_Description: Debian Live - System Build Scripts
+_Description: Debian Live - System Build Scripts (cron autobuilder)
 
-Template: live-build-cron-images/enable
+Template: live-build-cron/images-enable
 Type: boolean
 Default: false
-_Description: Enable live-build-cron-images?
- Do you want to enable live-build-cron-images?
+_Description: Enable images autobuild?
+ Do you want to enable autobuild for images?
  .
  If unsure, use 'no' (default).
 
-Template: live-build-cron-images/directory
+Template: live-build-cron/images-directory
 Type: string
 _Default: /srv/debian.net/live-cdimage
 _Description: What directory to put builds to?
  Enter the directory where the images should be stored in.
 
-Template: live-build-cron-images/build
+Template: live-build-cron/images-cron
+Type: string
+_Default: 0 0 * * *
+_Description: What directory to put builds to?
+ Enter the cron times where the images should be build.
+
+Template: live-build-cron/images-build
 Type: select
 _Choices: git, host, release
 Default: host
@@ -27,56 +33,76 @@ _Description: Which version of live-build to use?
  used. host will use the live-build from the host system, and release will
  use the last released version.
 
-Template: live-build-cron-images/daily-distributions
+Template: live-build-cron/images-daily-distributions
 Type: multiselect
 _Choices: squeeze, wheezy, sid
 Default: sid
 _Description: What distributions to build for daily images?
  Select the distributions you would like to build for daily-images.
 
-Template: live-build-cron-images/daily-flavours
+Template: live-build-cron/images-daily-flavours
 Type: multiselect
 _Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
 Default: standard
 _Description: What flavours to build for daily images?
  Select the flavours you would like to build for daily-images.
 
-Template: live-build-cron-images/weekly-distributions
+Template: live-build-cron/images-weekly-distributions
 Type: multiselect
 _Choices: squeeze, wheezy, sid
 Default: wheezy
 _Description: What distributions to build for weekly images?
  Select the distributions you would like to build for weekly-images.
 
-Template: live-build-cron-images/weekly-flavours
+Template: live-build-cron/images-weekly-flavours
 Type: multiselect
 _Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
 Default: standard
 _Description: What flavours to build for weekly images?
  Select the flavours you would like to build for weekly-images.
 
-Template: live-build-cron-images/monthly-distributions
+Template: live-build-cron/images-monthly-distributions
 Type: multiselect
 _Choices: squeeze, wheezy, sid
 Default: squeeze
 _Description: What distributions to build for monthly images?
  Select the distributions you would like to build for monthly-images.
 
-Template: live-build-cron-images/monthly-flavours
+Template: live-build-cron/images-monthly-flavours
 Type: multiselect
 _Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
 Default: standard
 _Description: What flavours to build for monthly images?
  Select the flavours you would like to build for monthly-images.
 
-Template: live-build-cron-images/source
+Template: live-build-cron/images-source
 Type: boolean
 Default: false
 _Description: Enable source for live-build-cron-images?
  Do you sources for live-build-cron-images?
 
-Template: live-build-cron-images/cron
+Template: live-build-cron/manual-enable
+Type: boolean
+Default: false
+_Description: Enable live-build-cron-manual?
+ Do you want to enable live-build-cron-manual?
+ .
+ If unsure, use 'no' (default).
+
+Template: live-build-cron/manual-directory
 Type: string
-_Default: 0 0 * * *
+_Default: /srv/debian.net/live-manual
 _Description: What directory to put builds to?
- Enter the cron times where the images should be build.
+ Enter the directory where the manual should be stored in.
+
+Template: live-build-cron/manual-cron
+Type: string
+_Default: 0-59/10 * * * *
+_Description: What interval to use for the cron job?
+ Enter the cron times where the manual should be build.
+
+Template: live-build-cron/manual-username
+Type: string
+_Default: live-build-cron-manual
+_Description: What useraccount to use to build the manual?
+ Enter the name of the username.