summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-07 20:43:47 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-07 20:43:47 +0000
commit71c5b530111a2150a42439d2c3f67cf1ad943c91 (patch)
tree22d5ea2938ef7c3f228ce92692dcee2fc1fbce59
parent97944057fd090e41d384cf5c45b9d99c4db7f502 (diff)
Resolves: fdo#32897 strip out template language tags
-rw-r--r--extras/source/premium/templates-nonfree/layout/lang/makefile.mk2
-rw-r--r--extras/source/premium/templates-nonfree/presnt/lang/makefile.mk2
-rw-r--r--extras/source/premium/templates/common/layout/makefile.mk2
-rw-r--r--extras/source/premium/templates/common/presnt/makefile.mk2
-rw-r--r--extras/source/premium/templates/layout/lang/makefile.mk2
-rw-r--r--extras/source/premium/templates/presnt/lang/makefile.mk2
-rw-r--r--extras/source/templates/lang/makefile.mk2
-rw-r--r--extras/source/templates/layout/makefile.mk3
-rw-r--r--extras/source/templates/presnt/lang/makefile.mk2
9 files changed, 10 insertions, 9 deletions
diff --git a/extras/source/premium/templates-nonfree/layout/lang/makefile.mk b/extras/source/premium/templates-nonfree/layout/lang/makefile.mk
index e44e094343cc..9c0da601fb2e 100644
--- a/extras/source/premium/templates-nonfree/layout/lang/makefile.mk
+++ b/extras/source/premium/templates-nonfree/layout/lang/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatesnonfreelayout
ZIP1TARGET = $(PREMIUM_TEMPLATES_NONFREE_LAYOUT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
ZIP1LIST = $(LANGDIR)$/*
diff --git a/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk b/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk
index 7ffde4ce3503..239d2dafcb5d 100644
--- a/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk
+++ b/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatesnonfreepresnt
ZIP1TARGET = $(PREMIUM_TEMPLATES_NONFREE_PRESNT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
ZIP1LIST = $(LANGDIR)$/*
diff --git a/extras/source/premium/templates/common/layout/makefile.mk b/extras/source/premium/templates/common/layout/makefile.mk
index c78dab55fcbc..470210ac3679 100644
--- a/extras/source/premium/templates/common/layout/makefile.mk
+++ b/extras/source/premium/templates/common/layout/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatescommonlayout
ZIP1TARGET = $(PREMIUM_TEMPLATES_COMMON_LAYOUT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
ZIP1LIST = * -x makefile.*
diff --git a/extras/source/premium/templates/common/presnt/makefile.mk b/extras/source/premium/templates/common/presnt/makefile.mk
index 2d5ea56bab60..d27aa0d1b427 100644
--- a/extras/source/premium/templates/common/presnt/makefile.mk
+++ b/extras/source/premium/templates/common/presnt/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatescommonpresnt
ZIP1TARGET = $(PREMIUM_TEMPLATES_COMMON_PRESNT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
ZIP1LIST = * -x makefile.*
diff --git a/extras/source/premium/templates/layout/lang/makefile.mk b/extras/source/premium/templates/layout/lang/makefile.mk
index 31c277b2c15e..b664c121baa2 100644
--- a/extras/source/premium/templates/layout/lang/makefile.mk
+++ b/extras/source/premium/templates/layout/lang/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplateslayout
ZIP1TARGET = $(PREMIUM_TEMPLATES_LAYOUT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
ZIP1LIST = $(LANGDIR)$/*
diff --git a/extras/source/premium/templates/presnt/lang/makefile.mk b/extras/source/premium/templates/presnt/lang/makefile.mk
index 74eb7121d7ba..6f2e185f82a6 100644
--- a/extras/source/premium/templates/presnt/lang/makefile.mk
+++ b/extras/source/premium/templates/presnt/lang/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatespresnt
ZIP1TARGET = $(PREMIUM_TEMPLATES_PRESNT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
ZIP1LIST = $(LANGDIR)$/*
diff --git a/extras/source/templates/lang/makefile.mk b/extras/source/templates/lang/makefile.mk
index c0cc6e19088c..cfe7f54418cf 100644
--- a/extras/source/templates/lang/makefile.mk
+++ b/extras/source/templates/lang/makefile.mk
@@ -38,7 +38,7 @@ TARGET=templatesgeneral
ZIP1TARGET = $(TEMPLATE_ROOT_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
ZIP1LIST = $(LANGDIR)$/*
diff --git a/extras/source/templates/layout/makefile.mk b/extras/source/templates/layout/makefile.mk
index 8fac99296c0a..7b5517054eb8 100644
--- a/extras/source/templates/layout/makefile.mk
+++ b/extras/source/templates/layout/makefile.mk
@@ -36,7 +36,8 @@ TARGET=templateslayout
.INCLUDE : $(PRJ)$/util$/target.pmk
ZIP1TARGET = $(TEMPLATE_LAYOUT_IMPRESS_TARGET)
-ZIP1LIST = * -x makefile -x delzip
+ZIP1STRIPLANGUAGETAGS=1
+ZIP1LIST = * -x makefile.* -x delzip
.INCLUDE : target.mk
diff --git a/extras/source/templates/presnt/lang/makefile.mk b/extras/source/templates/presnt/lang/makefile.mk
index fb89d31a161e..8fa2c5e29587 100644
--- a/extras/source/templates/presnt/lang/makefile.mk
+++ b/extras/source/templates/presnt/lang/makefile.mk
@@ -38,7 +38,7 @@ TARGET=templatespresnt
ZIP1TARGET = $(TEMPLATE_PRESNT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
ZIP1LIST = $(LANGDIR)$/*