[SCM] Packaging for pytango branch, master, updated. a32eb5d948f5dd7648fb2a011ae00af37f98c9e4

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 5af663918fd18e7ef760a26037aaa4fc15d93be4
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Wed Apr 13 20:04:38 2011 +0200

    * update for the 7.1.5 upstream version

diff --git a/debian/changelog b/debian/changelog
index b7cf380..b0e867f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pytango (7.1.4-1) unstable; urgency=low
+pytango (7.1.5-1) unstable; urgency=low
 
   * Initial release (Closes: #614245)
   * Thanks to Justin B Rye for package description review
diff --git a/debian/patches/0001-debian-install-the-spock-ipython-profile.patch b/debian/patches/0001-debian-install-the-spock-ipython-profile.patch
deleted file mode 100644
index 26d9093..0000000
--- a/debian/patches/0001-debian-install-the-spock-ipython-profile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Sat, 26 Mar 2011 14:26:48 +0100
-Subject: debian install the spock ipython profile
-
----
- IPython/Extensions/ipy_profile_spock.py |   17 +++++++++++++++++
- setup.py                                |    3 ++-
- 2 files changed, 19 insertions(+), 1 deletions(-)
- create mode 100644 IPython/Extensions/ipy_profile_spock.py
-
-diff --git a/IPython/Extensions/ipy_profile_spock.py b/IPython/Extensions/ipy_profile_spock.py
-new file mode 100644
-index 0000000..3ba6579
---- /dev/null
-+++ b/IPython/Extensions/ipy_profile_spock.py
-@@ -0,0 +1,17 @@
-+""" IPython 'spock' profile, to preload PyTango and offer a friendly interface to Tango.
-+
-+Created with PyTango {pytangover} for IPython {ipyver} """
-+
-+import IPython.ipapi
-+import ipy_defaults
-+
-+def main():
-+    ip = IPython.ipapi.get()
-+    try:
-+        ip.ex("import IPython.ipapi")
-+        ip.ex("import PyTango.ipython")
-+        ip.ex("PyTango.ipython.init_ipython(IPython.ipapi.get())")
-+    except ImportError:
-+        print "Unable to start spock profile, is PyTango installed?"
-+
-+main()
-diff --git a/setup.py b/setup.py
-index 850cd08..36e05e1 100644
---- a/setup.py
-+++ b/setup.py
-@@ -96,7 +96,8 @@ please_debug = False
- packages = [
-     'PyTango',
-     'PyTango.ipython',
--    'PyTango3'
-+    'PyTango3',
-+    'IPython.Extensions'
- ]
- 
- provides = [
--- 
diff --git a/debian/patches/0002-feature-fix-the-compilation-issue.patch b/debian/patches/0002-feature-fix-the-compilation-issue.patch
deleted file mode 100644
index e9e78b4..0000000
--- a/debian/patches/0002-feature-fix-the-compilation-issue.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Mon, 11 Apr 2011 12:13:19 +0200
-Subject: * feature fix the compilation issue.
-
----
- src/server/encoded_attribute.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/server/encoded_attribute.cpp b/src/server/encoded_attribute.cpp
-index 20e3662..f44e222 100644
---- a/src/server/encoded_attribute.cpp
-+++ b/src/server/encoded_attribute.cpp
-@@ -381,7 +381,7 @@ namespace PyEncodedAttribute
-         unsigned char *buffer;
-         int width, height;
- 
--        self.decode_gray8(attr, &width, &height, &buffer, true);
-+        self.decode_gray8(attr, &width, &height, &buffer);
-         
-         char *ch_ptr = reinterpret_cast<char *>(buffer);
-         PyObject *ret = NULL;
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0f7bc95..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-debian-install-the-spock-ipython-profile.patch
-0002-feature-fix-the-compilation-issue.patch

-- 
Packaging for pytango