Use new maintainer to/from variables

diff --git a/templates/katie.announce b/templates/katie.announce
index ccb58efc345dd83a73d9f025d2ae1de27fc44e90..13e6b3ecb8458e89f0dcb620317533a39a34acb1 100644 (file)
--- a/templates/katie.announce
+++ b/templates/katie.announce
@@ -1,4 +1,4 @@
-From: __MAINTAINER_ADDRESS__
+From: __MAINTAINER_FROM__
 To: __ANNOUNCE_LIST_ADDRESS__
 __BCC__
 Subject: Installed __SOURCE__ __VERSION__ (__ARCHITECTURE__)

diff --git a/templates/katie.bug-close b/templates/katie.bug-close
index db1b51ef1a70791c8c2e051ddbdc78c01f9195ae..652c8d735f4867911005c1fdbfaad1d797620048 100644 (file)
--- a/templates/katie.bug-close
+++ b/templates/katie.bug-close
@@ -1,4 +1,4 @@
-From: __MAINTAINER_ADDRESS__
+From: __MAINTAINER_FROM__
 To: __BUG_NUMBER__-close@__BUG_SERVER__
 __BCC__
 Subject: Bug#__BUG_NUMBER__: fixed in __SOURCE__ __VERSION__

diff --git a/templates/katie.bug-nmu-fixed b/templates/katie.bug-nmu-fixed
index 8a77bc3ae899eb03be1a261bced0a21f4c8ea3f5..b20ab1540e19ebd6d869a2e20a2f3e0e90ec4610 100644 (file)
--- a/templates/katie.bug-nmu-fixed
+++ b/templates/katie.bug-nmu-fixed
@@ -1,6 +1,6 @@
-From: __MAINTAINER_ADDRESS__
+From: __MAINTAINER_FROM__
 To: control@__BUG_SERVER__
-Cc: __MAINTAINER_ADDRESS__
+Cc: __MAINTAINER_TO__
 __BCC__
 Subject: Fixed in NMU of __SOURCE__ __VERSION__
 

diff --git a/templates/katie.installed b/templates/katie.installed
index 1ed3af6d25ffefefce0c2662e38c5f21614dade2..5516590dbc68815f46dcae42a469847d70bd3bfb 100644 (file)
--- a/templates/katie.installed
+++ b/templates/katie.installed
@@ -1,5 +1,5 @@
 From: __KATIE_ADDRESS__
-To: __MAINTAINER_ADDRESS__
+To: __MAINTAINER_TO__
 __BCC__
 Subject: __CHANGES_FILENAME__ INSTALLED__SUITE__
 

diff --git a/templates/katie.new b/templates/katie.new
index cc36f710b8319c1e4899e81be9f42c330bd31aa5..908178db0421ff70bf5de7a81003a40d607c7186 100644 (file)
--- a/templates/katie.new
+++ b/templates/katie.new
@@ -1,5 +1,5 @@
 From: __KATIE_ADDRESS__
-To: __MAINTAINER_ADDRESS__
+To: __MAINTAINER_TO__
 __BCC__
 Subject: __CHANGES_FILENAME__ is NEW
 

diff --git a/templates/katie.override-disparity b/templates/katie.override-disparity
index 49cdad941caa88cc0738f983fc5a39ef55622a49..1aa66a5f4758c6856a6aad02885504405c413c33 100644 (file)
--- a/templates/katie.override-disparity
+++ b/templates/katie.override-disparity
@@ -1,5 +1,5 @@
 From: __KATIE_ADDRESS__
-To: __MAINTAINER_ADDRESS__
+To: __MAINTAINER_TO__
 __BCC__
 Subject: __SOURCE__ override disparity
 

diff --git a/templates/katie.rejected b/templates/katie.rejected
index a65c98b40d3fc678f65887a9f44635e5e2cda2d0..e1e36488d952c3c6181262e7c3c1354b8724cd80 100644 (file)
--- a/templates/katie.rejected
+++ b/templates/katie.rejected
@@ -1,5 +1,6 @@
 From: __KATIE_ADDRESS__
-To: __MAINTAINER_ADDRESS__
+To: __MAINTAINER_TO__
+__CC__
 __BCC__
 Subject: __CHANGES_FILENAME__ REJECTED