[SCM] flumotion/master: Removed patches no longer needed

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

The following commit has been merged in the master branch:
commit 49166ec4e33f2524c6d9090f58cd80c52f73e13c
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Fri Jan 31 16:22:26 2014 +0100

    Removed patches no longer needed

diff --git a/debian/patches/assert_ssl.patch b/debian/patches/assert_ssl.patch
deleted file mode 100644
index 2ba6ffc..0000000
--- a/debian/patches/assert_ssl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: IOhannes m zmölnig
-Description: some versions of twisted seem to lack the sslEnabled attribute
-of twisted.internet.posixbase; this patch works around that
---- flumotion.orig/flumotion/common/common.py
-+++ flumotion/flumotion/common/common.py
-@@ -390,7 +390,22 @@
-     from twisted.internet import posixbase
-     from flumotion.common import errors
- 
--    if not posixbase.sslEnabled:
-+    haveSSL=False
-+
-+    if not haveSSL:
-+      try:
-+        haveSSL=posixbase.sslEnabled
-+      except AttributeError:
-+        haveSSL=False
-+
-+    if not haveSSL:
-+      try:
-+        from twisted.internet import ssl
-+        haveSSL=True
-+      except ImportError:
-+        haveSSL=False
-+
-+    if not haveSSL:
-         raise errors.NoSSLError()
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7b33752..19420fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 preserve-umask.patch
 desktop-encoding-key.patch
 manpage-fixes.patch
-assert_ssl.patch
-twisted_override.patch
 fix_autoreconf.patch
diff --git a/debian/patches/twisted_override.patch b/debian/patches/twisted_override.patch
deleted file mode 100644
index 770a025..0000000
--- a/debian/patches/twisted_override.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: John Bazik <jsb at cs.brown.edu>
-Description: Fix override internal Twisted interface
-Bug: https://code.flumotion.com/trac/ticket/1544
-Bug-Debian: http://bugs.debian.org/672404
-Bug-Debian: http://bugs.debian.org/679318
-Last-Updated: 2012-06-29
---- flumotion.orig/flumotion/component/feed.py
-+++ flumotion/flumotion/component/feed.py
-@@ -38,7 +38,7 @@
- class _SocketMaybeCloser(tcp._SocketCloser):
-     keepSocketAlive = False
- 
--    def _closeSocket(self):
-+    def _closeSocket(self, orderly):
-         # We override this (from tcp._SocketCloser) so that we can close
-         # sockets properly in the normal case, but once we've passed our
-         # socket on via the FD-channel, we just close() it (not calling
---- flumotion.orig/flumotion/twisted/fdserver.py
-+++ flumotion/flumotion/twisted/fdserver.py
-@@ -173,7 +173,7 @@
- class _SocketMaybeCloser(tcp._SocketCloser):
-     keepSocketAlive = False
- 
--    def _closeSocket(self):
-+    def _closeSocket(self, orderly):
-         # We override this (from tcp._SocketCloser) so that we can close
-         # sockets properly in the normal case, but once we've passed our
-         # socket on via the FD-channel, we just close() it (not calling

-- 
flumotion packaging