Attachment 7819 Details for Bug 41187 – workaround without changes in dh-umc*

[patch] workaround without changes in dh-umc*

41187.patch (text/plain), 4.34 KB, created by Eduard Mai on 2016-07-21 12:48:05 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Eduard Mai

Created: 2016-07-21 12:48:05 CEST

Size: 4.34 KB

patch

obsolete

>diff --git a/saml/univention-saml/debian/changelog b/saml/univention-saml/debian/changelog
>index 7ff0458..46c6ba3 100644
>--- a/saml/univention-saml/debian/changelog
>+++ b/saml/univention-saml/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-saml (3.0.27-5) unstable; urgency=medium
>+
>+  * Bug #41187: workaround for untranslated title and description
>+
>+ -- Eduard Mai <mai@univention.de>  Thu, 21 Jul 2016 12:26:32 +0200
>+
> univention-saml (3.0.27-4) unstable; urgency=medium
> 
>   * Bug #40895: Make serviceprovider extended attribute available for udm user
>diff --git a/saml/univention-saml/debian/control b/saml/univention-saml/debian/control
>index 491b52e..ca6ca47 100644
>--- a/saml/univention-saml/debian/control
>+++ b/saml/univention-saml/debian/control
>@@ -4,7 +4,8 @@ Priority: optional
> Maintainer: Univention GmbH <packages@univention.de>
> Build-Depends: debhelper (>= 9),
>  ucslint-univention,
>- univention-config-dev
>+ univention-config-dev,
>+ univention-management-console-dev
> Standards-Version: 3.8.4
> XS-Python-Version: 2.6,2.7
> 
>diff --git a/saml/univention-saml/debian/rules b/saml/univention-saml/debian/rules
>index 0e4866f..878a724 100755
>--- a/saml/univention-saml/debian/rules
>+++ b/saml/univention-saml/debian/rules
>@@ -27,13 +27,22 @@
> # License with the Debian GNU/Linux or Univention distribution in file
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
>+override_dh_auto_build:
>+	dh-umc-module-build -c
>+	dh_auto_build
> 
> override_dh_auto_install:
>+	dh-umc-module-install -c
>+	# fix translation
>+	rm debian/univention-saml/usr/share/univention-management-console/i18n/de/umc-core.mo
>+	mkdir -p usr/share/univention-management-console/i18n/de
>+	msgfmt --check --output-file=usr/share/univention-management-console/i18n/de/udm-saml.mo umc/de.po
> 	dh_auto_install
> 	univention-install-config-registry
> 
> override_dh_auto_test:
> 	dh_auto_test
> 	ucslint
>+
> %:
> 	dh $@ --with 'python_support'
>diff --git a/saml/univention-saml/debian/univention-saml.install b/saml/univention-saml/debian/univention-saml.install
>index 3c0af23..06cc20b 100644
>--- a/saml/univention-saml/debian/univention-saml.install
>+++ b/saml/univention-saml/debian/univention-saml.install
>@@ -5,3 +5,4 @@ simplesamlphp-modules/* usr/share/simplesamlphp/modules
> 91univention-saml.inst usr/lib/univention-install
> scripts/php-cgi /var/www/saml
> blank.json usr/share/simplesamlphp/www/
>+usr/share/univention-management-console/i18n/de/udm-saml.mo
>diff --git a/saml/univention-saml/debian/univention-saml.umc-modules b/saml/univention-saml/debian/univention-saml.umc-modules
>new file mode 100644
>index 0000000..5f8c68e
>--- /dev/null
>+++ b/saml/univention-saml/debian/univention-saml.umc-modules
>@@ -0,0 +1,6 @@
>+Module: umc-core
>+Python:
>+Category: none
>+Definition: umc/saml-serviceprovider.xml
>+Javascript:
>+Icons: umc/icons
>diff --git a/saml/univention-saml/umc/de.po b/saml/univention-saml/umc/de.po
>new file mode 100644
>index 0000000..a5bb345
>--- /dev/null
>+++ b/saml/univention-saml/umc/de.po
>@@ -0,0 +1,21 @@
>+# This file is auto-generated by the dh-umc tools and should not be edited!
>+msgid ""
>+msgstr ""
>+"Project-Id-Version: univention-saml\n"
>+"Report-Msgid-Bugs-To: packages@univention.de\n"
>+"POT-Creation-Date: Thu, 21 Jul 2016 11:49:33 +0200\n"
>+"PO-Revision-Date: \n"
>+"Last-Translator: Univention GmbH <packages@univention.de>\n"
>+"Language-Team: Univention GmbH <packages@univention.de>\n"
>+"MIME-Version: 1.0\n"
>+"Content-Type: text/plain; charset=UTF-8\n"
>+"Content-Transfer-Encoding: 8bit\n"
>+"Language: de\n"
>+
>+msgid "SAML identity provider"
>+msgstr ""
>+
>+msgid ""
>+"Management of service provider configurations for the single sign-on "
>+"functionality of the SAML identity provider"
>+msgstr "Service Provider fÃ¼r die Single Sign On Funktion konfigurieren"
>diff --git a/saml/univention-saml/umc/saml-serviceprovider.xml b/saml/univention-saml/umc/saml-serviceprovider.xml
>index 4c6d224..e708859 100644
>--- a/saml/univention-saml/umc/saml-serviceprovider.xml
>+++ b/saml/univention-saml/umc/saml-serviceprovider.xml
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> 
> <umc version="2.0">
>-	<module id="udm" icon="udm-saml-serviceprovider" version="1.0">
>+	<module id="udm" translationId="udm-saml" icon="udm-saml-serviceprovider" version="1.0">
> 		<name/>
> 		<description/>
> 		<keywords/>

Actions: View | Diff

Attachments on bug 41187: 7818 | 7819