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

[jwilk at users.alioth.debian.org]

    Date: Monday, April 8, 2013 @ 12:02:22
  Author: jwilk
Revision: 23878

Refactor debian/rules.

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

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2013-04-08 10:49:30 UTC (rev 23877)
+++ packages/sphinx/trunk/debian/changelog	2013-04-08 12:02:22 UTC (rev 23878)
@@ -13,8 +13,9 @@
     + Update debian/copyright.
   * Make it impossible to accidentally build the source package with an
     .orig.tar that includes jquery.js or underscore.js.
+  * Refactor debian/rules.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 08 Apr 2013 12:35:50 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 08 Apr 2013 14:02:09 +0200
 
 sphinx (1.1.3+dfsg-7) experimental; urgency=low
 

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2013-04-08 10:49:30 UTC (rev 23877)
+++ packages/sphinx/trunk/debian/rules	2013-04-08 12:02:22 UTC (rev 23878)
@@ -26,9 +26,15 @@
 msgfmt_options = -c
 endif
 
-build-arch:
+.PHONY: clean
+clean:
+	dh_clean 
+	find . -name '*.py[co]' -delete
+	rm -rf build
+	rm -f $(basename $(wildcard debian/*.in))
 
-build-indep build: build-stamp
+.PHONY: build build-arch build-indep
+build build-indep: build-stamp
 
 sphinx/themes/basic/static/%.js:
 	ln -sf /usr/share/javascript/$(*)/$(*).js $(@)
@@ -38,8 +44,7 @@
 	mkdir -p $(dir $@)
 	touch $(@)
 
-build-stamp: build/javascript-stamp
-	dh_testdir
+build-stamp: sphinx-build.py build/javascript-stamp
 	python ./sphinx-build.py doc build/html/
 	rm -rf build/man
 	cp -rl build/html build/man
@@ -56,15 +61,8 @@
 endif
 	touch build-stamp
 
-clean:
-	dh_testdir
-	find . -name '*.py[co]' -delete
-	rm -rf build
-	rm -f $(basename $(wildcard debian/*.in))
-	dh_clean 
-
-install: build
-	dh_testdir
+.PHONY: install
+install: build-stamp
 	dh_testroot
 	dh_installdirs
 	python setup.py \
@@ -131,10 +129,9 @@
 		mv $$js debian/libjs-sphinxdoc/$(javascript_path); \
 		ln -sf "$(javascript_path)/$${js##*/}" $$js; \
 	done
-	cd debian/dh-sphinxdoc/ && pod2man -c Debhelper -r '' dh_sphinxdoc dh_sphinxdoc.1
 
-binary-indep: build install
-	dh_testdir
+.PHONY: binary binary-arch binary-indep
+binary binary-indep: install
 	dh_testroot
 	dh_installchangelogs CHANGES
 	dh_installdocs
@@ -143,6 +140,7 @@
 	dh_lintian
 	./debian/dh-sphinxdoc/dh_sphinxdoc -p sphinx-doc /usr/share/doc/sphinx-doc/html/
 	dh_installexamples
+	cd debian/dh-sphinxdoc/ && pod2man -c Debhelper -r '' dh_sphinxdoc dh_sphinxdoc.1
 ifneq ($(shell grep -h '^[.]TH' debian/*.1 | cut -d ' ' -f 6-7 | sort -u), "Sphinx $(upstream_version)")
 	$(warning W: version numbers in the manual pages are out of date)
 endif
@@ -157,11 +155,8 @@
 	dh_md5sums
 	dh_builddeb
 
-binary-arch:
-
-binary: binary-indep binary-arch
-
+.PHONY: get-orig-source
 get-orig-source:
 	sh $(here)/debian/get-orig-source.sh $(upstream_dfsg_version)
 
-.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install get-orig-source
+# vim:ts=4 sw=4 noet