[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 72955c9616935d0a1350418767410378dbd88eff
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Feb 24 21:35:12 2012 +0100
do not depend on broken exttext
diff --git a/patches/ubuntu-quicklists.diff b/patches/ubuntu-quicklists.diff
index 462b9a5..f050a43 100644
--- a/patches/ubuntu-quicklists.diff
+++ b/patches/ubuntu-quicklists.diff
@@ -292,9 +292,9 @@ index 68cba59..19575ed 100755
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
@@ -154,6 +155,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "UnityQuicklist" $(ULFDIR)$/launcher_unityquicklist.ulf
.IF "$(WITH_LIBSN)"=="YES"
@noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
diff --git a/rules b/rules
index 093b071..07f646b 100755
--- a/rules
+++ b/rules
@@ -470,6 +470,8 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
RUN_MAKE_CHECK:=n
endif
VENDOR_PRESENTATION_TEMPLATES=ubuntu-templates
+ SYSTEM_STUFF := $(filter-out libexttextcat,$(SYSTEM_STUFF))
+ $(info foo $(SYSTEM_STUFF))
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
--
LibreOffice packaging repository
Reply to: