[Python-modules-commits] r23106 - in packages/sphinx/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, November 29, 2012 @ 13:20:50
  Author: jwilk
Revision: 23106

Rebuild MO files from source.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/rules
  packages/sphinx/trunk/debian/source/options

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-11-28 21:53:40 UTC (rev 23105)
+++ packages/sphinx/trunk/debian/changelog	2012-11-29 13:20:50 UTC (rev 23106)
@@ -4,12 +4,15 @@
   * DEP-8 tests: remove “Features: no-build-needed”; it's the default now.
   * Bump standards version to 3.9.4; no changes needed.
   * Pass -a to xvfb-run, so that it tries to get a free server number.
+  * Rebuild MO files from source.
+    + Update debian/rules.
+    + Add the rebuilt files to extend-diff-ignore.
 
   [ Dmitry Shachnev ]
   * debian/patches/l10n_fixes.diff: fix crashes and not working external
     links in l10n mode (closes: #691719).
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 28 Nov 2012 19:17:25 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 29 Nov 2012 13:44:06 +0100
 
 sphinx (1.1.3+dfsg-5) experimental; urgency=low
 

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2012-11-28 21:53:40 UTC (rev 23105)
+++ packages/sphinx/trunk/debian/rules	2012-11-29 13:20:50 UTC (rev 23106)
@@ -22,6 +22,10 @@
 python_all = pyversions -r | tr ' ' '\n' | xargs -t -I {} env {}
 python3_all = py3versions -r | tr ' ' '\n' | xargs -t -I {} env {}
 
+ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
+msgfmt_options = -c
+endif
+
 build-arch:
 
 build-indep build: build-stamp
@@ -36,8 +40,9 @@
 	python ./sphinx-build.py -b man doc build/man
 	python setup.py build --build-lib build/py2/
 	python3 setup.py build --build-lib build/py3/
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	find sphinx/locale/ -name '*.po' | xargs -t -I {} msgfmt -o /dev/null -c {}
+	find sphinx/locale/ -name '*.po' | sed -e 's/[.]po$$//' \
+	| xargs -t -I {} msgfmt $(msgfmt_options) {}.po -o {}.mo
+ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
 	$(python_all) tests/run.py --verbose --no-skip
 	$(python3_all) tests/run.py --verbose
 	cd build/py3/ && rm -rf tests/ sphinx/pycode/Grammar.pickle

Modified: packages/sphinx/trunk/debian/source/options
===================================================================
--- packages/sphinx/trunk/debian/source/options	2012-11-28 21:53:40 UTC (rev 23105)
+++ packages/sphinx/trunk/debian/source/options	2012-11-29 13:20:50 UTC (rev 23106)
@@ -1 +1,2 @@
 extend-diff-ignore = "^[^/]*[.]egg-info/"
+extend-diff-ignore = "^sphinx/locale/[^/]+/LC_MESSAGES/sphinx[.]mo$"