Merge lp:~lajjr-deactivatedaccount/ubuntu/maverick/python-django-piston/bug653480 into lp:ubuntu/maverick/python-django-piston

[Joker Wild]

[Artur Rona (ari-tczew)]

This is SRU as it's maverick. https://wiki.ubuntu.com/StableReleaseUpdates

s/(0.2.2-1ubuntu1) maverick/(0.2.2-1ubuntu0.1) maverick-proposed

Run script 'update-maintainer' from package ubuntu-dev-tools.
Please also use revision's description of debian/changelog from natty:

  * debian/control: Bump Depends on python-oauth 1.0 since we don't
    have 1.0.1 yet. Fixes install problem. (LP: #653480)

review: Needs Fixing

[lp:~lajjr-deactivatedaccount/ubuntu/maverick/python-django-piston/bug653480]

5. By Joker Wild on 2011-01-09

Fix as requested from merge.

[Joker Wild (lajjr-deactivatedaccount)]

> This is SRU as it's maverick. https://wiki.ubuntu.com/StableReleaseUpdates
>
> s/(0.2.2-1ubuntu1) maverick/(0.2.2-1ubuntu0.1) maverick-proposed
>
> Run script 'update-maintainer' from package ubuntu-dev-tools.
> Please also use revision's description of debian/changelog from natty:
>
> * debian/control: Bump Depends on python-oauth 1.0 since we don't
> have 1.0.1 yet. Fixes install problem. (LP: #653480)

OK thank you for looking at this. Is it alright now?
Regards,
Leo Jackson

[Artur Rona (ari-tczew)]

Very nice. I'll upload it.

review: Approve

[Joker Wild (lajjr-deactivatedaccount)]

Artur,

Thank you very much.

Regards,
Leo Jackson

--- On Sun, 1/9/11, Artur Rona <email address hidden> wrote:

From: Artur Rona <email address hidden>
Subject: Re: [Merge] lp:~lajjr/ubuntu/maverick/python-django-piston/bug653480 into lp:ubuntu/maverick/python-django-piston
To: <email address hidden>
Date: Sunday, January 9, 2011, 4:09 PM

Review: Approve
Very nice. I'll upload it.
--
https://code.launchpad.net/~lajjr/ubuntu/maverick/python-django-piston/bug653480/+merge/45594
You are the owner of lp:~lajjr/ubuntu/maverick/python-django-piston/bug653480.

Unmerged revisions

5. By Joker Wild on 2011-01-09

Fix as requested from merge.

4. By Joker Wild on 2011-01-08

Fix for LP Bug#653480.

3. By Joker Wild on 2011-01-07

Fix the control file.

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-22 08:43:21 +0000
+++ debian/changelog	2011-01-09 05:46:25 +0000
@@ -1,3 +1,10 @@
+python-django-piston (0.2.2-1ubuntu0.1) maverick-proposed; urgency=low
+
+  * debian/control: Bump Depends on python-oauth 1.0 since we don't
+    have 1.0.1 yet. Fixes install problem. (LP: #653480) 
+
+ -- Leo Albert Jackson Jr (Coders United) <[e-mail]>  Fri, 07 Jan 2011 21:57:41 -0500
+
 python-django-piston (0.2.2-1) unstable; urgency=low
 
   * Initial release (Closes: #570919)

=== modified file 'debian/control'
--- debian/control	2010-02-22 08:43:21 +0000
+++ debian/control	2011-01-09 05:46:25 +0000
@@ -1,7 +1,8 @@
 Source: python-django-piston
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Michael Ziegler <[e-mail]>
 Build-Depends: python (>= 2.4), debhelper (>= 7.0.50~), python-setuptools (>= 0.6.10)
 Build-Depends-Indep: python-support
@@ -14,7 +15,7 @@
 Package: python-django-piston
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-django (>= 1.1),
- python-oauth (>= 1.0.1), python-decorator
+ python-oauth (>= 1.0), python-decorator
 Suggests: python-yaml
 Description: Django mini-framework creating RESTful APIs
  Piston is a relatively small Django application that lets you