[SCM] framework for TANGO control system client applications branch, master, updated. upstream/3.0.0_rc3-44-g9dc61ba

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Sat Feb 18 15:13:02 UTC 2012


The following commit has been merged in the master branch:
commit 533bb9e11b923cf2c03508599f55c3cb72127387
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Feb 12 16:29:26 2012 +0100

    update for the 3.0.0~rc4 version

diff --git a/debian/changelog b/debian/changelog
index 3fbf54e..dd3ab03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-taurus (3.0.0~rc3-1) UNRELEASED; urgency=low
+taurus (3.0.0~rc4-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #614247)
   * Thanks to Justin B Rye for package description review
diff --git a/debian/copyright b/debian/copyright
index a2bff2f..405a3f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,10 @@ License: LGPL-3+
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL'.
 
+Files:lib/taurus/qt/qtcore/util/emitter.py
+Copyright: © 2012, CELLS / ALBA Synchrotron, Bellaterra, Spain
+License: GPL-3+
+
 Files: lib/taurus/qt/qtgui/resource/external/class.png
 Copyright: ???
 License: ???
@@ -941,6 +945,24 @@ License: CC-BY-SA
      included in the License; this License is not intended to restrict
      the license of any rights under applicable law.
 
+License: GPL3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with the Debian GNU/Linux distribution in /etc/share/common-licenses/GPL.
+ If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL.
+
 License: LGPL-2.1
  Commercial Usage
  Licensees holding valid Qt Commercial licenses may use this file in

-- 
framework for TANGO control system client applications



More information about the debian-science-commits mailing list