[SCM] LibreOffice packaging repository branch, debian-wheezy-3.5, updated. libreoffice_3.5.4_dfsg2-1-8-g05b8778
The following commit has been merged in the debian-wheezy-3.5 branch:
commit 0ddd549140c1c64b69fc5074cdef033660d9f9b1
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 27 18:47:06 2012 +0200
guard ca-XV -> -ca move in install-common...
Conflicts:
changelog
diff --git a/changelog b/changelog
index 9937d7b..a68f004 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.5.4+dfsg2-0+deb7u2) stable; 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.5.4+dfsg2-0+deb7u1) stable; urgency=low
* src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: remove
diff --git a/rules b/rules
index da5bb06..5af9814 100755
--- a/rules
+++ b/rules
@@ -1689,14 +1689,18 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
# 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: