[Python-modules-commits] r17062 - in packages/python-djvulibre/trunk/debian (4 files)

[danstender-guest at users.alioth.debian.org]

    Date: Friday, May 20, 2011 @ 09:51:37
  Author: danstender-guest
Revision: 17062

modified debian/rules and control for building of html docs and buildtime locales

Modified:
  packages/python-djvulibre/trunk/debian/changelog
  packages/python-djvulibre/trunk/debian/control
  packages/python-djvulibre/trunk/debian/python-djvu-doc.docs
  packages/python-djvulibre/trunk/debian/rules

Modified: packages/python-djvulibre/trunk/debian/changelog
===================================================================
--- packages/python-djvulibre/trunk/debian/changelog	2011-05-20 01:13:57 UTC (rev 17061)
+++ packages/python-djvulibre/trunk/debian/changelog	2011-05-20 09:51:37 UTC (rev 17062)
@@ -5,8 +5,11 @@
   * Fixes FTBFS with Python 2.7 (Closes: #606681).
   * Removed all patches disable-memory-test.diff, max-cachesize-64bit.diff
     (fixed with 0.3.0), setup-disable-auto-cython.diff (#541314 closed).
+  * debian/rules:
+    + modified building of html docs for python-djvu-doc
+    + added buildtime creation of locales
 
- -- Daniel Stender <daniel at danielstender.com>  Fri, 29 Apr 2011 10:11:11 +0200
+ -- Daniel Stender <daniel at danielstender.com>  Fri, 20 May 2011 11:29:34 +0200
 
 python-djvulibre (0.1.18-2) unstable; urgency=low
 

Modified: packages/python-djvulibre/trunk/debian/control
===================================================================
--- packages/python-djvulibre/trunk/debian/control	2011-05-20 01:13:57 UTC (rev 17061)
+++ packages/python-djvulibre/trunk/debian/control	2011-05-20 09:51:37 UTC (rev 17062)
@@ -10,7 +10,7 @@
  djvulibre-bin,
  ghostscript,
  libdjvulibre-dev,
- locales-all,
+ locales,
  pkg-config,
  python-all-dbg,
  python-all-dev,

Modified: packages/python-djvulibre/trunk/debian/python-djvu-doc.docs
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu-doc.docs	2011-05-20 01:13:57 UTC (rev 17061)
+++ packages/python-djvulibre/trunk/debian/python-djvu-doc.docs	2011-05-20 09:51:37 UTC (rev 17062)
@@ -1,2 +1,2 @@
 doc/changelog
-doc/build/html/
+build/sphinx/html/

Modified: packages/python-djvulibre/trunk/debian/rules
===================================================================
--- packages/python-djvulibre/trunk/debian/rules	2011-05-20 01:13:57 UTC (rev 17061)
+++ packages/python-djvulibre/trunk/debian/rules	2011-05-20 09:51:37 UTC (rev 17062)
@@ -12,10 +12,8 @@
 .PHONY: override_dh_installdocs
 ifneq ($(shell dh_listpackages | grep -x -F python-djvu-doc),)
 override_dh_installdocs:
-	$(MAKE) -C doc/ html PYTHONPATH=$(call pythonpath,$(shell pyversions -d)):$(CURDIR)
-	touch $(@)
+	python setup.py build_sphinx
 endif
-override_dh_installdocs:
 	dh_installdocs -X.buildinfo -Xobjects.inv
 
 .PHONY: override_dh_auto_clean
@@ -35,6 +33,9 @@
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+	mkdir -p debian/tmp/locale/
+	localedef -f UTF-8 -i ja_JP ./debian/tmp/locale/ja_JP.UTF-8/
+	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
 	cd tests && \
 	set -x -e; \
 	for python in $(shell pyversions -r); do \