[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0-2-57-gd596b0c
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit da5065b36148a1b20ce93e9193b9ab1c94da235a
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Feb 24 16:12:22 2012 +0100
readding ubuntu presentation templates
diff --git a/rules b/rules
index bd170c7..093b071 100755
--- a/rules
+++ b/rules
@@ -444,6 +444,7 @@ ifeq "$(DEB_VENDOR)" "Debian"
BUILD_ONLY_EN_US=y
endif
CONFIGURE_FLAGS += --with-intro-progressbar-color=215,7,81
+ VENDOR_PRESENTATION_TEMPLATES=templates
endif
# Debian Squeeze
@@ -468,6 +469,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
RUN_MAKE_CHECK:=n
endif
+ VENDOR_PRESENTATION_TEMPLATES=ubuntu-templates
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@ -1930,9 +1932,9 @@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/install $(STAMP_DIR)/install-indep $(SOURCE
> $$TMP && \
debian/scripts/cleandupes --base=libreoffice$(VER) --prefix=debian < $$TMP && rm -f $$TMP
-ifeq "$(DEB_VENDOR)" "Debian"
- # install Debian presentation template
- otps=`cd debian/templates; echo *.otp`; \
+ifneq "$(VENDOR_PRESENTATION_TEMPLATES)" ""
+ # install vendor presentation template
+ otps=`cd debian/$(VENDOR_PRESENTATION_TEMPLATES); echo *.otp`; \
for iso in $(LANGPACKISOS); do \
[ "$$iso" = "en-US" ] && continue; \
pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
diff --git a/ubuntu-templates/Blue.otp b/ubuntu-templates/Blue.otp
new file mode 100644
index 0000000..e92fca8
Binary files /dev/null and b/ubuntu-templates/Blue.otp differ
diff --git a/ubuntu-templates/Glossy.otp b/ubuntu-templates/Glossy.otp
new file mode 100644
index 0000000..e38edda
Binary files /dev/null and b/ubuntu-templates/Glossy.otp differ
diff --git a/ubuntu-templates/Green.otp b/ubuntu-templates/Green.otp
new file mode 100644
index 0000000..de816f2
Binary files /dev/null and b/ubuntu-templates/Green.otp differ
diff --git a/ubuntu-templates/Grey.otp b/ubuntu-templates/Grey.otp
new file mode 100644
index 0000000..627db97
Binary files /dev/null and b/ubuntu-templates/Grey.otp differ
diff --git a/ubuntu-templates/Human.otp b/ubuntu-templates/Human.otp
new file mode 100644
index 0000000..71a7164
Binary files /dev/null and b/ubuntu-templates/Human.otp differ
diff --git a/ubuntu-templates/Orange.otp b/ubuntu-templates/Orange.otp
new file mode 100644
index 0000000..a3b260a
Binary files /dev/null and b/ubuntu-templates/Orange.otp differ
diff --git a/ubuntu-templates/Ubuntu.otp b/ubuntu-templates/Ubuntu.otp
new file mode 100644
index 0000000..bac679e
Binary files /dev/null and b/ubuntu-templates/Ubuntu.otp differ
--
LibreOffice packaging repository
Reply to: