[Python-modules-commits] r32007 - in packages/sphinx/trunk/debian (changelog rules)

[mitya57 at users.alioth.debian.org]

    Date: Thursday, March 12, 2015 @ 09:02:03
  Author: mitya57
Revision: 32007

* Simplify debian/rules:
  - Adjust for using upstream tarballs.
  - Do not mention site-packages anymore.

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

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2015-03-12 08:58:04 UTC (rev 32006)
+++ packages/sphinx/trunk/debian/changelog	2015-03-12 09:02:03 UTC (rev 32007)
@@ -16,6 +16,9 @@
   * Use upstream tarball, which now contains non-minified versions of
     jquery.js and underscore.js.
   * Update debian/watch to use pypi.debian.net redirector.
+  * Simplify debian/rules:
+    - Adjust for using upstream tarballs.
+    - Do not mention site-packages anymore.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 01 Mar 2015 15:25:27 +0300
 

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2015-03-12 08:58:04 UTC (rev 32006)
+++ packages/sphinx/trunk/debian/rules	2015-03-12 09:02:03 UTC (rev 32007)
@@ -10,15 +10,14 @@
 
 here = $(dir $(firstword $(MAKEFILE_LIST)))/..
 debian_version = $(word 2,$(shell cd $(here) && dpkg-parsechangelog | grep ^Version:))
-upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
-upstream_version = $(subst ~,,$(firstword $(subst +, ,$(debian_version))))
+upstream_version = $(subst ~,,$(firstword $(subst -, ,$(debian_version))))
 
 locales = $(notdir $(patsubst %/LC_MESSAGES,%,$(wildcard sphinx/locale/*/LC_MESSAGES)))
 scripts = $(basename $(wildcard sphinx-*.py))
 
 debroot = debian/tmp/
-site_packages = $(call py_libdir,$(shell pyversions -d))
-py3_site_packages = $(call py_libdir,$(shell py3versions -d))
+py2_libdir = $(call py_libdir,$(shell pyversions -d))
+py3_libdir = $(call py_libdir,$(shell py3versions -d))
 javascript_path = /usr/share/javascript/sphinxdoc/1.0/
 
 python_all = pyversions -r | tr ' ' '\n' | xargs -t -I {} env {}
@@ -78,36 +77,36 @@
 		build --build-lib build/py3/ \
 		install --no-compile --install-layout=deb --root $(debroot)
 	rm $(debroot)/usr/lib/python*/*-packages/Sphinx-*.egg-info/SOURCES.txt
-	# move static files outside {site,dist}-packages
+	# move static files outside dist-packages
 	sed -i -e "s!^package_dir = .*!package_dir = '/usr/share/sphinx'!" \
-		$(debroot)$(site_packages)/sphinx/__init__.py \
-		$(debroot)$(py3_site_packages)/sphinx/__init__.py
+		$(debroot)$(py2_libdir)/sphinx/__init__.py \
+		$(debroot)$(py3_libdir)/sphinx/__init__.py
 	rm -rf $(debroot)/usr/share/sphinx/
 	mkdir -p $(debroot)/usr/share/sphinx/
 	cd $(debroot) && mv -t usr/share/sphinx/ \
-		.$(site_packages)/sphinx/texinputs \
-		.$(site_packages)/sphinx/themes
+		.$(py2_libdir)/sphinx/texinputs \
+		.$(py2_libdir)/sphinx/themes
 	mkdir -p $(debroot)/usr/share/sphinx/pycode/
 	cd $(debroot) && mv -t usr/share/sphinx/pycode/ \
-		.$(site_packages)/sphinx/pycode/Grammar*
+		.$(py2_libdir)/sphinx/pycode/Grammar*
 	cd $(debroot) && mv -t usr/share/sphinx/pycode/ \
-		.$(py3_site_packages)/sphinx/pycode/Grammar*
+		.$(py3_libdir)/sphinx/pycode/Grammar*
 	mkdir -p $(debroot)/usr/share/sphinx/ext/autosummary/
 	cd $(debroot) && mv -t usr/share/sphinx/ext/autosummary/ \
-		.$(site_packages)/sphinx/ext/autosummary/templates
-	cd $(debroot)$(py3_site_packages)/sphinx/ && \
+		.$(py2_libdir)/sphinx/ext/autosummary/templates
+	cd $(debroot)$(py3_libdir)/sphinx/ && \
 		rm -rf texinputs/ themes/ ext/autosummary/templates/
 	set -e -x; \
 	cd $(debroot) && \
 		for lang in $(locales); \
 		do \
-			install -m 644 -D .$(site_packages)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.js \
+			install -m 644 -D .$(py2_libdir)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.js \
 				usr/share/sphinx/locale/$$lang/sphinx.js; \
-			install -m 644 -D .$(site_packages)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.mo \
+			install -m 644 -D .$(py2_libdir)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.mo \
 				usr/share/locale/$$lang/LC_MESSAGES/sphinx.mo; \
 		done
-	cd $(debroot)$(site_packages)/sphinx/locale && rm -rf sphinx.pot */
-	cd $(debroot)$(py3_site_packages)/sphinx/locale && rm -rf sphinx.pot */
+	cd $(debroot)$(py2_libdir)/sphinx/locale && rm -rf sphinx.pot */
+	cd $(debroot)$(py3_libdir)/sphinx/locale && rm -rf sphinx.pot */
 	# install scripts not touched by easy install
 	set -e -x; \
 	for python in python2 python3; do \