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

Picca Frédéric-Emmanuel picca at synchrotron-soleil.fr
Thu Apr 14 20:05:19 UTC 2011


The following commit has been merged in the master branch:
commit 10fd8befb00a0d29ad757ae51eec76c48742281e
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Apr 11 12:14:43 2011 +0200

    refresh the patch serie

diff --git a/debian/patches/0002-feature-fix-the-compilation-issue.patch b/debian/patches/0002-feature-fix-the-compilation-issue.patch
new file mode 100644
index 0000000..e9e78b4
--- /dev/null
+++ b/debian/patches/0002-feature-fix-the-compilation-issue.patch
@@ -0,0 +1,22 @@
+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
index 6c7e7b0..0f7bc95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-debian-install-the-spock-ipython-profile.patch
+0002-feature-fix-the-compilation-issue.patch

-- 
Packaging for pytango



More information about the debian-science-commits mailing list