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

[lamby at users.alioth.debian.org]

    Date: Sunday, March 8, 2009 @ 06:07:30
  Author: lamby
Revision: 7816

Move to debhelper-based packaging for operational clarity (Closes: #517052)

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/compat
  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	2009-03-08 06:07:27 UTC (rev 7815)
+++ packages/python-django/trunk/debian/changelog	2009-03-08 06:07:30 UTC (rev 7816)
@@ -1,7 +1,9 @@
 python-django (1.0.2-2) UNRELEASED; urgency=low
 
+  * Move to debhelper-based packaging for operational clarity:
+    - Don't rely on the internal layout of python-support (Closes: #517052)
+    - Bump Build-Depends on debhelper to 7.0.50 for override_*.
   * Just Build-Depend on `python', not `python-dev'.
-  * Move to debhelper 7.
   * Drop versions on Build-Depends where they are satisfied in current
     oldstable (ie. etch).
   * Remove repeated 'Priority' line in binary package stanza.

Modified: packages/python-django/trunk/debian/compat
===================================================================
--- packages/python-django/trunk/debian/compat	2009-03-08 06:07:27 UTC (rev 7815)
+++ packages/python-django/trunk/debian/compat	2009-03-08 06:07:30 UTC (rev 7816)
@@ -1 +1 @@
-5
+7

Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control	2009-03-08 06:07:27 UTC (rev 7815)
+++ packages/python-django/trunk/debian/control	2009-03-08 06:07:30 UTC (rev 7816)
@@ -4,7 +4,7 @@
 Maintainer: Brett Parker <iDunno at sommitrealweird.co.uk>
 Uploaders: Raphael Hertzog <hertzog at debian.org>, Gustavo Noronha Silva <kov at debian.org>, David Spreen <netzwurm at debian.org>, Chris Lamb <lamby at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7), python-dev, cdbs, python-setuptools, python-support, quilt
+Build-Depends: debhelper (>= 7.0.50), python-support, quilt
 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	2009-03-08 06:07:27 UTC (rev 7815)
+++ packages/python-django/trunk/debian/rules	2009-03-08 06:07:30 UTC (rev 7816)
@@ -1,38 +1,47 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pysupport
-DEB_PYTHON_MODULE_PACKAGE = python-django
-DEB_DH_COMPRESS_ARGS = -X.js
+include /usr/share/quilt/quilt.make
 
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+PREFIX = debian/python-django
+DJANGO_DIR = $(PREFIX)/usr/lib/`pyversions -d`/site-packages/django
 
-build/python-django::
-	# Build HTML documentation, drop copy of source files
-	cd docs && make html
+%:
+	dh $@
+
+build: $(QUILT_STAMPFN)
+	dh $@
+
+clean: unpatch
+	rm -rf docs/_build/*
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build
+	# Build HTML documentation, drop source files
+	make -C docs html
 	rm -rf docs/_build/html/_sources/
 
-binary-post-install/python-django::
-	# Use default python shebang
-	perl -pi -e 's|^#!/usr/bin/env python.*$$|#!/usr/bin/python|' debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py
-	# Ensure executability of some scripts that are copied to projects
-	# (or used within projects)
-	chmod 755 debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py
-	find debian/python-django/usr/share/python-support/python-django/django/bin/ \
-		-name '*.py' -not -name '__init__.py' -print0 | xargs -0r chmod 755
-	# Remove execute rights from stuff that shouldn't have them
-	chmod 644 debian/python-django/etc/bash_completion.d/django_bash_completion
-	# Create convenience symlink
-	mkdir -p debian/python-django/usr/lib/python-django
-	dh_link usr/share/python-support/python-django/django/bin usr/lib/python-django/bin 
+override_dh_install:
+	dh_install
+	
+	# Use default shebang
+	perl -pi -e 's|^#!/usr/bin/env python.*|#!/usr/bin/python|' $(DJANGO_DIR)/conf/project_template/manage.py
+	
+	# Move scripts to /usr/lib/python-django
+	mkdir -p $(PREFIX)/usr/lib/python-django
+	mv $(DJANGO_DIR)/bin $(PREFIX)/usr/lib/python-django
+	
+	# Fix permissions
+	chmod 644 $(PREFIX)/etc/bash_completion.d/django_bash_completion
+	find $(PREFIX)/usr/lib/python-django/bin/ -name '*.py' -not -name '__init__.py' -print0 | xargs -0r chmod 755
+	
 	# Rename django-admin.py to django-admin
-	mv debian/python-django/usr/bin/django-admin.py debian/python-django/usr/bin/django-admin
-	# Remove convenience copy of libjs-jquery and replace with symlink
-	cd debian/python-django/usr/share/doc/python-django/html/_static\
-		&& rm -f jquery.js\
+	mv $(PREFIX)/usr/bin/django-admin.py $(PREFIX)/usr/bin/django-admin
+	
+	# Remove embedded copy of libjs-jquery
+	cd $(PREFIX)/usr/share/doc/python-django/html/_static \
+		&& rm jquery.js \
 		&& ln -s ../../../../javascript/jquery/jquery.js .
 
-clean::
-	rm -rf docs/_build/*
+override_dh_compress:
+	dh_compress -X.js