[med-svn] [SCM] libgtextutils branch, master, updated. debian/0.6-1-8-g6e8d1c5

[Charles Plessy]

The following commit has been merged in the master branch:
commit 6741d3b184d9525899bd0e177d9c189eca8a2400
Author: Charles Plessy <plessy at debian.org>
Date:   Mon Jul 4 19:21:11 2011 +0900

    New upstream release (no new copyright or license statements).

diff --git a/debian/changelog b/debian/changelog
index d738ec8..61b73fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libgtextutils (0.6.2-1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #625365, #626757).
+
+ -- Charles Plessy <plessy at debian.org>  Mon, 04 Jul 2011 18:55:22 +0900
+
 libgtextutils (0.6-1) unstable; urgency=low
 
   * Initial release (Closes: #613486)
diff --git a/debian/copyright b/debian/copyright
index acecffe..aeb103c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://dep.debian.net/deps/dep5/
-Source: http://hannonlab.cshl.edu/fastx_toolkit/libgtextutils-0.6.tar.bz2
+Source: http://hannonlab.cshl.edu/fastx_toolkit/libgtextutils-0.6.2.tar.bz2
 
 Files: *
 Copyright: © 2008,2009 Assaf Gordon (gordon at cshl.edu)
@@ -17,31 +17,17 @@ License: AGPL-3+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>
 
+
 Files: src/gtextutils/natsort.h
 Copyright: © 2000, 2004 by Martin Pool <mbp sourcefrog net>
- © 2009 Assaf Gordon (gordon at cshl.edu)
+           © 2009 Assaf Gordon (gordon at cshl.edu)
 License: AGPL-3+ and zlib
 
+
 Files: src/gtextutils/strnatcmp.c src/gtextutils/strnatcmp.h
 Copyright: © 2000, 2004 by Martin Pool <mbp sourcefrog net>
 License: zlib
 
-License: zlib
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
- .
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
- .
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
 
 Files: src/Makefile.am src/gtextutils/Makefile.am Makefile.am m4/Makefile.am doc/Makefile.am tests/Makefile.am
 Copyright: © 2008 Assaf Gordon <gordon at cshl.edu>
@@ -54,16 +40,12 @@ License: special
   WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+
 Files: src/gtextutils/inbuf1.hpp src/gtextutils/outbuf3.hpp
 Copyright: © 1999 Nicolai M. Josuttis
- © 2009 Assaf Gordon (gordon at cshl.edu)
+           © 2009 Assaf Gordon (gordon at cshl.edu)
 License: AGPL-3+ and other
 
-License: other
-  Permission to copy, use, modify, sell and distribute this software
-  is granted provided this copyright notice appears in all copies.
-  This software is provided "as is" without express or implied
-  warranty, and with no claim as to its suitability for any purpose.
 
 License: AGPL-3+
   		    GNU AFFERO GENERAL PUBLIC LICENSE
@@ -727,3 +709,27 @@ License: AGPL-3+
   if any, to sign a "copyright disclaimer" for the program, if necessary.
   For more information on this, and how to apply and follow the GNU AGPL, see
   <http://www.gnu.org/licenses/>.
+
+License: other
+  Permission to copy, use, modify, sell and distribute this software
+  is granted provided this copyright notice appears in all copies.
+  This software is provided "as is" without express or implied
+  warranty, and with no claim as to its suitability for any purpose.
+
+License: zlib
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+ .
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+ .
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+

-- 
Gordon-Text_utils-Library