[Python-modules-commits] r29469 - in packages/python-django/trunk/debian (5 files)
bam at users.alioth.debian.org
bam at users.alioth.debian.org
Tue Jun 24 23:34:27 UTC 2014
Date: Tuesday, June 24, 2014 @ 23:34:26
Author: bam
Revision: 29469
python-3-django package.
WIP, see http://bugs.debian.org/736878
Added:
packages/python-django/trunk/debian/python3-django.install
Modified:
packages/python-django/trunk/debian/changelog
packages/python-django/trunk/debian/control
packages/python-django/trunk/debian/rules
Deleted:
packages/python-django/trunk/debian/python-django.install
Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog 2014-06-24 07:06:36 UTC (rev 29468)
+++ packages/python-django/trunk/debian/changelog 2014-06-24 23:34:26 UTC (rev 29469)
@@ -1,3 +1,9 @@
+python-django (1.6.5-2) UNRELEASED; urgency=low
+
+ * python3-django package. Closes: #736878.
+
+ -- Brian May <bam at debian.org> Tue, 24 Jun 2014 10:51:47 +1000
+
python-django (1.6.5-1) unstable; urgency=high
* New upstream security release.
Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control 2014-06-24 07:06:36 UTC (rev 29468)
+++ packages/python-django/trunk/debian/control 2014-06-24 23:34:26 UTC (rev 29469)
@@ -4,9 +4,10 @@
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Luke Faraone <lfaraone at debian.org>,
Raphaël Hertzog <hertzog at debian.org>,
- Chris Lamb <lamby at debian.org>
+ Chris Lamb <lamby at debian.org>,
+ Brian May <bam at debian.org>
Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-sphinx (>= 1.0.8), locales (>= 0)
+Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python3-all, python-sphinx (>= 1.0.8), locales (>= 0)
Build-Depends-Indep: libjs-jquery
Homepage: http://www.djangoproject.com/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-django/trunk/
@@ -15,7 +16,7 @@
Package: python-django
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}
-Recommends: libjs-jquery
+Recommends: libjs-jquery, python3-django
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
@@ -39,6 +40,35 @@
* Internationalization support
* Testing framework and client
+Package: python3-django
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+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
+ 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.
+ .
+ Notable features include:
+ * An object-relational mapper (ORM)
+ * Automatic admin interface
+ * Elegant URL dispatcher
+ * Form serialization and validation system
+ * Templating system
+ * Lightweight, standalone web server for development and testing
+ * Internationalization support
+ * Testing framework and client
+
Package: python-django-doc
Section: doc
Architecture: all
Deleted: packages/python-django/trunk/debian/python-django.install
===================================================================
--- packages/python-django/trunk/debian/python-django.install 2014-06-24 07:06:36 UTC (rev 29468)
+++ packages/python-django/trunk/debian/python-django.install 2014-06-24 23:34:26 UTC (rev 29469)
@@ -1,2 +0,0 @@
-usr/
-extras/django_bash_completion etc/bash_completion.d/
Added: packages/python-django/trunk/debian/python3-django.install
===================================================================
--- packages/python-django/trunk/debian/python3-django.install (rev 0)
+++ packages/python-django/trunk/debian/python3-django.install 2014-06-24 23:34:26 UTC (rev 29469)
@@ -0,0 +1 @@
+extras/django_bash_completion etc/bash_completion.d/
Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules 2014-06-24 07:06:36 UTC (rev 29468)
+++ packages/python-django/trunk/debian/rules 2014-06-24 23:34:26 UTC (rev 29469)
@@ -1,18 +1,12 @@
#!/usr/bin/make -f
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
- py_sitename = site-packages
- py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
- py_sitename_sh = $(py_sitename)
- py_libdir_sh = $(py_libdir)
-endif
+export PYBUILD_NAME=django
-
PREFIX = debian/python-django
+PREFIX3 = debian/python3-django
%:
- dh $@ --with sphinxdoc,python2
+ dh $@ --with sphinxdoc,python2,python3 --buildsystem=pybuild
override_dh_auto_clean:
rm -rf docs.debian tests/__init__.py
@@ -46,32 +40,19 @@
override_dh_install:
dh_install
- # Use default shebang and m move scripts to /usr/lib/python-django
- set -e; for ver in $(shell pyversions -vr); do \
- [ -f /usr/bix/python$$ver ] || continue;\
- FILE=$(PREFIX)/$(call py_libdir_sh,$$ver)/django/conf/project_template/manage.py; \
- if [ -f $$FILE ]; then\
- perl -pi -e 's|^#!/usr/bin/env python.*|#!/usr/bin/python|' $$FILE;\
- chmod +x $$FILE;\
- fi;\
- if [ -d $(PREFIX)/usr/lib/python-django ]; then\
- rm -rf $(PREFIX)/$(call py_libdir_sh,$$ver)/django/bin;\
- else\
- mkdir -p $(PREFIX)/usr/lib/python-django;\
- mv $(PREFIX)/$(call py_libdir_sh,$$ver)/django/bin $(PREFIX)/usr/lib/python-django;\
- fi;\
- done
# 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
+ chmod 644 $(PREFIX3)/etc/bash_completion.d/django_bash_completion
# Rename django-admin.py to django-admin
- mv $(PREFIX)/usr/bin/django-admin.py $(PREFIX)/usr/bin/django-admin
+ rm $(PREFIX)/usr/bin/django-admin.py
+ mv $(PREFIX3)/usr/bin/django-admin.py $(PREFIX3)/usr/bin/django-admin
# Remove embedded Javascript libraries
set -e; for FILENAME in jquery.js jquery.min.js; do \
find $(PREFIX) -name $$FILENAME -exec \
ln -sf /usr/share/javascript/jquery/$$FILENAME {} \;; \
+ find $(PREFIX3) -name $$FILENAME -exec \
+ ln -sf /usr/share/javascript/jquery/$$FILENAME {} \;; \
done
override_dh_compress:
More information about the Python-modules-commits
mailing list