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

[hertzog at users.alioth.debian.org]

    Date: Tuesday, July 22, 2014 @ 21:13:09
  Author: hertzog
Revision: 29864

* Move django-admin manual page in python-django-common. Bump version
  constraint in Breaks/Replaces accordingly.
* Drop conflicting django-admin in python-django and python3-django that
  were not removed as usual because upstream stopped installing them as
  django-admin.py.

Added:
  packages/python-django/trunk/debian/python-django-common.manpages
    (from rev 29863, packages/python-django/trunk/debian/python-django.manpages)
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.manpages

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2014-07-22 20:15:16 UTC (rev 29863)
+++ packages/python-django/trunk/debian/changelog	2014-07-22 21:13:09 UTC (rev 29864)
@@ -1,3 +1,13 @@
+python-django (1.7~c1+20140722-2) UNRELEASED; urgency=medium
+
+  * Move django-admin manual page in python-django-common. Bump version
+    constraint in Breaks/Replaces accordingly.
+  * Drop conflicting django-admin in python-django and python3-django that
+    were not removed as usual because upstream stopped installing them as
+    django-admin.py.
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Tue, 22 Jul 2014 23:01:21 +0200
+
 python-django (1.7~c1+20140722-1) experimental; urgency=medium
 
   * New upstream release candidate. We want this version in jessie so we

Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control	2014-07-22 20:15:16 UTC (rev 29863)
+++ packages/python-django/trunk/debian/control	2014-07-22 21:13:09 UTC (rev 29864)
@@ -86,8 +86,8 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
 Recommends: libjs-jquery
-Breaks: python-django (<< 1.6.5-2~)
-Replaces: python-django (<< 1.6.5-2~)
+Breaks: python-django (<< 1.7~)
+Replaces: python-django (<< 1.7~)
 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.

Copied: packages/python-django/trunk/debian/python-django-common.manpages (from rev 29863, packages/python-django/trunk/debian/python-django.manpages)
===================================================================
--- packages/python-django/trunk/debian/python-django-common.manpages	                        (rev 0)
+++ packages/python-django/trunk/debian/python-django-common.manpages	2014-07-22 21:13:09 UTC (rev 29864)
@@ -0,0 +1 @@
+docs/man/django-admin.1

Deleted: packages/python-django/trunk/debian/python-django.manpages
===================================================================
--- packages/python-django/trunk/debian/python-django.manpages	2014-07-22 20:15:16 UTC (rev 29863)
+++ packages/python-django/trunk/debian/python-django.manpages	2014-07-22 21:13:09 UTC (rev 29864)
@@ -1 +0,0 @@
-docs/man/django-admin.1

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2014-07-22 20:15:16 UTC (rev 29863)
+++ packages/python-django/trunk/debian/rules	2014-07-22 21:13:09 UTC (rev 29864)
@@ -45,9 +45,9 @@
 	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
-	rm $(PREFIX3)/usr/bin/django-admin.py
+	# django-admin is in python-django-common
+	rm $(PREFIX)/usr/bin/django-admin
+	rm $(PREFIX3)/usr/bin/django-admin
 	
 	# Remove embedded Javascript libraries
 	set -e; for FILENAME in jquery.js jquery.min.js; do \