[Python-modules-commits] [python-django] 06/08: Clean up rules since we can use the pristine docs directory, now that they refer to django-admin and not django-admin.py

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/experimental
in repository python-django.

commit 82270e9d353db7a133cd6d33bbdfc6048a4d137f
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed May 20 10:18:32 2015 +0200

    Clean up rules since we can use the pristine docs directory, now that they refer to django-admin and not django-admin.py
---
 debian/changelog              |  2 ++
 debian/python-django-doc.docs |  2 +-
 debian/rules                  | 12 ++----------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5f9b9b..7dd31b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ python-django (1.8.1-1) UNRELEASED; urgency=medium
     https://docs.djangoproject.com/en/1.8/releases/1.8.1/
   * Refresh all patches.
   * Drop 03_manpage.diff, merged upstream.
+  * Clean up rules since we can use the pristine docs directory, now
+    that they refer to django-admin and not django-admin.py
 
  -- Raphaël Hertzog <hertzog at debian.org>  Wed, 20 May 2015 09:54:47 +0200
 
diff --git a/debian/python-django-doc.docs b/debian/python-django-doc.docs
index c9b0845..4ecc793 100644
--- a/debian/python-django-doc.docs
+++ b/debian/python-django-doc.docs
@@ -1 +1 @@
-docs.debian/_build/html
+docs/_build/html
diff --git a/debian/rules b/debian/rules
index 01033c1..730d58d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,20 +10,12 @@ PREFIXC = debian/python-django-common
 	dh $@ --with sphinxdoc,python2,python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
-	rm -rf docs.debian
-	find -name "*.DS_Store" -delete
-	chmod a-x django/contrib/gis/tests/data/texas.dbf
 	dh_auto_clean
+	make -C docs clean
 
 override_dh_auto_build:
 	dh_auto_build
-	
-	# Build the HTML documentation.
-	# We programmatically replace most instances of django-admin.py with
-	# django-admin and remove the source files from the target _build.
-	cp -r docs docs.debian
-	find docs.debian -type f -print0 | xargs -0r perl -pi -e 's|(?<!/)(django-admin)\.py|$$1|'
-	make -C docs.debian html
+	make -C docs html
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git