[ciderwebmail] 02/06: Update and simplify generating l10n files.

[Jonas Smedegaard]

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

js pushed a commit to branch experimental
in repository ciderwebmail.

commit 673574325b59fdb2acbd0ff98cb7cc41f3aa498c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Oct 23 15:15:33 2014 +0200

    Update and simplify generating l10n files.
---
 debian/rules | 38 +++-----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1372632..ecbc511 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,9 +66,6 @@ deps-test = libtest-xpath-perl
 # Needed by upstream build
 bdeps = libmodule-install-perl
 
-# Needed for our l10n regeneration
-bdeps +=, gettext
-
 # Needed (always/often/seldom) at runtime
 # * libauthen-sasl-perl needed for secure Managesieve connections
 depends = adduser
@@ -88,7 +85,7 @@ CDBS_SUGGESTS_$(pkg) = $(suggests)
 CDBS_BUILD_DEPENDS +=, libimage-exiftool-perl, libregexp-assemble-perl
 CDBS_BUILD_DEPENDS +=, libipc-system-simple-perl, lcdf-typetools
 local_inspection_regex = png|jpg|jpeg|gif|ttf|otf
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^((.*/)?[^/]+\.($(local_inspection_regex)|ico|mo)|debian/(changelog|copyright(|_hints|_newhints)))$$
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^((.*/)?[^/]+\.($(local_inspection_regex)|ico)|debian/(changelog|copyright(|_hints|_newhints)))$$
 debian/stamp-copyright-check: debian/stamp-extract-copyright
 debian/stamp-extract-copyright:
 	find * -type f -regextype posix-extended \
@@ -107,38 +104,8 @@ DEB_INSTALL_EXAMPLES_$(pkg) = ciderwebmail.yml script/update_schema.sh
 # Avoid virtually empty TODO file
 DEB_INSTALL_DOCS_ALL := $(filter-out TODO,$(DEB_INSTALL_DOCS_ALL))
 
-# put aside upstream-shipped temp files during build
-# TODO: just use DEB_UPSTREAM_CRUFT_MOVE when cdbs 0.4.106 is in stable
-upstreamtmpfiles = $(foreach lang,de en,root/templates/$(lang) root/locale/$(lang)/LC_MESSAGES/CiderWebmail.mo)
-pre-build:: debian/stamp-upstream-cruft
-debian/stamp-upstream-cruft: debian/stamp-copyright-check
-	mkdir -p debian/upstream-cruft
-	@for orig in $(upstreamtmpfiles); do \
-		backup="debian/upstream-cruft/$$orig"; \
-		[ ! -e "$$orig" ] || [ -e "$$backup" ] || { \
-			mkdir -p "$$(dirname "$$backup")"; \
-			echo mv "$$orig" "$$backup"; \
-			mv "$$orig" "$$backup"; \
-		}; \
-	done
-	touch $@
-cleanbuilddir::
-	@for orig in $(upstreamtmpfiles); do \
-		backup="debian/upstream-cruft/$$orig"; \
-		if [ -e "$$backup" ]; then \
-			if [ -e "$$orig" ]; then \
-				echo "rm -rf" "$$orig"; \
-				rm -rf "$$orig"; \
-			fi; \
-			echo mv "$$backup" "$$orig"; \
-			mv "$$backup" "$$orig"; \
-		fi; \
-	done
-	rm -rf debian/upstream-cruft
-clean::
-	rm -f debian/stamp-upstream-cruft
-
 # (Re)generate localized templates
+CDBS_BUILD_DEPENDS +=, gettext
 langs := $(shell \
 	find root/locale -mindepth 1 -maxdepth 1 -type d -printf '%f\n')
 configure/$(pkg):: debian/stamp-mktemplates
@@ -150,6 +117,7 @@ debian/stamp-mktemplates: pre-build
 	cd root/templates && perl ./template.pl
 	touch $@
 clean::
+	find root/locale -type f -name '*.mo' -delete
 	rm -f debian/stamp-mktemplates
 
 # Install config files

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ciderwebmail.git