[Python-modules-commits] r14444 - in packages/python-django/trunk/debian (3 files)

[hertzog at users.alioth.debian.org]

    Date: Saturday, September 18, 2010 @ 17:32:18
  Author: hertzog
Revision: 14444

* New upstream release. Closes: #596893 LP: #636482
  the regressions caused by 1.2.2 release. Closes: #596205
* Update Standards-Version to 3.9.1.
* Drop "--with quilt" and quilt build-dependency since the package is
  already using source format "3.0 (quilt)".

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/control
  packages/python-django/trunk/debian/rules

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2010-09-18 06:28:45 UTC (rev 14443)
+++ packages/python-django/trunk/debian/changelog	2010-09-18 17:32:18 UTC (rev 14444)
@@ -1,8 +1,9 @@
 python-django (1.2.3-1) UNRELEASED; urgency=low
 
-  * New upstream release. (LP: #636482)
+  [ Krzysztof Klimonda ]
+  * New upstream release. Closes: #596893 LP: #636482
   * Fixes both a XSS vulnerability introduced in 1.2 series and
-    the regressions caused by 1.2.2 release.
+    the regressions caused by 1.2.2 release. Closes: #596205
   * debian/control:
     - depend on language packs for en_US.utf8 locales required for unit tests.
   * debian/rules:
@@ -13,6 +14,11 @@
       06_fix_regression_tests.diff backported from 1.2.x branch to fix
       test suite failures.
 
+  [ Raphaël Hertzog ]
+  * Update Standards-Version to 3.9.1.
+  * Drop "--with quilt" and quilt build-dependency since the package is
+    already using source format "3.0 (quilt)".
+
  -- Krzysztof Klimonda <kklimonda at syntaxhighlighted.com>  Sun, 12 Sep 2010 18:10:01 +0200
 
 python-django (1.2.1-1) unstable; urgency=low

Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control	2010-09-18 06:28:45 UTC (rev 14443)
+++ packages/python-django/trunk/debian/control	2010-09-18 17:32:18 UTC (rev 14444)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Chris Lamb <lamby at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Raphaël Hertzog <hertzog at debian.org>
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7.0.50), python-support, quilt (>= 0.46-7~), python (>= 2.5) | python-sqlite, locales-all | language-pack-en-base
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50), python-support, python (>= 2.5) | python-sqlite, locales-all | language-pack-en-base
 Build-Depends-Indep: python-sphinx, libjs-jquery
 Homepage: http://www.djangoproject.com/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django/trunk/

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2010-09-18 06:28:45 UTC (rev 14443)
+++ packages/python-django/trunk/debian/rules	2010-09-18 17:32:18 UTC (rev 14444)
@@ -5,8 +5,12 @@
 PREFIX = debian/python-django
 DJANGO_DIR = $(PREFIX)/$(call py_libdir_sh,`pyversions -d`)/django
 
+# FIXME: if the build is run while non-default python version are
+# available, the build process will install files in
+# /usr/lib/pyshared/pythonX.Y while we don't need them
+
 %:
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_clean:
 	rm -rf docs.debian tests/__init__.py
@@ -38,6 +42,9 @@
 	# Move scripts to /usr/lib/python-django
 	mkdir -p $(PREFIX)/usr/lib/python-django
 	mv $(DJANGO_DIR)/bin $(PREFIX)/usr/lib/python-django
+
+	# Move conf template to shared directory
+	#mv $(DJANGO_DIR)/conf $(PREFIX)/usr/lib/python-django
 	
 	# Fix permissions
 	chmod 644 $(PREFIX)/etc/bash_completion.d/django_bash_completion