[SCM] dataset manipulation GUI generator branch, master, updated. upstream/1.2.4-35-g6d5ad89

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 6d5ad892d0b1b3f5b1a2e6320dc71a2208d1dfe2
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sun Mar 6 22:55:40 2011 +0100

    manage the patch queue with gbp-pq

diff --git a/debian/patches/0001-debian-changes-1.2.5-1.patch b/debian/patches/0001-debian-changes-1.2.5-1.patch
new file mode 100644
index 0000000..bdd40fb
--- /dev/null
+++ b/debian/patches/0001-debian-changes-1.2.5-1.patch
@@ -0,0 +1,22 @@
+From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Date: Sun, 6 Mar 2011 22:54:19 +0100
+Subject: debian-changes-1.2.5-1
+
+---
+ doc/conf.py |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index 3616f09..b3588a2 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -94,6 +94,8 @@ modindex_common_prefix = ['guidata.']
+ 
+ # -- Options for HTML output ---------------------------------------------------
+ 
++html_copy_source=False
++
+ # The theme to use for HTML and HTML Help pages.  Major themes that come with
+ # Sphinx are currently 'default' and 'sphinxdoc'.
+ html_theme = 'sphinxdoc'
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4793191
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-debian-changes-1.2.5-1.patch

-- 
dataset manipulation GUI generator