[SCM] libdvd-pkg/master: templates' improvements by debian-l10n-english team

[onlyjob at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d0dfc74784320c2a6cfeca1ccf47025d0af80848
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Mon Dec 15 19:27:38 2014 +1100

    templates' improvements by debian-l10n-english team

diff --git a/debian/config b/debian/config
index 6c857c9..9f7ce6d 100644
--- a/debian/config
+++ b/debian/config
@@ -16,6 +16,7 @@ if [ "$1" = configure ] ; then
     if [ -z "$2" ]; then
     ## first install
         db_subst      libdvd-pkg/first-install PKGI ${PKGI}
+        db_subst      libdvd-pkg/first-install PKGG_ALL ${PKGG_ALL}
         db_subst      libdvd-pkg/first-install PKGG ${PKGG}
         db_subst      libdvd-pkg/first-install VER /${VERGG}
         db_input high libdvd-pkg/first-install || true
@@ -55,6 +56,7 @@ if [ "$1" = reconfigure ] ; then
         db_subst      libdvd-pkg/title_b-i VER /${VERGG}
         db_settitle   libdvd-pkg/title_b-i
 
+        db_subst      libdvd-pkg/build PKGG_ALL ${PKGG_ALL}
         db_subst      libdvd-pkg/build PKGG ${PKGG}
         db_subst      libdvd-pkg/build VER /${VERGG}
         db_reset      libdvd-pkg/build
diff --git a/debian/templates b/debian/templates
index f947b1d..05c7cad 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,28 +1,30 @@
-Template: libdvd-pkg/build
-Type: boolean
-Default: true
-_Description: Continue?
- This application is about to download, compile from source code and
- install "${PKGG}${VER}" as Debian package (source files will be
- downloaded from videolan.org).
-
 Template: libdvd-pkg/first-install
 Type: note
 _Description:
- This application automates download, compile from source code and
- install "${PKGG}${VER}" as Debian package (source files will be
- downloaded from videolan.org).
+ This package downloads the ${PKGG} source files from videolan.org,
+ compile them and install the binary deb package(s)
+ [${PKGG_ALL}].
  .
- Please remember to run `sudo dpkg-reconfigure ${PKGI}`
+ Please remember to run "sudo dpkg-reconfigure ${PKGI}"
  to build and install guest package(s) for the first time.
 
 Template: libdvd-pkg/title_b-i
 Type: title
-_Description: Build and install ${PKGG}${VER}.
+_Description: Build and install ${PKGG}${VER}
+
+Template: libdvd-pkg/build
+Type: boolean
+Default: true
+_Description: Proceed with downloading and compiling ${PKGG}${VER}?
+ The installation process is therefore about to download the source files
+ from videolan.org, compile them, and install the binary deb package(s)
+ [${PKGG_ALL}].
+ .
+ Please confirm whether you wish this to happen.
 
 Template: libdvd-pkg/title_u
 Type: title
-_Description: Guest package(s) upgrade note.
+_Description: Upgrades available for guest package(s)
 
 Template: libdvd-pkg/upgrade
 Type: note
@@ -30,39 +32,29 @@ _Description:
  An update to guest package(s) [${PKGG_ALL}] version ${VER} is available
  but automatic upgrade is disabled.
  .
- Please remember to run `sudo dpkg-reconfigure ${PKGI}` to build and
- install guest package(s) or consider installing APT post-invoke hook.
+ Please remember to run "sudo dpkg-reconfigure ${PKGI}" to build and
+ install guest package(s) or consider installing the APT post-invoke hook.
 
 Template: libdvd-pkg/post-invoke_hook-install
 Type: boolean
 Default: true
 _Description: Install APT post-invoke hook?
- APT post-invoke hook takes care of future automatic upgrades of guest
- package(s) on host package upgrade. After end of batch of APT
- operations hook will check whether guest package(s) can be updated.
- If upgrade detected then hook will attempt to download/build and
- install package(s) using `dpkg -i` but only if `apt-get check` reported
- no errors.
+ If activated, the APT post-invoke hook takes care of future automatic
+ upgrades of guest package(s) on host package upgrade. When an update
+ is available, the hook will attempt to download and build the package(s),
+ and (if "apt-get check" reports no errors) install them with "dpkg -i".
  .
- At the moment there are no known problems associated with APT
- post-invoke hook which maintainer recommends to use with this package.
- .
- Alternatively guest package(s) can be built by manual invocation of
- `dpkg-reconfigure ${PKGI}`.
+ Alternatively, guest package(s) can be built by manual invocation of
+ "dpkg-reconfigure ${PKGI}".
 
 Template: libdvd-pkg/post-invoke_hook-remove
 Type: boolean
 Default: false
 _Description: Remove APT post-invoke hook?
- APT post-invoke hook takes care of future automatic upgrades of guest
- package(s) on host package upgrade. After end of batch of APT
- operations hook will check whether guest package(s) can be updated.
- If upgrade detected then hook will attempt to download/build and
- install package(s) using `dpkg -i` but only if `apt-get check` reported
- no errors.
- .
- At the moment there are no known problems associated with APT
- post-invoke hook which maintainer recommends to use with this package.
+ If activated, the APT post-invoke hook takes care of future automatic
+ upgrades of guest package(s) on host package upgrade. When an update
+ is available, the hook will attempt to download and build the package(s),
+ and (if "apt-get check" reports no errors) install them with "dpkg -i".
  .
- Alternatively guest package(s) can be built on manual invocation of
- `dpkg-reconfigure ${PKGI}`.
+ Alternatively, guest package(s) can be built by manual invocation of
+ "dpkg-reconfigure ${PKGI}".

-- 
libdvdcss-pkg packaging