[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:46 UTC 2012
The following commit has been merged in the master branch:
commit 6a17aaf87db74f4403b94c6eb4933fa1dad58173
Author: Taku YASUI <tach at debian.org>
Date: Fri May 4 20:00:15 2012 +0900
Move debian/tdiary.copyright to debian/copyright
diff --git a/debian/copyright b/debian/copyright
index 769386c..6011c16 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,51 @@ Disclaimer:
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>
diff --git a/debian/tdiary.copyright b/debian/tdiary.copyright
deleted file mode 100644
index 9d7bc0c..0000000
--- a/debian/tdiary.copyright
+++ /dev/null
@@ -1,99 +0,0 @@
-It was downloaded from http://sourceforge.net/projects/tdiary/.
-
-Upstream Author: TADA Tadashi <sho at spc.gr.jp>
-
-Copyright:
-
-tdiary.rb
- Copyright (C) 2001-2005, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-index.rb
- Copyright (C) 2001-2003, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-update.rb
- Copyright (C) 2001-2003, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-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.
-
-tdiary/defaultio.rb
- Copyright (C) 2001-2005, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-tdiary/pstoreio.rb
- Copyright (C) 2001-2005, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-tdiary/wiki_style.rb
- Copyright (C) 2003, TADA Tadashi <sho at spc.gr.jp>
- Copyright (C) 2005, Kazuhiko <kazuhiko at fdiary.net>
- License: GPL
-
-tdiary/tdiary_style.rb
- Copyright (C) 2001-2005, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-tdiary/filter/default.rb
- Copyright (C) 2001-2005, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-tdiary/filter/spam.rb
- Copyright (C) 2005 akira yamada
- License: GPL2
-
-tdiary/filter/spamakismet.rb
- Copyright (C) TADA Tadashi <sho at spc.gr.jp> 2007.
- License: GPL2
-
-tdiary/filter/spamlinkcheck.rb
- Copyright (C) 2007 by TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-tdiary/lang/{en|ja|zh}.rb
- Copyright (C) 2001-2005, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-plugin/00default.rb
- Copyright (C) 2001-2005, TADA Tadashi <sho at spc.gr.jp>
- License: GPL2
-
-plugin/10spamfilter.rb
- Copyright (C) 2005 akira yamada
- License: GPL2
-
-plugin/50sp.rb
- ?????
- ?????
-
-This software is licensed under the terms of GNU General Public License.
-Please refere to /usr/share/common-licenses/GPL-2.
--
tdiary.git
More information about the Pkg-ruby-extras-commits
mailing list