[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-256-ga19dd05
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit a19dd0575f32a26355148f9b4d217bcf884728c7
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Mar 19 16:43:07 2013 +0100
dont use generated dependencies (related: deb#693540)
diff --git a/changelog b/changelog
index fa7454b..52d7e18 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,9 @@ libreoffice (1:4.0.2~rc1-0ubuntu1~raring1~ppa1) raring; urgency=low
* merge from Debian at a2aaf1c26fa02e8e0e186d8d1b255628e6f11a3d
* add junit subsequentcheck as autopkgtest
+ * revert ppa specialcasing removal -- the ppa builders are still too small
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 15 Mar 2013 17:49:06 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 19 Mar 2013 15:15:13 +0100
libreoffice (1:4.0.2~rc1-1) UNRELEASED; urgency=low
diff --git a/rules b/rules
index e2bf221..db47763 100755
--- a/rules
+++ b/rules
@@ -749,6 +749,12 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
+ # PPA builds need a reduced l10n set to fit on those builders
+ ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
+ ISOS:=en-US ar cs es de fr it ja nl ru pt-BR zh-CN
+ HELPISOS:=en-US ar cs es de fr it ja nl ru pt-BR zh-CN
+ LANGPACKISOS:=en-US ar cs es de fr it ja nl ru pt-BR zh-CN
+ endif
endif
else
ISOS=en-US
@@ -1359,8 +1365,6 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
-e "s#@PYTHON2_VERSION@#$(PYTHON2_VERSION)#g" \
-e "s#@BUGS@#$(BUGS)#g" \
< debian/control.in > debian/control
- sed -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
- < debian/tests/control.in > debian/tests/control
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
diff --git a/tests/control.in b/tests/control
similarity index 100%
rename from tests/control.in
rename to tests/control
--
LibreOffice packaging repository
Reply to: