4 files changed, 27 insertions, 23 deletions
diff --git a/src/fripost-partman-udeb/debian/rules b/src/fripost-partman-udeb/debian/rules
index cbe925d..514b55b 100755
--- a/src/fripost-partman-udeb/debian/rules
+++ b/src/fripost-partman-udeb/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
 %:
 	dh $@
+
+# dh_pysupport: This program is deprecated, you should use dh_python2 instead.
+override_dh_pysupport:
diff --git a/src/fripost-partman-udeb/debian/templates b/src/fripost-partman-udeb/debian/templates
index 00377a5..2088e19 100644
--- a/src/fripost-partman-udeb/debian/templates
+++ b/src/fripost-partman-udeb/debian/templates
@@ -5,15 +5,14 @@ Description: Partition disks using a shell script
 Template: fripost/partition-script
 Type: text
 Description: Which script should be used for partitioning?
-Extended_description: The path should be absolute, and the script must
- be executable.
+ The path should be absolute, and the script must be executable.
 
 Template: fripost/wipe-device
 Type: select
 Default: zero
 Choices: none, zero, urandom, random
 Description: Which kind of data fill the disk with before encryption?
-Extended_description: 'none' means disks will NOT wiped, otherwise use
+ 'none' means disks will NOT wiped, otherwise use
  /dev/{zero,urandom,random} as the source data to fill disks with.
  Beware that the later two may drain the entropy pool of the system!
 
@@ -33,10 +32,10 @@ Description: Should the system disk be fully encrypted? (Excluding /boot.)
 Template: fripost/encryption-password
 Type: password
 Default:
-Description: Password for full-disk encryption?
-Extended_description: If left empty, a SSH daemon will be fired and the
- automatic install will be interupted, waiting for the user to dump the
- password on the standard input.
+Description: Password for full-disk encryption:
+ If left empty, a SSH daemon will be fired and the automatic install
+ will be interupted, waiting for the user to dump the password on the
+ standard input.
 
 Template: fripost/ssh-keypair-generation_progress_title
 Type: text
diff --git a/src/fripost-postinst-udeb/debian/rules b/src/fripost-postinst-udeb/debian/rules
index cbe925d..514b55b 100755
--- a/src/fripost-postinst-udeb/debian/rules
+++ b/src/fripost-postinst-udeb/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
 %:
 	dh $@
+
+# dh_pysupport: This program is deprecated, you should use dh_python2 instead.
+override_dh_pysupport:
diff --git a/src/fripost-postinst-udeb/debian/templates b/src/fripost-postinst-udeb/debian/templates
index 5385ce9..fcba8de 100644
--- a/src/fripost-postinst-udeb/debian/templates
+++ b/src/fripost-postinst-udeb/debian/templates
@@ -5,32 +5,32 @@ Description: ${WHAT}
 Template: fripost/initrd-ssh-port
 Type: string
 Default: 22
-Description: On which [address:]port should dropbear listen?
-Extended_description: If port is a range (e.g., 1024-65535), a random
- port in that range is chosen.  Leaving the question empty is equivalent
- to specifying the range of registered port 1024-49151.  This is only
- used for remote (SSH) unlocking of encrypted disks.
+Description: Listening [address:]port for dropbear:
+ If port is a range (e.g., 1024-65535), a random port in that range is
+ chosen.  Leaving the question empty is equivalent to specifying the
+ range of registered port 1024-49151.  This is only used for remote
+ (SSH) unlocking of encrypted disks.
 
 Template: fripost/dropbear-use-openssh-key
 Type: boolean
 Default: false
 Description: Use the same key for dropbear and OpenSSH?
-Extended_description: If False, generate a dedicated key for dropbear.
+ If False, generate a dedicated key for dropbear.
 
 Template: fripost/activate-selinux
 Type: boolean
 Default: true
 Description: Install and activate (in enforcing mode) SELinux?
-Extended_description: Note that activating SELinux requires a dummy
- reboot to label all files.  So if you have full-disk encryption, you'll
- have to send the password twice to dropbear.
+ Note that activating SELinux requires a dummy reboot to label all
+ files.  So if you have full-disk encryption, you'll have to send the
+ password twice to dropbear.
 
 Template: fripost/keep-media-directory
 Type: boolean
 Default: false
 Description: Keep /media and its kids' entries in the fstab?
-Extended_description: /media (and its related entries in the fstab)
- can safely be removed on a headless server.
+ /media (and its related entries in the fstab) can safely be removed on
+ a headless server.
 
 Template: fripost/sshd-fprs_title
 Type: text
@@ -39,8 +39,8 @@ Description: Reboot in progress
 Template: fripost/sshd-fprs_text
 Type: note
 Description: Press 'continue' to reboot on the new system
- We are done!  After rebooting you should be able to log in into your
- new machine:
+ Done!  After rebooting you should be able to log in into your new
+ machine:
  .
      ssh ${USER}@${IPv4}
  .
@@ -69,7 +69,7 @@ Description: Press 'continue' to reboot on the new system
 Template: fripost/sshd-fprs-nodropbear_text
 Type: note
 Description: Press 'continue' to reboot on the new system
- We are done! After rebooting you should be able to log in into your new
+ Done! After rebooting you should be able to log in into your new
  machine:
  .
      ssh ${USER}@${IPv4}
@@ -89,5 +89,4 @@ Template: fripost/final-notice
 Type: boolean
 Default: true
 Description: Display the final notice before rebooting?
-Extended_description: It's good to show SSH fingerprints, because it
- defeats MiTM-attacks.
+ It's good to show SSH fingerprints, because it defeats MiTM-attacks.