[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.1-1-28-gc709781
The following commit has been merged in the debian-experimental-3.7 branch:
commit 95a086cc9a2d323f84be2b35061314b42b7c49d2
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 27 18:47:06 2012 +0200
guard ca-XV -> -ca move in install-common...
diff --git a/changelog b/changelog
index 9c8bb83..7e1ce17 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,14 @@ libreoffice (1:3.7.0~git20120814-1) UNRELEASED; urgency=low
-- Rene Engelhard <rene@rene-engelhard.de> Fri, 20 Jul 2012 11:16:51 +0200
+libreoffice (1:3.6.1~rc2-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - work around possible failure install-common target with missing
+ ca-XV .dirs/.install...
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 Aug 2012 13:11:47 +0200
+
libreoffice (1:3.6.1~rc2-1) experimental; urgency=low
* new upstream release candidate
diff --git a/rules b/rules
index b600608..27de722 100755
--- a/rules
+++ b/rules
@@ -1704,14 +1704,18 @@ $(STAMP_DIR)/install-common:
# and ca-XV in -ca...
ifeq (ca-XV,$(findstring ca-XV,$(LANGPACKISOS)))
- cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs
- cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install
- rm -f debian/libreoffice-l10n-ca-XV.dirs debian/libreoffice-l10n-ca-XV.install
+ if [ -f debian/libreoffice-l10n-ca-XV.dirs -a -f debian/libreoffice-l10n-ca-XV.install ]; then \
+ cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs; \
+ cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install; \
+ rm -f debian/libreoffice-l10n-ca-XV.dirs debian/libreoffice-l10n-ca-XV.install; \
+ fi
endif
ifeq (ca-XV,$(findstring ca-XV,$(HELPISOS)))
- cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs
- cat debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install
- rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install
+ if [ -f debian/libreoffice-help-ca-XV.dirs -a -f debian/libreoffice-help-ca-XV.install ]; then \
+ cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs; \
+ cat debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install; \
+ rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install; \
+ fi
endif
# fixup case (-l10n-pt-BR -> l10n-pt-br etc.)
--
LibreOffice packaging repository
Reply to: