This is an automated email from the git hooks/post-receive script.

sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.

commit fbf9f863b72e2bf9a71f6e68d4100909abf3482c
Author: Bjoern Michaelsen <[email protected]>
Date:   Sat Dec 21 03:16:07 2013 +0100

    migrate and simplify the ca-valencia=>ca move
---
 debian-l10n/rules | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/debian-l10n/rules b/debian-l10n/rules
index e3f5309..8dd87c2 100644
--- a/debian-l10n/rules
+++ b/debian-l10n/rules
@@ -80,25 +80,17 @@ $(STAMP_DIR)/install-indep:
        dh_testdir
        dh_testroot
        rm -rf $(PKGDIR)-help-* $(PKGDIR)-l10n-*
-       $(foreach iso,$(filter-out en-US,$(LANGPACKISOS)),\
+       $(foreach iso,$(filter-out en-US ca-valencia,$(LANGPACKISOS)),\
                make install-package-l10n-$(iso) 
INSTALLDIR=$(PKGDIR)-l10n-`echo $(iso)|tr A-Z a-z`/$(OODIR) &&) true
-       $(foreach iso,$(filter-out en-US,$(HELPISOS)),\
+       $(foreach iso,$(filter-out en-US ca-valencia,$(HELPISOS)),\
                make install-package-help-$(iso) 
INSTALLDIR=$(PKGDIR)-help-`echo $(iso)|tr A-Z a-z`/$(OODIR) &&) true
        
        # and ca-valencia in -ca...
-ifeq (ca-valencia,$(findstring ca-valencia,$(LANGPACKISOS)))
-       if [ -f debian/libreoffice-l10n-ca-valencia.dirs -a -f 
debian/libreoffice-l10n-ca-valencia.install ]; then \
-               cat debian/libreoffice-l10n-ca-valencia.dirs >> 
debian/libreoffice-l10n-ca.dirs; \
-               cat debian/libreoffice-l10n-ca-valencia.install >> 
debian/libreoffice-l10n-ca.install; \
-               rm -f debian/libreoffice-l10n-ca-valencia.dirs 
debian/libreoffice-l10n-ca-valencia.install; \
-       fi
+ifneq (,$(filter ca-valencia,$(LANGPACKISOS)))
+       make install-package-l10n-ca-valencia 
INSTALLDIR=$(PKGDIR)-l10n-ca/$(OODIR)
 endif
-ifeq (ca-valencia,$(findstring ca-valencia,$(HELPISOS)))
-       if [ -f debian/libreoffice-help-ca-valencia.dirs -a -f 
debian/libreoffice-help-ca-valencia.install ]; then \
-               cat debian/libreoffice-help-ca-valencia.dirs >> 
debian/libreoffice-help-ca.dirs; \
-               cat debian/libreoffice-help-ca-valencia.install >> 
debian/libreoffice-help-ca.install; \
-               rm -f debian/libreoffice-help-ca-valencia.dirs 
debian/libreoffice-help-ca-valencia.install; \
-       fi
+ifneq (,$(filter ca-valencia,$(HELPISOS)))
+       make install-package-help-ca-valencia 
INSTALLDIR=$(PKGDIR)-help-ca/$(OODIR)
 endif
 
        for PKG in $(ARCH_INDEP_PACKAGES); do \

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to