[Python-modules-commits] r5549 - in packages/python-authkit/trunk/debian (8 files)

Wed Jun 4 20:58:47 UTC 2008

Date: Wednesday, June 4, 2008 @ 20:58:46
  Author: jandd-guest
Revision: 5549

* upgrade authkit to new upstream version
* remove easy_install dependency for elementtree

Added:
  packages/python-authkit/trunk/debian/patches/egginfo-elementtree.dpatch
  packages/python-authkit/trunk/debian/patches/setuppy-elementtree.dpatch
Modified:
  packages/python-authkit/trunk/debian/changelog
  packages/python-authkit/trunk/debian/control
  packages/python-authkit/trunk/debian/patches/00list
  packages/python-authkit/trunk/debian/rules
Deleted:
  packages/python-authkit/trunk/debian/patches/egginfo-openid.dpatch
  packages/python-authkit/trunk/debian/patches/setuppy-openid.dpatch

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

--- packages/python-authkit/trunk/debian/changelog	2008-06-04 18:47:57 UTC (rev 5548)
+++ packages/python-authkit/trunk/debian/changelog	2008-06-04 20:58:46 UTC (rev 5549)
@@ -1,4 +1,4 @@
-python-authkit (0.4.0~r95-2) UNRELEASED; urgency=low
+python-authkit (0.4.0~r143-1) UNRELEASED; urgency=low
 
   [ Piotr OÅ¼arowski ]
   * Vcs-Svn, Vcs-Browser and Homepage fields added
@@ -8,8 +8,30 @@
   * debian/control
     - uniforming Vcs-Browser field
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Wed, 21 Nov 2007 00:58:13 +0100
+  [ Jan Dittberner ]
+  * NMU to fix upstream bugs and remove elementtree dependency
+  * New upstream version (trunk, subversion revision 143) packaged.
 
+ -- Jan Dittberner <jan at dittberner.info>  Wed, 04 Jun 2008 22:55:26 +0200
+
+python-authkit (0.4.0~r139-0.1) unstable; urgency=low
+
+  * NMU blessed by maintainer.
+  * New upstream version (trunk, subverson revision 139) packaged.
+  * python-openid 2.0 support:
+    - python-yadis and python-urljr dependencies removed, both libraries
+      are merged into new python-openid.
+    - setuppy-openid.dpatch patch removed, no longer needed.
+    - egginfo-openid.dpatch patch removed, no longer needed.
+    - README.Debian removed as it contained only information about
+      "python-openid <= 1.2" dependency in older authkit snapshots.
+  * No longer manually move .egg-info directory: dh_pycentral does it
+    automatically.
+  * Homepage moved from description to debian/control field to make
+    lintian happy.
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net>  Wed, 07 Nov 2007 12:12:26 +0600
+
 python-authkit (0.4.0~r95-1) unstable; urgency=low
 
   * New upstream version (trunk, subversion revision 95) packaged.

Modified: packages/python-authkit/trunk/debian/control
===================================================================
--- packages/python-authkit/trunk/debian/control	2008-06-04 18:47:57 UTC (rev 5548)
+++ packages/python-authkit/trunk/debian/control	2008-06-04 20:58:46 UTC (rev 5549)
@@ -4,8 +4,8 @@
 Maintainer: Christoph Haas <haas at debian.org>
 Uploaders: Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11),
- python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), dpatch (>= 2.0)
-Standards-Version: 3.7.2
+ python-central (>= 0.5.6), python-setuptools (>= 0.6b3), dpatch (>= 2.0)
+Standards-Version: 3.7.3
 Homepage: http://authkit.org/
 XS-Python-Version: >=2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-authkit/trunk/
@@ -15,8 +15,7 @@
 Architecture: all
 Depends: ${misc:Depends}, python-paste (>=1.4), ${python:Depends},
  python-pastedeploy ( >= 1.1 ), python-pastescript ( >= 1.1 ),
- python-yadis ( >= 1.0.1 ), python-urljr ( >= 1.0 ),
- python-elementtree ( >= 1.2 ), python-openid ( >= 2.0 ),
+ python-elementtree ( >= 1.2 ) | python ( >= 2.5 ), python-openid ( >= 2.0.1 ),
  python-beaker ( >= 0.7.3 )
 XB-Python-Version: ${python:Versions}
 Description: authentication and authorisation framework for Python WSGI applications

Modified: packages/python-authkit/trunk/debian/patches/00list
===================================================================
--- packages/python-authkit/trunk/debian/patches/00list	2008-06-04 18:47:57 UTC (rev 5548)
+++ packages/python-authkit/trunk/debian/patches/00list	2008-06-04 20:58:46 UTC (rev 5549)
@@ -1,3 +1,3 @@
-egginfo-openid.dpatch
-setuppy-openid.dpatch
+egginfo-elementtree.dpatch
+setuppy-elementtree.dpatch
 ezsetup-python-path.dpatch

Added: packages/python-authkit/trunk/debian/patches/egginfo-elementtree.dpatch
===================================================================
--- packages/python-authkit/trunk/debian/patches/egginfo-elementtree.dpatch	                        (rev 0)
+++ packages/python-authkit/trunk/debian/patches/egginfo-elementtree.dpatch	2008-06-04 20:58:46 UTC (rev 5549)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## egginfo-elementtree.dpatch by Jan Dittberner <jan at dittberner.info>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debian uses Python 2.5 which includes elementtree
+
+ at DPATCH@
+diff -urNadw python-authkit-0.4.0~r143~/AuthKit.egg-info/requires.txt python-authkit-0.4.0~r143/AuthKit.egg-info/requires.txt
+--- python-authkit-0.4.0~r143~/AuthKit.egg-info/requires.txt	2008-06-04 22:38:31.000000000 +0200
++++ python-authkit-0.4.0~r143/AuthKit.egg-info/requires.txt	2008-06-04 22:39:29.000000000 +0200
+@@ -3,7 +3,6 @@
+ PasteDeploy>=1.1
+ PasteScript>=1.1
+ python-openid>=2.0.1
+-elementtree>=1.2,<=1.3
+ Beaker>=0.7.3
+ decorator>=2.1.0
+


Property changes on: packages/python-authkit/trunk/debian/patches/egginfo-elementtree.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/python-authkit/trunk/debian/patches/egginfo-openid.dpatch
===================================================================
--- packages/python-authkit/trunk/debian/patches/egginfo-openid.dpatch	2008-06-04 18:47:57 UTC (rev 5548)
+++ packages/python-authkit/trunk/debian/patches/egginfo-openid.dpatch	2008-06-04 20:58:46 UTC (rev 5549)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## egginfo-openid.dpatch by Christoph Haas <haas at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: python-openid <=1.2 is not available on Debian - only >=2.0
-
- at DPATCH@
-diff -urNad python-authkit_0.4.0~r95~/AuthKit.egg-info/requires.txt python-authkit_0.4.0~r95/AuthKit.egg-info/requires.txt
---- python-authkit_0.4.0~r95~/AuthKit.egg-info/requires.txt	2007-07-22 16:40:37.000000000 +0200
-+++ python-authkit_0.4.0~r95/AuthKit.egg-info/requires.txt	2007-07-25 23:41:25.000000000 +0200
-@@ -2,7 +2,7 @@
- nose>=0.9.2
- PasteDeploy>=1.1
- PasteScript>=1.1
--python-openid>=1.1,<=1.2
-+python-openid>=1.1
- python-yadis==1.0.1,<=1.1
- python-urljr==1.0.0,<=1.1
- elementtree>=1.2,<=1.3

Added: packages/python-authkit/trunk/debian/patches/setuppy-elementtree.dpatch
===================================================================
--- packages/python-authkit/trunk/debian/patches/setuppy-elementtree.dpatch	                        (rev 0)
+++ packages/python-authkit/trunk/debian/patches/setuppy-elementtree.dpatch	2008-06-04 20:58:46 UTC (rev 5549)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## egginfo-elementtree.dpatch by Jan Dittberner <jan at dittberner.info>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debian uses Python 2.5 which includes elementtree
+
+ at DPATCH@
+diff -urNadw python-authkit-0.4.0~r143~/setup.py python-authkit-0.4.0~r143/setup.py
+--- python-authkit-0.4.0~r143~/setup.py	2008-06-04 22:38:31.000000000 +0200
++++ python-authkit-0.4.0~r143/setup.py	2008-06-04 22:39:11.000000000 +0200
+@@ -39,7 +39,7 @@
+     install_requires = [
+         "Paste>=1.4", "nose>=0.9.2", "PasteDeploy>=1.1", 
+         "PasteScript>=1.1", "python-openid>=2.0.1", 
+-        "elementtree>=1.2,<=1.3", "Beaker>=0.7.3", "decorator>=2.1.0",
++        "Beaker>=0.7.3", "decorator>=2.1.0",
+     ],
+     extras_require = {
+         'pylons': ["Pylons>=0.9.5,<=1.0"],


Property changes on: packages/python-authkit/trunk/debian/patches/setuppy-elementtree.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/python-authkit/trunk/debian/patches/setuppy-openid.dpatch
===================================================================
--- packages/python-authkit/trunk/debian/patches/setuppy-openid.dpatch	2008-06-04 18:47:57 UTC (rev 5548)
+++ packages/python-authkit/trunk/debian/patches/setuppy-openid.dpatch	2008-06-04 20:58:46 UTC (rev 5549)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## setuppy-openid.dpatch by Christoph Haas <haas at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: python-openid <=1.2 is not available on Debian - only >=2.0
-
- at DPATCH@
-diff -urNad python-authkit_0.4.0~r95~/setup.py python-authkit_0.4.0~r95/setup.py
---- python-authkit_0.4.0~r95~/setup.py	2007-07-17 00:37:15.000000000 +0200
-+++ python-authkit_0.4.0~r95/setup.py	2007-07-25 23:41:06.000000000 +0200
-@@ -66,7 +66,7 @@
-     test_suite = 'nose.collector',
-     install_requires = [
-         "Paste>=1.4", "nose>=0.9.2", "PasteDeploy>=1.1", 
--        "PasteScript>=1.1", "python-openid>=1.1,<=1.2", 
-+        "PasteScript>=1.1", "python-openid>=1.1", 
-         "python-yadis==1.0.1,<=1.1", "python-urljr==1.0.0,<=1.1",
-         "elementtree>=1.2,<=1.3", "Beaker>=0.7.3",
-     ],

Modified: packages/python-authkit/trunk/debian/rules
===================================================================
--- packages/python-authkit/trunk/debian/rules	2008-06-04 18:47:57 UTC (rev 5548)
+++ packages/python-authkit/trunk/debian/rules	2008-06-04 20:58:46 UTC (rev 5549)
@@ -6,10 +6,6 @@
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
-#DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
-#    | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
-DEB_UPSTREAM_VERSION=0.4.0dev
-
 PYVERS=$(shell pyversions -vr)
 
 clean: unpatch
@@ -26,9 +22,6 @@
 	python$* setup.py install \
 		--single-version-externally-managed \
 		--root $(CURDIR)/debian/python-authkit
-	# share Egg dir
-	mv debian/python-authkit/usr/lib/python$*/site-packages/AuthKit-${DEB_UPSTREAM_VERSION}-py$*.egg-info \
-		debian/python-authkit/usr/lib/python$*/site-packages/AuthKit-${DEB_UPSTREAM_VERSION}.egg-info
 
 	# remove the stupid executable flag from README.txt files
 	find . -name README.txt | xargs chmod -x


