[Python-modules-commits] [python-django] 01/01: Fix rules file to no longer mess with *_templates directories

[Raphaël Hertzog]

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

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

commit a48d54501b7662e40e32199eb36aab54bf05687c
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Mon Mar 7 12:06:35 2016 +0100

    Fix rules file to no longer mess with *_templates directories
    
    They no longer contain invalid .py files but only *-tpl template files
    that are instanciated at runtime.
---
 debian/changelog | 6 ++++++
 debian/rules     | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72db2ca..95abd01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 python-django (1.9.4-1) unstable; urgency=high
 
+  [ Luke Faraone ]
   * New upstream security release:
     https://www.djangoproject.com/weblog/2016/mar/01/security-releases/ 
     - CVE-2016-2512: Malicious redirect and possible XSS via user-supplied
@@ -8,6 +9,11 @@ python-django (1.9.4-1) unstable; urgency=high
       hasher work factor upgrade
       Closes: #816434
 
+  [ Raphaël Hertzog ]
+  * Fix rules file to no longer mess with *_templates directories. They no
+    longer contain invalid .py files but only *-tpl template files that are
+    instanciated at runtime.
+
  -- Luke Faraone <lfaraone at debian.org>  Sat, 05 Mar 2016 20:13:13 +0000
 
 python-django (1.9.2-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 0c1982d..8c92551 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,7 @@ override_dh_install:
 
 override_dh_python3:
 	dh_python3
-	find debian/python3-django/usr/lib/python3/dist-packages/ \
-		\( -type f -not -name '*.py' \) -o \( -type d -path '*/django/conf/*_template' \) | \
+	find debian/python3-django/usr/lib/python3/dist-packages/ -type f -not -name '*.py' | \
 	(while read file; do \
 		relname=$${file##debian/python3-django/usr/lib/python3/dist-packages/}; \
 		reldirname=$$(dirname $$relname); \
@@ -74,10 +73,10 @@ override_dh_python3:
 		mv $$file debian/python-django-common/usr/share/python-django-common/$$reldirname/; \
 		ln -sf /usr/share/python-django-common/$$relname $$file; \
 		if test -e debian/python-django/usr/share/pyshared/$$relname; then \
-		    rm -rf debian/python-django/usr/share/pyshared/$$relname; \
+		    rm debian/python-django/usr/share/pyshared/$$relname; \
 		    ln -sf /usr/share/python-django-common/$$relname debian/python-django/usr/share/pyshared/$$relname; \
 		else \
-		    rm -rf debian/python-django/usr/lib/python2.7/dist-packages/$$relname; \
+		    rm debian/python-django/usr/lib/python2.7/dist-packages/$$relname; \
 		    ln -sf /usr/share/python-django-common/$$relname debian/python-django/usr/lib/python2.7/dist-packages/$$relname; \
 		fi \
 	done)

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