[libreoffice] 130/152: work around broken python subst

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit f8960039fc6a5ceafbe7f11bd4ebb9d8dd18ef48
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jan 18 01:32:51 2017 +0100

    work around broken python subst
---
 debian-l10n/control.help.in | 16 ++++++++--------
 debian-l10n/control.lang.in | 24 ++++++++++++------------
 scripts/create-l10n-control |  5 ++++-
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/debian-l10n/control.help.in b/debian-l10n/control.help.in
index fc3adda..db0c3a9 100644
--- a/debian-l10n/control.help.in
+++ b/debian-l10n/control.help.in
@@ -1,17 +1,17 @@
-Package: libreoffice-help-${isocode_lower}
+Package: libreoffice-help-%{isocode_lower}
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> $${base-version}) | language-support-translations-${isocode_firstpart}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-%{isocode_firstpart}
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-l10n-${isocode_lower},
+Depends: libreoffice-l10n-%{isocode_lower},
          libreoffice-style-default,
-         libreoffice-writer | language-support-translations-${isocode_firstpart},
-         $${misc:Depends}
-Provides: libreoffice-help-$${help-l10n-virtual-version}
-Description: office productivity suite -- ${language_name} help
+         libreoffice-writer | language-support-translations-%{isocode_firstpart},
+         ${misc:Depends}
+Provides: libreoffice-help-${help-l10n-virtual-version}
+Description: office productivity suite -- %{language_name} help
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains the help of LibreOffice in
- ${language_name}.
+ %{language_name}.
 
diff --git a/debian-l10n/control.lang.in b/debian-l10n/control.lang.in
index be76ebb..a6f4d1f 100644
--- a/debian-l10n/control.lang.in
+++ b/debian-l10n/control.lang.in
@@ -1,21 +1,21 @@
-Package: libreoffice-l10n-${isocode_lower}
+Package: libreoffice-l10n-%{isocode_lower}
 Section: localization
 Architecture: all
-Pre-Depends: $${misc:Pre-Depends}
-Depends: libreoffice-common, $${misc:Depends}, ${locales_depends}
-Recommends: libreoffice-core (>> $${base-version}) | language-support-translations-${isocode_firstpart} ${font_suggests}
-Provides: libreoffice-l10n (= $${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-${isocode_lower} | myspell-dictionary-${isocode_lower},
-          hyphen-${isocode_lower},
-          libreoffice-grammarcheck-${isocode_lower},
-          libreoffice-help-${isocode_lower},
-          mythes-${isocode_lower}
-Description: office productivity suite -- ${language_name} language package
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common, ${misc:Depends}, %{locales_depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-%{isocode_firstpart} %{font_suggests}
+Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
+Suggests: hunspell-dictionary-%{isocode_lower} | myspell-dictionary-%{isocode_lower},
+          hyphen-%{isocode_lower},
+          libreoffice-grammarcheck-%{isocode_lower},
+          libreoffice-help-%{isocode_lower},
+          mythes-%{isocode_lower}
+Description: office productivity suite -- %{language_name} language package
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains the localization of LibreOffice in
- ${language_name}.
+ %{language_name}.
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages).
  You can switch user interface language using the locales system.
diff --git a/scripts/create-l10n-control b/scripts/create-l10n-control
index 3b274c7..978b677 100755
--- a/scripts/create-l10n-control
+++ b/scripts/create-l10n-control
@@ -148,6 +148,9 @@ for isocode in ['as', 'or', 'nr']:
 for isocode in ['sw']:
     locales_depends[isocode] = 'locales (>= 2.13-5) | locales-all (>= 2.13-5)'
 
+class MyTemplate(string.Template):
+    delimiter = '%'
+
 if __name__ == '__main__':
     isocode = sys.argv[1]
     language_name = iso_to_name[isocode]
@@ -164,7 +167,7 @@ if __name__ == '__main__':
     template_raw = ''
     for line in sys.stdin:
         template_raw += line
-    print(string.Template(template_raw).substitute(
+    print(MyTemplate(template_raw).substitute(
         language_name=language_name,
         isocode_lower=isocode.lower(),
         isocode_firstpart=isocode_firstpart,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git