[Python-modules-commits] r11950 - in packages/python-django-piston/trunk/debian/patches (4 files)

[svedrin-guest at users.alioth.debian.org]

    Date: Thursday, February 25, 2010 @ 18:43:08
  Author: svedrin-guest
Revision: 11950

merge patches as they do the same thing

Added:
  packages/python-django-piston/trunk/debian/patches/01-fix-oauth-import.diff
Modified:
  packages/python-django-piston/trunk/debian/patches/series
Deleted:
  packages/python-django-piston/trunk/debian/patches/01-fix-import-authentication.diff
  packages/python-django-piston/trunk/debian/patches/02-fix-import-store.diff

Deleted: packages/python-django-piston/trunk/debian/patches/01-fix-import-authentication.diff
===================================================================
--- packages/python-django-piston/trunk/debian/patches/01-fix-import-authentication.diff	2010-02-25 18:34:48 UTC (rev 11949)
+++ packages/python-django-piston/trunk/debian/patches/01-fix-import-authentication.diff	2010-02-25 18:43:08 UTC (rev 11950)
@@ -1,12 +0,0 @@
-# Fix the oauth import.
-
-Index: python-django-piston-0.2.2/piston/authentication.py
-===================================================================
---- python-django-piston-0.2.2.orig/piston/authentication.py	2010-02-22 18:55:57.000000000 +0100
-+++ python-django-piston-0.2.2/piston/authentication.py	2010-02-22 18:56:07.000000000 +0100
-@@ -1,4 +1,4 @@
--import oauth
-+from oauth import oauth
- from django.http import HttpResponse, HttpResponseRedirect
- from django.contrib.auth.models import User, AnonymousUser
- from django.contrib.auth.decorators import login_required

Added: packages/python-django-piston/trunk/debian/patches/01-fix-oauth-import.diff
===================================================================
--- packages/python-django-piston/trunk/debian/patches/01-fix-oauth-import.diff	                        (rev 0)
+++ packages/python-django-piston/trunk/debian/patches/01-fix-oauth-import.diff	2010-02-25 18:43:08 UTC (rev 11950)
@@ -0,0 +1,22 @@
+# Fix the oauth import.
+
+Index: python-django-piston-0.2.2/piston/authentication.py
+===================================================================
+--- python-django-piston-0.2.2.orig/piston/authentication.py	2010-02-25 19:40:29.000000000 +0100
++++ python-django-piston-0.2.2/piston/authentication.py	2010-02-25 19:41:10.000000000 +0100
+@@ -1,4 +1,4 @@
+-import oauth
++from oauth import oauth
+ from django.http import HttpResponse, HttpResponseRedirect
+ from django.contrib.auth.models import User, AnonymousUser
+ from django.contrib.auth.decorators import login_required
+Index: python-django-piston-0.2.2/piston/store.py
+===================================================================
+--- python-django-piston-0.2.2.orig/piston/store.py	2010-02-25 19:40:29.000000000 +0100
++++ python-django-piston-0.2.2/piston/store.py	2010-02-25 19:41:10.000000000 +0100
+@@ -1,4 +1,4 @@
+-import oauth
++from oauth import oauth
+ 
+ from models import Nonce, Token, Consumer
+ 

Deleted: packages/python-django-piston/trunk/debian/patches/02-fix-import-store.diff
===================================================================
--- packages/python-django-piston/trunk/debian/patches/02-fix-import-store.diff	2010-02-25 18:34:48 UTC (rev 11949)
+++ packages/python-django-piston/trunk/debian/patches/02-fix-import-store.diff	2010-02-25 18:43:08 UTC (rev 11950)
@@ -1,12 +0,0 @@
-# Fix the oauth import.
-
-Index: python-django-piston-0.2.2/piston/store.py
-===================================================================
---- python-django-piston-0.2.2.orig/piston/store.py	2010-02-22 18:56:58.000000000 +0100
-+++ python-django-piston-0.2.2/piston/store.py	2010-02-22 18:57:03.000000000 +0100
-@@ -1,4 +1,4 @@
--import oauth
-+from oauth import oauth
- 
- from models import Nonce, Token, Consumer
- 

Modified: packages/python-django-piston/trunk/debian/patches/series
===================================================================
--- packages/python-django-piston/trunk/debian/patches/series	2010-02-25 18:34:48 UTC (rev 11949)
+++ packages/python-django-piston/trunk/debian/patches/series	2010-02-25 18:43:08 UTC (rev 11950)
@@ -1,2 +1 @@
-02-fix-import-store.diff
-01-fix-import-authentication.diff
+01-fix-oauth-import.diff