[Python-modules-commits] r16363 - in packages/python-openid/trunk/debian (11 files)

Tue Apr 5 16:02:36 UTC 2011

Date: Tuesday, April 5, 2011 @ 16:02:27
  Author: dottedmag
Revision: 16363

Update to 2.2.5-2

Added:
  packages/python-openid/trunk/debian/python-openid-doc.doc-base
  packages/python-openid/trunk/debian/python-openid-doc.docs
  packages/python-openid/trunk/debian/python-openid-doc.examples
Modified:
  packages/python-openid/trunk/debian/changelog
  packages/python-openid/trunk/debian/control
  packages/python-openid/trunk/debian/rules
  packages/python-openid/trunk/debian/source/format
Deleted:
  packages/python-openid/trunk/debian/examples
  packages/python-openid/trunk/debian/python-openid.doc-base
  packages/python-openid/trunk/debian/python-openid.docs
  packages/python-openid/trunk/debian/python-openid.preinst

Modified: packages/python-openid/trunk/debian/changelog
===================================================================

--- packages/python-openid/trunk/debian/changelog	2011-04-05 15:07:53 UTC (rev 16362)
+++ packages/python-openid/trunk/debian/changelog	2011-04-05 16:02:27 UTC (rev 16363)
@@ -1,3 +1,16 @@
+python-openid (2.2.5-2) unstable; urgency=low
+
+  * Split out -doc package (Closes: #620977):
+    - debian/control: New package entry.
+    - debian/examples, debian/python-openid.doc-base,
+      debian/python-openid.docs: Renamed.
+    - debian/rules: Adjust installation directories.
+  * debian/python-openid.preinst: Remove workaround for upgrading from
+    Lenny, as Squeeze is released.
+  * debian/source/format: Upgrade to 3.0 (quilt).
+
+ -- Mikhail Gusarov <dottedmag at debian.org>  Tue, 05 Apr 2011 18:02:04 +0200
+
 python-openid (2.2.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/python-openid/trunk/debian/control
===================================================================
--- packages/python-openid/trunk/debian/control	2011-04-05 15:07:53 UTC (rev 16362)
+++ packages/python-openid/trunk/debian/control	2011-04-05 16:02:27 UTC (rev 16363)
@@ -20,3 +20,18 @@
   - OpenID 1.0, 1.1 and 2.0 support,
   - SReg support,
   - several storage implementations for stateful OpenID authentication.
+
+Package: python-openid-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: python-openid
+Description: OpenID support for servers and consumers -- documentation
+ Set of Python packages to support use of the OpenID decentralized
+ identity system in your application, both server- and client-side,
+ including:
+  - OpenID 1.0, 1.1 and 2.0 support,
+  - SReg support,
+  - several storage implementations for stateful OpenID authentication.
+ .
+ This package contains API documentation and examples.

Deleted: packages/python-openid/trunk/debian/examples
===================================================================
--- packages/python-openid/trunk/debian/examples	2011-04-05 15:07:53 UTC (rev 16362)
+++ packages/python-openid/trunk/debian/examples	2011-04-05 16:02:27 UTC (rev 16363)
@@ -1 +0,0 @@
-examples/*

Added: packages/python-openid/trunk/debian/python-openid-doc.doc-base
===================================================================
--- packages/python-openid/trunk/debian/python-openid-doc.doc-base	                        (rev 0)
+++ packages/python-openid/trunk/debian/python-openid-doc.doc-base	2011-04-05 16:02:27 UTC (rev 16363)
@@ -0,0 +1,10 @@
+Document: python-openid-reference-manual
+Title: Python OpenID Library Reference Manual
+Author: JanRain, Inc.
+Abstract: This package is an implementation of the OpenID specification in
+ Python. It contains code for both server and consumer implementations.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-openid-doc/html/index.html
+Files: /usr/share/doc/python-openid-doc/html/*

Added: packages/python-openid/trunk/debian/python-openid-doc.docs
===================================================================
--- packages/python-openid/trunk/debian/python-openid-doc.docs	                        (rev 0)
+++ packages/python-openid/trunk/debian/python-openid-doc.docs	2011-04-05 16:02:27 UTC (rev 16363)
@@ -0,0 +1,5 @@
+README
+NOTICE
+background-associations.txt
+CHANGES-2.2.0
+NEWS

Added: packages/python-openid/trunk/debian/python-openid-doc.examples
===================================================================
--- packages/python-openid/trunk/debian/python-openid-doc.examples	                        (rev 0)
+++ packages/python-openid/trunk/debian/python-openid-doc.examples	2011-04-05 16:02:27 UTC (rev 16363)
@@ -0,0 +1 @@
+examples/*

Deleted: packages/python-openid/trunk/debian/python-openid.doc-base
===================================================================
--- packages/python-openid/trunk/debian/python-openid.doc-base	2011-04-05 15:07:53 UTC (rev 16362)
+++ packages/python-openid/trunk/debian/python-openid.doc-base	2011-04-05 16:02:27 UTC (rev 16363)
@@ -1,10 +0,0 @@
-Document: python-openid-reference-manual
-Title: Python OpenID Library Reference Manual
-Author: JanRain, Inc.
-Abstract: This package is an implementation of the OpenID specification in
- Python. It contains code for both server and consumer implementations.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-openid/html/index.html
-Files: /usr/share/doc/python-openid/html/*

Deleted: packages/python-openid/trunk/debian/python-openid.docs
===================================================================
--- packages/python-openid/trunk/debian/python-openid.docs	2011-04-05 15:07:53 UTC (rev 16362)
+++ packages/python-openid/trunk/debian/python-openid.docs	2011-04-05 16:02:27 UTC (rev 16363)
@@ -1,3 +0,0 @@
-README
-NOTICE
-background-associations.txt

Deleted: packages/python-openid/trunk/debian/python-openid.preinst
===================================================================
--- packages/python-openid/trunk/debian/python-openid.preinst	2011-04-05 15:07:53 UTC (rev 16362)
+++ packages/python-openid/trunk/debian/python-openid.preinst	2011-04-05 16:02:27 UTC (rev 16363)
@@ -1,11 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ]
-then
-        if dpkg --compare-versions "$2" lt 2.2.4-1; then
-                pycentral pkgremove python-openid
-        fi
-fi
-
-#DEBHELPER#

Modified: packages/python-openid/trunk/debian/rules
===================================================================
--- packages/python-openid/trunk/debian/rules	2011-04-05 15:07:53 UTC (rev 16362)
+++ packages/python-openid/trunk/debian/rules	2011-04-05 16:02:27 UTC (rev 16363)
@@ -2,9 +2,11 @@
 %:
 	dh $@
 
-override_dh_install:
-	mkdir -p debian/python-openid/usr/share/doc/python-openid/html
-	epydoc -o debian/python-openid/usr/share/doc/python-openid/html openid
+override_dh_auto_install:
+	mkdir -p debian/python-openid-doc/usr/share/doc/python-openid-doc/html
+	epydoc -o debian/python-openid-doc/usr/share/doc/python-openid-doc/html openid
 
+	dh_auto_install --destdir=$(CURDIR)/debian/python-openid -- --install-layout=deb
+
 override_dh_compress:
 	dh_compress -X.py -Xexamples

Modified: packages/python-openid/trunk/debian/source/format
===================================================================
--- packages/python-openid/trunk/debian/source/format	2011-04-05 15:07:53 UTC (rev 16362)
+++ packages/python-openid/trunk/debian/source/format	2011-04-05 16:02:27 UTC (rev 16363)
@@ -1 +1,2 @@
-1.0
+3.0 (quilt)
+


