[SCM] Packaging for sardana branch, master, updated. debian/1.0.0_rc6-2-6-g4736c9c

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 368296b50e2936c11625818df7e0d392770cd60f
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Feb 25 14:45:42 2012 +0100

    fix the documentation build

diff --git a/debian/patches/0001-forwarded-upstream-fix-sphinxdoc-build.patch b/debian/patches/0001-forwarded-upstream-fix-sphinxdoc-build.patch
new file mode 100644
index 0000000..f50049b
--- /dev/null
+++ b/debian/patches/0001-forwarded-upstream-fix-sphinxdoc-build.patch
@@ -0,0 +1,21 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 25 Feb 2012 14:44:40 +0100
+Subject: forwarded upstream fix sphinxdoc build
+
+---
+ src/sardana/macroserver/macroserver.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/sardana/macroserver/macroserver.py b/src/sardana/macroserver/macroserver.py
+index f678f36..97d3479 100644
+--- a/src/sardana/macroserver/macroserver.py
++++ b/src/sardana/macroserver/macroserver.py
+@@ -308,7 +308,7 @@ class MacroServer(MSContainer, MSObject, SardanaElementManager, SardanaIDManager
+         evt = { "new" : new_elements, "change" : changed_elements,
+                 "del" : deleted_elements }
+         self.fire_event(EventType("ElementsChanged"), evt)
+-    reload_macro_lib.__doc__ = MacroManager.reloadMacroLib
++    reload_macro_lib.__doc__ = MacroManager.reloadMacroLib.__doc__
+     
+     def reload_macro_libs(self, lib_names):
+         for lib_name in lib_names:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c50765c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-forwarded-upstream-fix-sphinxdoc-build.patch

-- 
Packaging for sardana