[SCM] framework for TANGO control system client applications branch, master, updated. debian/3.0.0-2-27-gf14e774

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit ec2e625844f6461ec1effb0a57e65208590b08ac
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Jul 25 21:14:52 2013 +0200

    prepare for release

diff --git a/debian/changelog b/debian/changelog
index db9a073..1f15453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,10 @@
-taurus (3.0.1~svn22228-1) UNRELEASED; urgency=low
+taurus (3.1.0-1) unstable; urgency=low
 
-  * Imported Upstream version 3.0.1~svn22147
+  * Imported Upstream version 3.1.0
   * Remove patches applyed by the upstream
     - 0001-forwarded-add-no-doc-option.patch (deleted)
     - 0002-upstream-fix-for-the-FTBFS-due-to-image-conversion.patch (deleted)
     - 0003-upstream-fix-tango-icon-resources.patch (deleted)
-  * Added patch
-    - 0001-activate-the-console-and-the-shell-modules.patch (new)
-      this patch provide the missing console and shell modules
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 24 Feb 2013 18:28:28 +0100
 
diff --git a/debian/patches/0001-activate-the-console-and-the-shell-modules.patch b/debian/patches/0001-activate-the-console-and-the-shell-modules.patch
deleted file mode 100644
index 376cd4d..0000000
--- a/debian/patches/0001-activate-the-console-and-the-shell-modules.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Mon, 4 Mar 2013 19:26:35 +0100
-Subject: activate the console and the shell modules
-
----
- setup.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index ce99fea..d69f3e7 100644
---- a/setup.py
-+++ b/setup.py
-@@ -99,7 +99,7 @@ packages = [
-     'taurus.qt.qtgui.application',
-     'taurus.qt.qtgui.base',
-     'taurus.qt.qtgui.button',
--#    'taurus.qt.qtgui.console',
-+    'taurus.qt.qtgui.console',
-     'taurus.qt.qtgui.container',
-     'taurus.qt.qtgui.dialog',
-     'taurus.qt.qtgui.display',
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4e43df7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-activate-the-console-and-the-shell-modules.patch

-- 
framework for TANGO control system client applications