[Python-modules-commits] r7989 - in packages/python-django/branches/experimental/debian (12 files)

lamby at users.alioth.debian.org lamby at users.alioth.debian.org
Tue Mar 24 23:14:06 UTC 2009 

    Date: Tuesday, March 24, 2009 @ 23:14:05
  Author: lamby
Revision: 7989

Merge changes from unstable branch.

Added:
  packages/python-django/branches/experimental/debian/patches/series
  packages/python-django/branches/experimental/debian/python-django-doc.doc-base
  packages/python-django/branches/experimental/debian/python-django-doc.docs
  packages/python-django/branches/experimental/debian/python-django-doc.examples
    (from rev 7988, packages/python-django/branches/experimental/debian/python-django.examples)
Modified:
  packages/python-django/branches/experimental/debian/changelog
  packages/python-django/branches/experimental/debian/control
  packages/python-django/branches/experimental/debian/patches/03_manpage.diff
  packages/python-django/branches/experimental/debian/patches/04_hyphen-manpage.diff
  packages/python-django/branches/experimental/debian/python-django.install
  packages/python-django/branches/experimental/debian/rules
Deleted:
  packages/python-django/branches/experimental/debian/python-django.doc-base
  packages/python-django/branches/experimental/debian/python-django.examples

Modified: packages/python-django/branches/experimental/debian/changelog
===================================================================
--- packages/python-django/branches/experimental/debian/changelog	2009-03-24 23:14:04 UTC (rev 7988)
+++ packages/python-django/branches/experimental/debian/changelog	2009-03-24 23:14:05 UTC (rev 7989)
@@ -1,6 +1,8 @@
 python-django (1.1~beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Merge all changes from unstable branch:
+    - Split documentation into new python-django-doc binary package.
 
  -- Chris Lamb <lamby at debian.org>  Tue, 24 Mar 2009 23:04:55 +0000
 

Modified: packages/python-django/branches/experimental/debian/control
===================================================================
--- packages/python-django/branches/experimental/debian/control	2009-03-24 23:14:04 UTC (rev 7988)
+++ packages/python-django/branches/experimental/debian/control	2009-03-24 23:14:05 UTC (rev 7989)
@@ -3,8 +3,8 @@
 Priority: optional
 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, cdbs, python-setuptools, python-support
+Standards-Version: 3.8.1
+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/
@@ -13,8 +13,7 @@
 Package: python-django
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Recommends: libjs-jquery
-Suggests: python-psycopg2, python-psycopg, python-mysqldb, python-flup
+Suggests: python-psycopg2, python-psycopg, python-mysqldb, python-flup, python-sqlite
 Description: High-level Python web development framework
  Django is a high-level web application framework that loosely follows the
  model-view-controller design pattern.
@@ -36,3 +35,22 @@
   * Lightweight, standalone web server for development and testing
   * Internationalization support
   * Testing framework and client
+
+Package: python-django-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: libjs-jquery
+Description: High-level Python web development framework (documentation)
+ Django is a high-level web application framework that loosely follows the
+ model-view-controller design pattern.
+ .
+ Python's equivalent to Ruby on Rails, Django lets you build complex
+ data-driven websites quickly and easily - Django focuses on automating as much
+ as possible and adhering to the "Don't Repeat Yourself" (DRY) principle.
+ .
+ Django additionally emphasizes reusability and "pluggability" of components;
+ many generic third-party "applications" are available to enhance projects or
+ to simply to reduce development time even further.
+ .
+ This package contains the HTML documentation and example projects.

Modified: packages/python-django/branches/experimental/debian/patches/03_manpage.diff
===================================================================
--- packages/python-django/branches/experimental/debian/patches/03_manpage.diff	2009-03-24 23:14:04 UTC (rev 7988)
+++ packages/python-django/branches/experimental/debian/patches/03_manpage.diff	2009-03-24 23:14:05 UTC (rev 7989)
@@ -6,8 +6,8 @@
  .
  This is a Debian specific patch.
 
---- docs/man/django-admin.1.orig	2007-09-08 10:47:27.516890257 +0100
-+++ docs/man/django-admin.1	2007-09-08 10:48:01.822845242 +0100
+--- a/docs/man/django-admin.1	2007-09-08 10:47:27.516890257 +0100
++++ b/docs/man/django-admin.1	2007-09-08 10:48:01.822845242 +0100
 @@ -1,9 +1,9 @@
 -.TH "django-admin.py" "1" "March 2008" "Django Project" ""
 +.TH "django-admin" "1" "March 2008" "Django Project" ""

Modified: packages/python-django/branches/experimental/debian/patches/04_hyphen-manpage.diff
===================================================================
--- packages/python-django/branches/experimental/debian/patches/04_hyphen-manpage.diff	2009-03-24 23:14:04 UTC (rev 7988)
+++ packages/python-django/branches/experimental/debian/patches/04_hyphen-manpage.diff	2009-03-24 23:14:05 UTC (rev 7989)
@@ -4,8 +4,8 @@
  Fix a lintian I: message about improper usage of minus instead
  of hyphen.
 
---- docs/man/django-admin.1.orig	2008-09-04 08:51:48.000000000 +0200
-+++ docs/man/django-admin.1	2008-09-04 08:52:47.000000000 +0200
+--- a/docs/man/django-admin.1	2008-09-04 08:51:48.000000000 +0200
++++ b/docs/man/django-admin.1	2008-09-04 08:52:47.000000000 +0200
 @@ -153,7 +153,7 @@
  .TP
  .I \-e, \-\-extension=EXTENSION

Added: packages/python-django/branches/experimental/debian/patches/series
===================================================================
--- packages/python-django/branches/experimental/debian/patches/series	                        (rev 0)
+++ packages/python-django/branches/experimental/debian/patches/series	2009-03-24 23:14:05 UTC (rev 7989)
@@ -0,0 +1,2 @@
+03_manpage.diff
+04_hyphen-manpage.diff

Added: packages/python-django/branches/experimental/debian/python-django-doc.doc-base
===================================================================
--- packages/python-django/branches/experimental/debian/python-django-doc.doc-base	                        (rev 0)
+++ packages/python-django/branches/experimental/debian/python-django-doc.doc-base	2009-03-24 23:14:05 UTC (rev 7989)
@@ -0,0 +1,20 @@
+Document: python-django-doc
+Title: Python Django Documentation
+Author: Django Software Foundation
+Abstract: This documentation gives an introduction 
+ to Django and its contributed packages like its automatic
+ admin and the user authentication applications.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-django-doc/html/index.html
+Files: /usr/share/doc/python-django-doc/html/*.html
+ /usr/share/doc/python-django-doc/html/faq/*.html
+ /usr/share/doc/python-django-doc/html/howto/*.html
+ /usr/share/doc/python-django-doc/html/internals/*.html
+ /usr/share/doc/python-django-doc/html/intro/*.html
+ /usr/share/doc/python-django-doc/html/misc/*.html
+ /usr/share/doc/python-django-doc/html/obsolete/*.html
+ /usr/share/doc/python-django-doc/html/ref/*.html
+ /usr/share/doc/python-django-doc/html/releases/*.html
+ /usr/share/doc/python-django-doc/html/topics/*.html

Added: packages/python-django/branches/experimental/debian/python-django-doc.docs
===================================================================
--- packages/python-django/branches/experimental/debian/python-django-doc.docs	                        (rev 0)
+++ packages/python-django/branches/experimental/debian/python-django-doc.docs	2009-03-24 23:14:05 UTC (rev 7989)
@@ -0,0 +1 @@
+docs.debian/_build/html

Copied: packages/python-django/branches/experimental/debian/python-django-doc.examples (from rev 7988, packages/python-django/branches/experimental/debian/python-django.examples)
===================================================================
--- packages/python-django/branches/experimental/debian/python-django-doc.examples	                        (rev 0)
+++ packages/python-django/branches/experimental/debian/python-django-doc.examples	2009-03-24 23:14:05 UTC (rev 7989)
@@ -0,0 +1 @@
+examples/*

Deleted: packages/python-django/branches/experimental/debian/python-django.doc-base
===================================================================
--- packages/python-django/branches/experimental/debian/python-django.doc-base	2009-03-24 23:14:04 UTC (rev 7988)
+++ packages/python-django/branches/experimental/debian/python-django.doc-base	2009-03-24 23:14:05 UTC (rev 7989)
@@ -1,20 +0,0 @@
-Document: python-django
-Title: Python Django Documentation
-Author: Django Software Foundation
-Abstract: This documentation gives an introduction 
- to Django and its contributed packages like its automatic
- admin and the user authentication applications.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-django/html/index.html
-Files: /usr/share/doc/python-django/html/*.html
- /usr/share/doc/python-django/html/faq/*.html
- /usr/share/doc/python-django/html/howto/*.html
- /usr/share/doc/python-django/html/internals/*.html
- /usr/share/doc/python-django/html/intro/*.html
- /usr/share/doc/python-django/html/misc/*.html
- /usr/share/doc/python-django/html/obsolete/*.html
- /usr/share/doc/python-django/html/ref/*.html
- /usr/share/doc/python-django/html/releases/*.html
- /usr/share/doc/python-django/html/topics/*.html

Deleted: packages/python-django/branches/experimental/debian/python-django.examples
===================================================================
--- packages/python-django/branches/experimental/debian/python-django.examples	2009-03-24 23:14:04 UTC (rev 7988)
+++ packages/python-django/branches/experimental/debian/python-django.examples	2009-03-24 23:14:05 UTC (rev 7989)
@@ -1 +0,0 @@
-examples/*

Modified: packages/python-django/branches/experimental/debian/python-django.install
===================================================================
--- packages/python-django/branches/experimental/debian/python-django.install	2009-03-24 23:14:04 UTC (rev 7988)
+++ packages/python-django/branches/experimental/debian/python-django.install	2009-03-24 23:14:05 UTC (rev 7989)
@@ -1,2 +1,2 @@
-docs/_build/html/* usr/share/doc/python-django/html/
+usr/
 extras/django_bash_completion etc/bash_completion.d/

Modified: packages/python-django/branches/experimental/debian/rules
===================================================================
--- packages/python-django/branches/experimental/debian/rules	2009-03-24 23:14:04 UTC (rev 7988)
+++ packages/python-django/branches/experimental/debian/rules	2009-03-24 23:14:05 UTC (rev 7989)
@@ -1,38 +1,54 @@
 #!/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
-	rm -rf docs/_build/html/_sources/
+%:
+	dh $@
 
-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 
+build: $(QUILT_STAMPFN)
+	dh $@
+
+clean: unpatch
+	rm -rf docs.debian
+	dh $@
+
+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
+	rm -rf docs.debian/_build/html/_sources/
+
+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
+
+override_dh_installdocs:
+	dh_installdocs
+	# Remove embedded copy of libjs-jquery
+	cd debian/python-django-doc/usr/share/doc/python-django-doc/html/_static \
+		&& rm jquery.js \
 		&& ln -s ../../../../javascript/jquery/jquery.js .
 
-clean::
-	rm -rf docs/_build/*
+override_dh_compress:
+	dh_compress -X.js

More information about the Python-modules-commits mailing list