[DRE-commits] [SCM] tdiary.git branch, master, updated. debian/3.0.1-1-14-g063e683
Taku YASUI
tach at debian.org
Fri May 4 11:33:45 UTC 2012
The following commit has been merged in the master branch:
commit 096bfda91dcfb92928a5d92f1ad3bdcfb495a678
Author: Taku YASUI <tach at debian.org>
Date: Fri May 4 19:50:02 2012 +0900
Fix copyright files
diff --git a/debian/tdiary-contrib.copyright b/debian/tdiary-contrib.copyright
index 1e65296..7d56da7 100644
--- a/debian/tdiary-contrib.copyright
+++ b/debian/tdiary-contrib.copyright
@@ -3,22 +3,22 @@ It was downloaded from http://sourceforge.net/projects/tdiary/.
Upstream Authors:
filter/rblcheck.rb
- Copyright (c) 2004 MoonWolf <moonwolf at moonwolf.com>
+ Copyright (C) 2004 MoonWolf <moonwolf at moonwolf.com>
License: GPL
io/dbi_io
Copyright (C) 2003 ma2tak <ma2tak at ma2tak.dyndns.org>
- (C) 2004 moonwolf <moonwolf at mooonwolf.com>
- (C) 2005 Kazuhiko <kazuhiko at fdiary.net>
- (C) 2007 sasasin <sasasin at sasasin.net>
+ 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>
+ 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>
+ Copyright (C) 2004-2005 T.Shimomura <redbug at netlife.gr.jp>
License: GPL2
plugin/bitly.rb
@@ -33,7 +33,7 @@ plugin/cocomment
License: GPL2
plugin/draft.rb
- Copyright (c) MATSUOKA Kohei <http://www.machu.jp/>
+ Copyright (C) MATSUOKA Kohei <http://www.machu.jp/>
Distributed under the GPL
plugin/google_map.rb
@@ -61,13 +61,13 @@ plugin/iddy
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>
+ 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>
+ Copyright (C) 2004,2005 kp <kp at mmho.no-ip.org>
License: GPL
plugin/instagr.rb
@@ -75,19 +75,19 @@ plugin/instagr.rb
You can redistribute it and/or modify it under GPL2.
plugin/japanese/jdate
- Copyright (c) 2003 TADA Tadashi <sho at spc.gr.jp>
+ 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>
+ 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>
+ 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>
+ Copyright (C) 2005 sasasin/SuzukiShinnosuke<sasasin at sasasin.sytes.net>
License: GPL
plugin/latlonglab_route.rb
@@ -103,11 +103,11 @@ 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>
+ Copyright (C) 2006 SHIBATA Hiroshi <h-sbt at nifty.com>
License: GPL
plugin/picasa
- Copyright (c) hb <http://www.smallstyle.com>
+ Copyright (C) hb <http://www.smallstyle.com>
Distributed under the GPL.
plugin/prezi.rb: plugin embedding presentation on prezi.com
@@ -142,7 +142,7 @@ plugin/twitter
License: GPL2
plugin/yahoo_kousei.rb
- Copyright (c) 2010, hb <http://www.smallstyle.com/>
+ Copyright (C) 2010, hb <http://www.smallstyle.com/>
You can redistribute it and/or modify it under GPL.
plugin/youtube
@@ -150,8 +150,8 @@ plugin/youtube
License: GPL2
style/hatena
- Copyright(c) 2004 URABE, Shyouhei.
- Licnese:
+ 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,
@@ -175,7 +175,7 @@ style/markdown
License: GPL
util/image-gallery
- Copyright (c) 2005-2010 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
+ 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
@@ -203,5 +203,5 @@ util/tdiarysearch/search.rb
Copyright (C) 2003,2004 Minero Aoki
License: GPL version 2
-
-GPL is written in /usr/share/common-licenses/GPL.
+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-mode.copyright b/debian/tdiary-mode.copyright
index 058fed5..cd55a97 100644
--- a/debian/tdiary-mode.copyright
+++ b/debian/tdiary-mode.copyright
@@ -5,4 +5,4 @@ Upstream Author: Junichiro Kita <kita at kitaj.no-ip.com>
Copyright: Copyright (C) 2002 Junichiro Kita
This software is licensed under the terms of GNU General Public License Version
-2 or later, which is written in /usr/share/common-licenses/GPL.
+2 or later, which is written in /usr/share/common-licenses/GPL-2.
diff --git a/debian/tdiary-plugin.copyright b/debian/tdiary-plugin.copyright
index 632cfc7..3c199ce 100644
--- a/debian/tdiary-plugin.copyright
+++ b/debian/tdiary-plugin.copyright
@@ -1,9 +1,8 @@
It was downloaded from http://sourceforge.net/projects/tdiary/.
-upstream authors and licenses, listed by `style':
+Upstream authors and licenses, listed by `style':
-a
- Copyright (c) 2002-2004 MUTOH Masao <mutoh at highway.ne.jp>
+ Copyright (C) 2002-2004 MUTOH Masao <mutoh at highway.ne.jp>
You can redistribute it and/or modify it under GPL2.
amazon
@@ -16,7 +15,7 @@ amazonimg
You can redistribute it and/or modify it under GPL2.
append-css
- Copyright (c) 2002 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <sho at spc.gr.jp>
Distributed under the GPL
bq
@@ -24,40 +23,40 @@ bq
You can redistribute it and/or modify it under GPL2.
calendar2
- Copyright (c) 2001,2002 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2001,2002 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
calendar3
- Copyright (c) 2001,2002 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2001,2002 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
category
- Copyright (c) 2003-2004 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2003-2004 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
comment_mail-qmail
- Copyright (c) 2003 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL.
comment_mail-sendmail
- Copyright (c) 2003 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL.
comment_mail-smtp
- Copyright (c) 2003 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL.
comment_rank
- Copyright (c) 2002 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL2.
counter
- Copyright (c) 2002-2006 Masao Mutoh
- Copyright (c) 2006 Masao Mutoh
+ Copyright (C) 2002-2006 Masao Mutoh
+ Copyright (C) 2006 Masao Mutoh
You can redistribute it and/or modify it under GPL2.
daily_theme
- Copyright (c) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
+ Copyright (C) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
Distributed under the GPL
disp_referrer
@@ -71,7 +70,7 @@ disp_referrer
version 2 or later.
doctype-html401tr
- Copyright (c) 2005 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2005 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL2.
dropdown_calendar
@@ -87,7 +86,7 @@ footnote
Distributed under the GPL.
gradation
- Copyright (c) 2002 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL2.
hide-mail-field
@@ -100,13 +99,13 @@ highlight
You can redistribute it and/or modify it under GPL2.
html_anchor
- Copyright (c) 2002 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <sho at spc.gr.jp>
Distributed under the GPL
image
- Copyright (c) 2002,2003 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>
+ Copyright (C) 2002,2003 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>
Distributed under the GPL
kw
@@ -114,7 +113,7 @@ kw
You can distribute this under GPL.
list
- Copyright (c) 2002 abbey <inlet at cello.no-ip.org>
+ Copyright (C) 2002 abbey <inlet at cello.no-ip.org>
Distributed under the GPL.
makelirs
@@ -122,11 +121,11 @@ makelirs
You can redistribute it and/or modify it under GPL2.
makerss
- Copyright (c) 2004 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2004 TADA Tadashi <sho at spc.gr.jp>
Distributed under the GPL
my-ex
- Copyright (c) 2002 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <sho at spc.gr.jp>
Distributed under the GPL
my-sequel
@@ -138,7 +137,7 @@ my-sequel
of GPL version 2.
navi_user
- Copyright (c) 2002 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2002 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
number_anchor
@@ -146,20 +145,20 @@ number_anchor
Distributed under the GPL
pb
- Copyright (c) 2003 Junichiro KITA <kita at kitaj.no-ip.com>
- Copyright (c) 2004 MoonWolf <moonwolf at moonwolf.com>
+ Copyright (C) 2003 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2004 MoonWolf <moonwolf at moonwolf.com>
Distributed under the GPL
pb-show
- Copyright (c) 2003 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL.
ping
- Copyright (c) 2004 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2004 TADA Tadashi <sho at spc.gr.jp>
Distributed under the GPL
pingback
- Copyright (c) 2004 MoonWolf <moonwolf at moonwolf.com>
+ Copyright (C) 2004 MoonWolf <moonwolf at moonwolf.com>
Distributed under the GPL
pre_wrap
@@ -167,34 +166,34 @@ pre_wrap
You can redistribute it and/or modify it under GPL2.
random_google
- Copyright (c) 2003 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2003 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
recent_comment
- Copyright (c) 2002 TADA Tadashi <sho at spc.gr.jp>
- Copyright (c) 2005 Hiroshi SHIBATA <h-sbt at nifty.com>
+ Copyright (C) 2002 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2005 Hiroshi SHIBATA <h-sbt at nifty.com>
You can distribute this file under the GPL2.
recent_comment3
- Copyright (c) 2002 Junichiro KITA <kita at kitaj.no-ip.com>
- Copyright (c) 2005 Hiroshi SHIBATA <h-sbt at nifty.com>
- Copyright (c) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
+ Copyright (C) 2002 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2005 Hiroshi SHIBATA <h-sbt at nifty.com>
+ Copyright (C) 2005 SHIBATA Hiroshi <h-sbt at nifty.com>
Distributed under the GPL
recent_list
- Copyright (c) 2001,2002 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2001,2002 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
recent_namazu
- Copyright (c) 2002 Hiroyuki Ikezoe <zoe at kasumi.sakura.ne.jp>
+ Copyright (C) 2002 Hiroyuki Ikezoe <zoe at kasumi.sakura.ne.jp>
Distributed under the GPL
recent_rss
- Copyright (c) 2003-2005 Kouhei Sutou <kou at cozmixng.org>
+ Copyright (C) 2003-2005 Kouhei Sutou <kou at cozmixng.org>
Distributed under the GPL
recent_trackback3
- Copyright (c) 2004 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2004 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
referer-antibot
@@ -217,15 +216,15 @@ search_control
version 2 or later.
search_form
- Copyright (c) 2002 MUTOH Masao <mutoh at highway.ne.jp>
+ Copyright (C) 2002 MUTOH Masao <mutoh at highway.ne.jp>
Distributed under the same license terms as tDiary.
sn
- Copyright (c) 2003 SAKAMOTO Hideki <hs at on-sky.net>
+ Copyright (C) 2003 SAKAMOTO Hideki <hs at on-sky.net>
Distributed under the GPL
speed_comment
- Copyright (c) 2002 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <sho at spc.gr.jp>
Distributed under the GPL
squeeze
@@ -234,27 +233,27 @@ squeeze
You can redistribute it and/or modify it under GPL2.
src
- Copyright (c) 2005 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2005 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL2.
tb
- Copyright (c) 2003 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2003 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
tb-send
- Copyright (c) 2003 Junichiro Kita <kita at kitaj.no-ip.com>
+ Copyright (C) 2003 Junichiro Kita <kita at kitaj.no-ip.com>
You can distribute this file under the GPL.
tb-show
- Copyright (c) 2003 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL.
title_list
- Copyright (c) 2005 TADA Tadashi <sho at spc.gr.jp>
+ Copyright (C) 2005 TADA Tadashi <sho at spc.gr.jp>
You can distribute this file under the GPL2.
title_tag
- Copyright (c) 2003 URABE Shyouhei <root at mput.dip.jp>
+ Copyright (C) 2003 URABE Shyouhei <root at mput.dip.jp>
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
@@ -278,7 +277,7 @@ tlink
Distributed under the GPL.
todo
- Copyright (c) 2001,2002,2003 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2001,2002,2003 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
weather
@@ -289,13 +288,14 @@ weather
of GPL version 2 or later.
whatsnew
- Copyright (c) 2002 Junichiro KITA <kita at kitaj.no-ip.com>
+ Copyright (C) 2002 Junichiro KITA <kita at kitaj.no-ip.com>
Distributed under the GPL
xmlrpc
- Copyright (c) 2004 MoonWolf <moonwolf at moonwolf.com>
+ Copyright (C) 2004 MoonWolf <moonwolf at moonwolf.com>
Distributed under the GPL
-GPL is written in /usr/share/common-licenses/GPL.
+On Debian systems, the complete text of the GNU General
+Public License can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/tdiary-theme.copyright b/debian/tdiary-theme.copyright
index e8153f1..dc1992b 100644
--- a/debian/tdiary-theme.copyright
+++ b/debian/tdiary-theme.copyright
@@ -1848,6 +1848,6 @@ zef
Access: http://d.hatena.ne.jp/clock9/
License: GPL
-
-GPL is written in /usr/share/common-licenses/GPL.
+On Debian systems, the complete text of the GNU General
+Public License can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/tdiary.copyright b/debian/tdiary.copyright
index 86a1a7a..9d7bc0c 100644
--- a/debian/tdiary.copyright
+++ b/debian/tdiary.copyright
@@ -96,4 +96,4 @@ plugin/50sp.rb
?????
This software is licensed under the terms of GNU General Public License.
-Please refere to /usr/share/common-licenses/GPL.
+Please refere to /usr/share/common-licenses/GPL-2.
--
tdiary.git
More information about the Pkg-ruby-extras-commits
mailing list