[DRE-commits] [SCM] tdiary-contrib.git branch, master, updated. upstream/3.1.20120506-9-gf012457
Taku YASUI
tach at debian.org
Sun May 6 17:58:40 UTC 2012
The following commit has been merged in the master branch:
commit a25d0bf2228528b787e074a185763f0d44b1872b
Author: Taku YASUI <tach at debian.org>
Date: Mon May 7 02:35:01 2012 +0900
Fix copyright
diff --git a/debian/copyright b/debian/copyright
index 73be805..b49ed22 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,67 +1,212 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: tDiary
+Upstream-Name: tdiary-contrib
Upstream-Contact: http://www.tdiary.org/20000102.html
-Source: https://github.com/tdiary
+Source: https://github.com/tdiary/tdiary-contrib
Copyright: (C) 2001-2010 TADA Tadashi <sho at spc.gr.jp>
-License: GPL-2
Disclaimer:
A lot of people have contributed to this software. I picked them out
at copyright file for each binary package. Please take a look at the
binary package dedicated copyright file.
-Files: tdiary.rb index.rb update.rb tdiary/defaultio.rb tdiary/pstoreio.rb
- tdiary/tdiary_style.rb tdiary/filter/default.rb
- tdiary/filter/spamakismet.rb tdiary/filter/spamlinkcheck.rb
- tdiary/lang/*.rb plugin/00default.rb plugin/50sp.rb
-Copyright: (C) 2001-2007, TADA Tadashi <sho at spc.gr.jp>
-License: GPL-2
-
-Files: misc/hikidoc.rb
-Copyright: (C) 2005, Kazuhiko <kazuhiko at fdiary.net>
-License:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * 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.
- * Neither the name of the HikiDoc 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
- OWNER 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: tdiary/wiki_style.rb
-Copyright: (C) 2003, TADA Tadashi <sho at spc.gr.jp>
- (C) 2005, Kazuhiko <kazuhiko at fdiary.net>
-License: GPL-2
-
-Files: tdiary/filter/spam.rb plugin/10spamfilter.rb
-Copyright: (C) 2005 akira yamada
-License: GPL-2
-
-Files: debian/*
-Copyright: (C) 2002-2012 Daigo Moriwaki <daigo at debian.org>
- (C) 2012 Taku YASUI <tach at debian.org>
-License: GPL-2
-
-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.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'
+filter/rblcheck.rb
+ Copyright (C) 2004 MoonWolf <moonwolf at moonwolf.com>
+ License: GPL
+
+io/dbi_io
+ Copyright (C) 2003 ma2tak <ma2tak at ma2tak.dyndns.org>
+ Copyright (C) 2004 moonwolf <moonwolf at mooonwolf.com>
+ Copyright (C) 2005 Kazuhiko <kazuhiko at fdiary.net>
+ Copyright (C) 2007 sasasin <sasasin at sasasin.net>
+ License: GPL
+
+plugin/add_bookmark
+ Copyright (C) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
+ License: GPL
+
+plugin/antirefspam
+ Copyright (C) 2004-2005 T.Shimomura <redbug at netlife.gr.jp>
+ License: GPL2
+
+plugin/bitly.rb
+ Copyright (C) 2010, TADA Tadashi <t at tdtds.jp>
+ You can redistribute it and/or modify it under GPL.
+
+plugin/category_similar.rb:
+ You can redistribute it and/or modify it under the same license as tDiary.
+
+plugin/cocomment
+ Copyright (C) 2006 by Hiroshi SHIBATA
+ License: GPL2
+
+plugin/draft.rb
+ Copyright (C) MATSUOKA Kohei <http://www.machu.jp/>
+ Distributed under the GPL
+
+plugin/google_map.rb
+ Copyright (C) 2010, tamoot <tamoot+tdiary at gmail.com>
+ You can redistribute it and/or modify it under GPL2.
+
+plugin/google/google_adsense
+ Copyright (C) 2004 Kazuhiko <kazuhiko at fdiary.net>
+ License: GPL2
+
+plugin/google/google_analytics
+ Copyright (C) 2005 TADA Tadashi <sho at spc.gr.jp>
+ License: GPL2
+
+plugin/google/google_video
+ Copyright (C) 2007 by KAKUTANI Shintaro <shintaro at kakutani.com>
+ License: GPL2
+
+plugin/hatena/hatena_star
+ Copyright (C) Itoshi Nikaido <dritoshi at gmail dot com>
+ Distributed under the GPL
+
+plugin/iddy
+ Copyright (C) 2007 by TADA Tadashi <sho at spc.gr.jp>
+ License: GPL
+
+plugin/image_ex
+ Copyright (C) 2002 Daisuke Kato <dai at kato-agri.com>
+ Copyright (C) 2002 Toshi Okada <toshi at neverland.to>
+ Copyright (C) 2003 Yoshimi KURUMA <yoshimik at iris.dti.ne.jp>
+ License: GPL2
+
+plugin/image_gps
+ Copyright (C) 2004,2005 kp <kp at mmho.no-ip.org>
+ License: GPL
+
+plugin/instagr.rb
+ Copyright (C) 2011, tamoot <tamoot+tdiary at gmail.com>
+ You can redistribute it and/or modify it under GPL2.
+
+plugin/japanese/jdate
+ Copyright (C) 2003 TADA Tadashi <sho at spc.gr.jp>
+ License: GPL
+
+plugin/japanese/jmonth.rb
+ Copyright (C) 2005 sasasin/SuzukiShinnosuke<sasasin at sasasin.sytes.net>
+ License: GPL
+
+plugin/japanese/jroku.rb
+ Copyright (C) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
+ License: GPL
+
+plugin/japanese/jyear.rb
+ Copyright (C) 2005 sasasin/SuzukiShinnosuke<sasasin at sasasin.sytes.net>
+ License: GPL
+
+plugin/latlonglab_route.rb
+ Copyright (C) 2009, Michitaka Ohno <elpeo at mars.dti.ne.jp>
+ Copyright (C) 2010, KAYA Satoshi <kayakaya at kayakaya.net>
+ You can redistribute it and/or modify it under GPL2.
+
+plugin/livedoor
+ Copyright (C) 2007 SHIBATA Hiroshi <h-sbt at nifty.com>
+ License: GPL2
+
+plugin/ohmsha_estore.rb
+ You can redistribute it and/or modify it under the same license as tDiary.
+
+plugin/opensearch_ad
+ Copyright (C) 2006 SHIBATA Hiroshi <h-sbt at nifty.com>
+ License: GPL
+
+plugin/picasa
+ Copyright (C) hb <http://www.smallstyle.com>
+ Distributed under the GPL.
+
+plugin/prezi.rb: plugin embedding presentation on prezi.com
+ Copyright (C) 2010 TADA Tadashi <t at tdtds.jp>
+ You can redistribute it and/or modify it under GPL2.
+
+plugin/recemt_tweet.rb
+ Copyright (C) 2007 by Nishimoto Masaki <gaju at gaju.jp>
+ Distributed under GPL.
+
+plugin/retweet.rb
+ Copyright (C) 2010, MATSUOKA Kohei <http://www.machu.jp/diary/>
+ You can redistribute it and/or modify it under GPL2.
+
+plugin/section_footer
+ Copyright (c) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
+ License: GPL2
+
+plugin/select_theme
+ Copyright (C) 2005 akira yamada
+ License: GPL2
+
+plugin/tatsu_zine.rb
+ You can redistribute it and/or modify it under the same license as tDiary.
+
+plugin/twitpic.rb
+ Copyright (C) 2010 TADA Tadashi <t at tdtds.jp>
+ You can redistribute it and/or modify it under GPL2.
+
+plugin/twitter
+ Copyright (C) 2007 Michitaka Ohno <elpeo at mars.dti.ne.jp>
+ License: GPL2
+
+plugin/yahoo_kousei.rb
+ Copyright (C) 2010, hb <http://www.smallstyle.com/>
+ You can redistribute it and/or modify it under GPL.
+
+plugin/youtube
+ Copyright (C) 2007 by TADA Tadashi <sho at spc.gr.jp>
+ License: GPL2
+
+style/hatena
+ Copyright (C) 2004 URABE, Shyouhei.
+ License:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this code, to deal in the code without restriction, including without
+ limitation the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the code, and to permit persons to whom the
+ code 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 code.
+
+ THE CODE 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
+ AUTHOR OR COPYRIGHT HOLDER 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 CODE OR THE USE OR OTHER DEALINGS IN THE
+ CODE.
+
+style/markdown
+ Copyright (C) 2003, TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2004, MoonWolf <moonwolf at moonwolf.com>
+ License: GPL
+
+util/image-gallery
+ Copyright (C) 2005-2010 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
+ You can redistribute it and/or modify it under GPL2.
+
+util/clean-spam
+ Copyright (C) 2004 Satoru Takabayashi <satoru at namazu.org>
+ License: GPL2
+
+util/estraier-search
+ Copyright (C) 2007 Kazuhiko <kazuhiko at fdiary.net>
+ License: GPL2
+
+util/posttdiary
+ Copyright (C) 2002, All right reserved by TADA Tadashi <sho at spc.gr.jp>
+ License: GPL2
+
+util/rast-search
+ Copyright (C) 2005 Kazuhiko <kazuhiko at fdiary.net>
+ License: GPL2
+
+util/tdiary-vim
+ Author: UECHI Yasumasa <uechi at .potaway.net>
+ Copyright (C) 2004 UECHI Yasumasa
+ License: GPL version 2 or later
+
+util/tdiarysearch/search.rb
+ Copyright (C) 2003,2004 Minero Aoki
+ License: GPL version 2
+
+On Debian systems, the complete text of the GNU Library General
+Public License can be found in "/usr/share/common-licenses/LGPL-2".
diff --git a/debian/tdiary-contrib.copyright b/debian/tdiary-contrib.copyright
deleted file mode 100644
index 7d56da7..0000000
--- a/debian/tdiary-contrib.copyright
+++ /dev/null
@@ -1,207 +0,0 @@
-It was downloaded from http://sourceforge.net/projects/tdiary/.
-
-Upstream Authors:
-
-filter/rblcheck.rb
- Copyright (C) 2004 MoonWolf <moonwolf at moonwolf.com>
- License: GPL
-
-io/dbi_io
- Copyright (C) 2003 ma2tak <ma2tak at ma2tak.dyndns.org>
- Copyright (C) 2004 moonwolf <moonwolf at mooonwolf.com>
- Copyright (C) 2005 Kazuhiko <kazuhiko at fdiary.net>
- Copyright (C) 2007 sasasin <sasasin at sasasin.net>
- License: GPL
-
-plugin/add_bookmark
- Copyright (C) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
- License: GPL
-
-plugin/antirefspam
- Copyright (C) 2004-2005 T.Shimomura <redbug at netlife.gr.jp>
- License: GPL2
-
-plugin/bitly.rb
- Copyright (C) 2010, TADA Tadashi <t at tdtds.jp>
- You can redistribute it and/or modify it under GPL.
-
-plugin/category_similar.rb:
- You can redistribute it and/or modify it under the same license as tDiary.
-
-plugin/cocomment
- Copyright (C) 2006 by Hiroshi SHIBATA
- License: GPL2
-
-plugin/draft.rb
- Copyright (C) MATSUOKA Kohei <http://www.machu.jp/>
- Distributed under the GPL
-
-plugin/google_map.rb
- Copyright (C) 2010, tamoot <tamoot+tdiary at gmail.com>
- You can redistribute it and/or modify it under GPL2.
-
-plugin/google/google_adsense
- Copyright (C) 2004 Kazuhiko <kazuhiko at fdiary.net>
- License: GPL2
-
-plugin/google/google_analytics
- Copyright (C) 2005 TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-plugin/google/google_video
- Copyright (C) 2007 by KAKUTANI Shintaro <shintaro at kakutani.com>
- License: GPL2
-
-plugin/hatena/hatena_star
- Copyright (C) Itoshi Nikaido <dritoshi at gmail dot com>
- Distributed under the GPL
-
-plugin/iddy
- Copyright (C) 2007 by TADA Tadashi <sho at spc.gr.jp>
- License: GPL
-
-plugin/image_ex
- Copyright (C) 2002 Daisuke Kato <dai at kato-agri.com>
- Copyright (C) 2002 Toshi Okada <toshi at neverland.to>
- Copyright (C) 2003 Yoshimi KURUMA <yoshimik at iris.dti.ne.jp>
- License: GPL2
-
-plugin/image_gps
- Copyright (C) 2004,2005 kp <kp at mmho.no-ip.org>
- License: GPL
-
-plugin/instagr.rb
- Copyright (C) 2011, tamoot <tamoot+tdiary at gmail.com>
- You can redistribute it and/or modify it under GPL2.
-
-plugin/japanese/jdate
- Copyright (C) 2003 TADA Tadashi <sho at spc.gr.jp>
- License: GPL
-
-plugin/japanese/jmonth.rb
- Copyright (C) 2005 sasasin/SuzukiShinnosuke<sasasin at sasasin.sytes.net>
- License: GPL
-
-plugin/japanese/jroku.rb
- Copyright (C) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
- License: GPL
-
-plugin/japanese/jyear.rb
- Copyright (C) 2005 sasasin/SuzukiShinnosuke<sasasin at sasasin.sytes.net>
- License: GPL
-
-plugin/latlonglab_route.rb
- Copyright (C) 2009, Michitaka Ohno <elpeo at mars.dti.ne.jp>
- Copyright (C) 2010, KAYA Satoshi <kayakaya at kayakaya.net>
- You can redistribute it and/or modify it under GPL2.
-
-plugin/livedoor
- Copyright (C) 2007 SHIBATA Hiroshi <h-sbt at nifty.com>
- License: GPL2
-
-plugin/ohmsha_estore.rb
- You can redistribute it and/or modify it under the same license as tDiary.
-
-plugin/opensearch_ad
- Copyright (C) 2006 SHIBATA Hiroshi <h-sbt at nifty.com>
- License: GPL
-
-plugin/picasa
- Copyright (C) hb <http://www.smallstyle.com>
- Distributed under the GPL.
-
-plugin/prezi.rb: plugin embedding presentation on prezi.com
- Copyright (C) 2010 TADA Tadashi <t at tdtds.jp>
- You can redistribute it and/or modify it under GPL2.
-
-plugin/recemt_tweet.rb
- Copyright (C) 2007 by Nishimoto Masaki <gaju at gaju.jp>
- Distributed under GPL.
-
-plugin/retweet.rb
- Copyright (C) 2010, MATSUOKA Kohei <http://www.machu.jp/diary/>
- You can redistribute it and/or modify it under GPL2.
-
-plugin/section_footer
- Copyright (c) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
- License: GPL2
-
-plugin/select_theme
- Copyright (C) 2005 akira yamada
- License: GPL2
-
-plugin/tatsu_zine.rb
- You can redistribute it and/or modify it under the same license as tDiary.
-
-plugin/twitpic.rb
- Copyright (C) 2010 TADA Tadashi <t at tdtds.jp>
- You can redistribute it and/or modify it under GPL2.
-
-plugin/twitter
- Copyright (C) 2007 Michitaka Ohno <elpeo at mars.dti.ne.jp>
- License: GPL2
-
-plugin/yahoo_kousei.rb
- Copyright (C) 2010, hb <http://www.smallstyle.com/>
- You can redistribute it and/or modify it under GPL.
-
-plugin/youtube
- Copyright (C) 2007 by TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-style/hatena
- Copyright (C) 2004 URABE, Shyouhei.
- License:
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this code, to deal in the code without restriction, including without
- limitation the rights to use, copy, modify, merge, publish, distribute,
- sublicense, and/or sell copies of the code, and to permit persons to whom the
- code 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 code.
-
- THE CODE 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
- AUTHOR OR COPYRIGHT HOLDER 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 CODE OR THE USE OR OTHER DEALINGS IN THE
- CODE.
-
-style/markdown
- Copyright (C) 2003, TADA Tadashi <sho at spc.gr.jp>
- Copyright (C) 2004, MoonWolf <moonwolf at moonwolf.com>
- License: GPL
-
-util/image-gallery
- Copyright (C) 2005-2010 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
- You can redistribute it and/or modify it under GPL2.
-
-util/clean-spam
- Copyright (C) 2004 Satoru Takabayashi <satoru at namazu.org>
- License: GPL2
-
-util/estraier-search
- Copyright (C) 2007 Kazuhiko <kazuhiko at fdiary.net>
- License: GPL2
-
-util/posttdiary
- Copyright (C) 2002, All right reserved by TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-util/rast-search
- Copyright (C) 2005 Kazuhiko <kazuhiko at fdiary.net>
- License: GPL2
-
-util/tdiary-vim
- Author: UECHI Yasumasa <uechi at .potaway.net>
- Copyright (C) 2004 UECHI Yasumasa
- License: GPL version 2 or later
-
-util/tdiarysearch/search.rb
- Copyright (C) 2003,2004 Minero Aoki
- License: GPL version 2
-
-On Debian systems, the complete text of the GNU Library General
-Public License can be found in "/usr/share/common-licenses/LGPL-2".
--
tdiary-contrib.git
More information about the Pkg-ruby-extras-commits
mailing list