[debian-edu-commits] debian-edu/italc.git (#106) - master (branch) updated: debian/1_2.0.0-3-8-g0296011

[Mike Gabriel]

The branch, master has been updated
       via  0296011183502780019481c83e41116016d6b756 (commit)
      from  78512f596ab40fa9c7647668a1e6f8318e83414f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0296011183502780019481c83e41116016d6b756
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 12 01:45:00 2013 +0200

    Make sure .qm files shipped by upstream get moved out of the way before build and get restored properly during clean up.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 ++
 debian/rules     |    7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6609bd0..e71f813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ italc (1:2.0.0-4) UNRELEASED; urgency=low
   * /debian/rules:
     + Now really fix the .ts file update and trigger the .qm build after
       configure of libitalccore.
+    + Make sure .qm files shipped by upstream get moved out of the way before
+      build and get restored properly during clean up.
   * Update documentation file: README.setup.
 
  -- Mike Gabriel <sunweaver at debian.org>  Sun, 11 Aug 2013 03:20:31 +0200
diff --git a/debian/rules b/debian/rules
index 313254c..d12e436 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,10 @@ DEB_DH_SHLIBDEPS_ARGS_libitalccore = -L libItalcCore -l debian/libitalccore/usr/
 debian/italc.xpm: ima/data/italc.png
 	convert -resize 32 $< $@
 
+makebuilddir/libitalccore::
+	test -d debian/qm.bak/ || ( mkdir -p debian/qm.bak/; find lib/resources/ -name *.qm | while read qm; do cp -av $$qm debian/qm.bak/; done; )
+
 configure/libitalccore::
-	find lib/resources/ -name *.qm | while read qm; do mv $$qm $$qm.bak; done
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) finalize-locales
 
 common-install-arch:: debian/italc.xpm
@@ -32,7 +34,8 @@ common-install-arch:: debian/italc.xpm
 	ln -s ../xdg/iTALC\ Solutions/iTALC.conf debian/italc-client/etc/italc/italc.conf
 
 clean::
-	find lib/resources/ -name *.qm.bak | while read qm; do mv $$qm $$(echo $$qm | sed 's/.bak//'); done
+	find debian/qm.bak/*.qm | while read qm; do cp -av $$qm lib/resources/; done
+	rm -Rf debian/qm.bak/
 	rm -f debian/italc.xpm
 	rm -f lupus/config.log
 	rm -f lupus/config.status


hooks/post-receive
-- 
italc.git (Debian package italc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "italc.git" (Debian package italc).