[cg3] 02/02: Imported Debian patch 0.9.9~r10190-1

Tino Didriksen tinodidriksen-guest at moszumanska.debian.org
Mon Oct 6 12:20:07 UTC 2014


This is an automated email from the git hooks/post-receive script.

tinodidriksen-guest pushed a commit to branch master
in repository cg3.

commit ada98e14d5730307ed1dc081f8f5a2b99acbb79f
Merge: cff5632 fcc6961
Author: Tino Didriksen <mail at tinodidriksen.com>
Date:   Fri Oct 3 10:31:01 2014 +0000

    Imported Debian patch 0.9.9~r10190-1

 debian/changelog |   2 +-
 debian/copyright | 113 +++++++++++++++++++++++++++++++++++++++++--------------
 src/version.hpp  |   4 +-
 3 files changed, 87 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index c36a5f0,0000000..2be935a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- cg3 (0.9.8.10184-1) experimental; urgency=low
++cg3 (0.9.9~r10190-1) experimental; urgency=low
 +
 +  * Initial release (Closes: #475452)
 +
 + -- Tino Didriksen <mail at tinodidriksen.com>  Fri, 3 Oct 2014 10:31:01 +0000
diff --cc debian/copyright
index a474fe8,0000000..d6ed135
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,75 -1,0 +1,130 @@@
 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: cg3
 +Upstream-Contact: Tino Didriksen <mail at tinodidriksen.com>
 +Source: http://visl.sdu.dk/cg3.html
 +
 +Files: *
 +Copyright: 2007-2014 GrammarSoft ApS <info at grammarsoft.com>
 +License: GPL-3+
 + 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 this program.  If not, see <http://www.gnu.org/licenses/>.
 + .
 + On Debian systems, the complete text of the GNU General
 + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 +
++Files: emacs/*
++Copyright: 2010-2013 Kevin Brubeck Unhammer <unhammer at fsfe.org>
++License: GPL-2+
++ 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 2 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 this program.  If not, see <http://www.gnu.org/licenses/>.
++ .
++ On Debian systems, the complete text of the GNU General
++ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
++
++Files: CMake/FindBoost.cmake
++Copyright: 2006-2009 Kitware, Inc.
++License: BSD-3-clause
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are met:
++ .
++ 1) Redistributions of source code must retain the above copyright notice,
++ this list of conditions and the following disclaimer.
++ .
++ 2) Redistributions in binary form must reproduce the above copyright notice,
++ this list of conditions and the following disclaimer in the documentation
++ and/or other materials provided with the distribution.
++ .
++ 3) Neither the name of the ORGANIZATION nor the names of its contributors
++ may be used to endorse or promote products derived from this software
++ without specific prior written permission.
++ .
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ POSSIBILITY OF SUCH DAMAGE.
++
++Files: include/exec-stream/*
++Copyright: 2004 Artem Khodush
++License: BSD-3-clause
++
 +Files: include/cycle.h
 +Copyright: 2003, 2007-8 Matteo Frigo
-            2003, 2007-8 Massachusetts Institute of Technology
- License: MIT
++ 2003, 2007-8 Massachusetts Institute of Technology
++License: Expat
 + Permission is hereby granted, free of charge, to any person obtaining
 + a copy of this software and associated documentation files (the
 + "Software"), to deal in the Software without restriction, including
 + without limitation the rights to use, copy, modify, merge, publish,
 + distribute, sublicense, and/or sell copies of the Software, and to
 + permit persons to whom the Software is furnished to do so, subject to
 + the following conditions:
 + .
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
++ The above copyright notice and this permission notice shall be included
++ in all copies or substantial portions of the Software.
 + .
 + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 +
- Files: src/icu_uoptions.cpp
- Copyright: 2000, International Business Machines Corporation and others.
- License: MIT
-  All Rights Reserved.
-  .
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
++Files: include/uoptions.h
++ src/icu_uoptions.cpp
++Copyright: 1995-2014 International Business Machines Corporation and others
++License: ICU
++ Permission is hereby granted, free of charge, to any person obtaining a
++ copy of this software and associated documentation files (the
 + "Software"), to deal in the Software without restriction, including
 + without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
++ distribute, and/or sell copies of the Software, and to permit persons
++ to whom the Software is furnished to do so, provided that the above
++ copyright notice(s) and this permission notice appear in all copies of
++ the Software and that both the above copyright notice(s) and this
++ permission notice appear in supporting documentation.
 + .
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
++ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
++ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
++ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
++ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
++ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
++ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 + .
 + Except as contained in this notice, the name of a copyright holder
 + shall not be used in advertising or otherwise to promote the sale, use
 + or other dealings in this Software without prior written authorization
 + of the copyright holder.
++ .
++ A copy of the license is provided in the source tree as license.icu.txt
++ or can be read at http://icu-project.org/license

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cg3.git



More information about the debian-science-commits mailing list