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

[bam at users.alioth.debian.org]

    Date: Wednesday, June 25, 2014 @ 00:07:29
  Author: bam
Revision: 29470

Initial python-django-common package.

Added:
  packages/python-django/trunk/debian/django-admin
  packages/python-django/trunk/debian/python-django-common.install
    (from rev 29469, packages/python-django/trunk/debian/python3-django.install)
Modified:
  packages/python-django/trunk/debian/control
  packages/python-django/trunk/debian/rules
Deleted:
  packages/python-django/trunk/debian/python3-django.install

Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control	2014-06-24 23:34:26 UTC (rev 29469)
+++ packages/python-django/trunk/debian/control	2014-06-25 00:07:29 UTC (rev 29470)
@@ -15,8 +15,8 @@
 
 Package: python-django
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Recommends: libjs-jquery, python3-django
+Depends: ${misc:Depends}, ${python:Depends}, python-django-common
+Recommends: libjs-jquery
 Suggests: python-psycopg2, python-psycopg, python-mysqldb, python-flup, python-sqlite, python-yaml, geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
 Description: High-level Python web development framework
  Django is a high-level web application framework that loosely follows the
@@ -42,10 +42,8 @@
 
 Package: python3-django
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}, python-django-common
 Recommends: libjs-jquery
-Breaks: python-django (<< 1.6.5-2)
-Replaces: python-django (<< 1.6.5-2)
 Suggests: python3-psycopg2, python3-psycopg, python3-mysqldb, python3-flup, python3-sqlite, python3-yaml, geoip-database-contrib, gettext, python-django-doc, ipython3, bpython3, libgdal1
 Description: High-level Python web development framework
  Django is a high-level web application framework that loosely follows the
@@ -69,6 +67,26 @@
   * Internationalization support
   * Testing framework and client
 
+Package: python-django-common
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Recommends: libjs-jquery
+Breaks: python-django (<< 1.6.5-2)
+Replaces: python-django (<< 1.6.5-2)
+Description: High-level Python web development framework (common)
+ 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 files common to both Python 2.7 and Python 3.
+
 Package: python-django-doc
 Section: doc
 Architecture: all

Added: packages/python-django/trunk/debian/django-admin
===================================================================
--- packages/python-django/trunk/debian/django-admin	                        (rev 0)
+++ packages/python-django/trunk/debian/django-admin	2014-06-25 00:07:29 UTC (rev 29470)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if test -x /usr/bin/python3 && test -e /usr/lib/python3/dist-packages/django/bin/django-admin.py
+then
+    exec python3 /usr/lib/python3/dist-packages/django/bin/django-admin.py "$@"
+elif test -x /usr/bin/python2.7 && test -e /usr/lib/python2.7/dist-packages/django/bin/django-admin.py
+then
+    exec python2.7 /usr/lib/python2.7/dist-packages/django/bin/django-admin.py "$@"
+else
+    echo "Cannot find installed version of python-django or python3-django." >&2
+    exit 1
+fi

Copied: packages/python-django/trunk/debian/python-django-common.install (from rev 29469, packages/python-django/trunk/debian/python3-django.install)
===================================================================
--- packages/python-django/trunk/debian/python-django-common.install	                        (rev 0)
+++ packages/python-django/trunk/debian/python-django-common.install	2014-06-25 00:07:29 UTC (rev 29470)
@@ -0,0 +1,2 @@
+debian/django-admin usr/bin/
+extras/django_bash_completion etc/bash_completion.d/

Deleted: packages/python-django/trunk/debian/python3-django.install
===================================================================
--- packages/python-django/trunk/debian/python3-django.install	2014-06-24 23:34:26 UTC (rev 29469)
+++ packages/python-django/trunk/debian/python3-django.install	2014-06-25 00:07:29 UTC (rev 29470)
@@ -1 +0,0 @@
-extras/django_bash_completion etc/bash_completion.d/

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2014-06-24 23:34:26 UTC (rev 29469)
+++ packages/python-django/trunk/debian/rules	2014-06-25 00:07:29 UTC (rev 29470)
@@ -4,6 +4,7 @@
 
 PREFIX = debian/python-django
 PREFIX3 = debian/python3-django
+PREFIXC = debian/python-django-common
 
 %:
 	dh $@ --with sphinxdoc,python2,python3 --buildsystem=pybuild
@@ -41,11 +42,12 @@
 	dh_install
 	
 	# Fix permissions
-	chmod 644 $(PREFIX3)/etc/bash_completion.d/django_bash_completion
+	chmod 644 $(PREFIXC)/etc/bash_completion.d/django_bash_completion
+	chmod 755 $(PREFIXC)/usr/bin/django-admin
 	
 	# Rename django-admin.py to django-admin
 	rm $(PREFIX)/usr/bin/django-admin.py
-	mv $(PREFIX3)/usr/bin/django-admin.py $(PREFIX3)/usr/bin/django-admin
+	rm $(PREFIX3)/usr/bin/django-admin.py
 	
 	# Remove embedded Javascript libraries
 	set -e; for FILENAME in jquery.js jquery.min.js; do \