[Python-modules-commits] r14747 - in packages/pyopenssl/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Monday, October 25, 2010 @ 18:44:23
  Author: morph
Revision: 14747

* debian/patches/20_spelling.dpatch
  - removed, merged upstream

Modified:
  packages/pyopenssl/trunk/debian/changelog
  packages/pyopenssl/trunk/debian/patches/00list
Deleted:
  packages/pyopenssl/trunk/debian/patches/20_spelling.dpatch

Modified: packages/pyopenssl/trunk/debian/changelog
===================================================================
--- packages/pyopenssl/trunk/debian/changelog	2010-10-25 18:19:36 UTC (rev 14746)
+++ packages/pyopenssl/trunk/debian/changelog	2010-10-25 18:44:23 UTC (rev 14747)
@@ -6,8 +6,10 @@
       the report; Closes: #567654
   * debian/copyright
     - updated upstream copyright years
+  * debian/patches/20_spelling.dpatch
+    - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Mon, 25 Oct 2010 20:19:08 +0200
+ -- Sandro Tosi <morph at debian.org>  Mon, 25 Oct 2010 20:43:58 +0200
 
 pyopenssl (0.10-1) unstable; urgency=low
 

Modified: packages/pyopenssl/trunk/debian/patches/00list
===================================================================
--- packages/pyopenssl/trunk/debian/patches/00list	2010-10-25 18:19:36 UTC (rev 14746)
+++ packages/pyopenssl/trunk/debian/patches/00list	2010-10-25 18:44:23 UTC (rev 14747)
@@ -1,2 +1 @@
 10_fix_doc_buildsystem
-20_spelling

Deleted: packages/pyopenssl/trunk/debian/patches/20_spelling.dpatch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/20_spelling.dpatch	2010-10-25 18:19:36 UTC (rev 14746)
+++ packages/pyopenssl/trunk/debian/patches/20_spelling.dpatch	2010-10-25 18:44:23 UTC (rev 14747)
@@ -1,49 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_spelling.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the "compatability/compatibility" spelling error
-
- at DPATCH@
-diff -urNad pyopenssl~/src/ssl/connection.c pyopenssl/src/ssl/connection.c
---- pyopenssl~/src/ssl/connection.c	2009-11-13 16:36:16.000000000 +0100
-+++ pyopenssl/src/ssl/connection.c	2010-01-27 21:43:13.014236702 +0100
-@@ -326,7 +326,7 @@
- method again with the SAME buffer.\n\
- \n\
- @param buf: The string to send\n\
-- at param flags: (optional) Included for compatability with the socket\n\
-+ at param flags: (optional) Included for compatibility with the socket\n\
-               API, the value is ignored\n\
- @return: The number of bytes written\n\
- ";
-@@ -367,7 +367,7 @@
- has been sent.\n\
- \n\
- @param buf: The string to send\n\
-- at param flags: (optional) Included for compatability with the socket\n\
-+ at param flags: (optional) Included for compatibility with the socket\n\
-               API, the value is ignored\n\
- @return: The number of bytes written\n\
- ";
-@@ -416,7 +416,7 @@
- method again with the SAME buffer.\n\
- \n\
- @param bufsiz: The maximum number of bytes to read\n\
-- at param flags: (optional) Included for compatability with the socket\n\
-+ at param flags: (optional) Included for compatibility with the socket\n\
-               API, the value is ignored\n\
- @return: The string read from the Connection\n\
- ";
-diff -urNad pyopenssl~/src/util.h pyopenssl/src/util.h
---- pyopenssl~/src/util.h	2009-11-13 16:36:16.000000000 +0100
-+++ pyopenssl/src/util.h	2010-01-27 21:43:13.014236702 +0100
-@@ -18,7 +18,7 @@
- 
- /*
-  * pymemcompat written by Michael Hudson and lets you program to the
-- * Python 2.3 memory API while keeping backwards compatability.
-+ * Python 2.3 memory API while keeping backwards compatibility.
-  */
- #include "pymemcompat.h"
-