Package: tdiary
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From c209704bcee924947fc0132b66d210b9601228aa Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 29 Apr 2012 09:01:49 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 4 -
debian/changelog | 13 +++
debian/compat | 2 +-
debian/control | 16 ++--
debian/{tdiary.copyright => copyright} | 2 +-
debian/patches/00list | 1 -
debian/patches/{10_core.dpatch => 10-core.patch} | 8 +-
debian/patches/series | 1 +
debian/rules | 28 +++---
debian/source/format | 1 +
debian/tdiary-contrib.copyright | 46 +++++-----
debian/tdiary-mode.copyright | 2 +-
debian/tdiary-plugin.copyright | 104 +++++++++++-----------
debian/tdiary-theme.copyright | 4 +-
14 files changed, 115 insertions(+), 117 deletions(-)
delete mode 100644 debian/README.source
rename debian/{tdiary.copyright => copyright} (98%)
delete mode 100644 debian/patches/00list
rename debian/patches/{10_core.dpatch => 10-core.patch} (85%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index eeb7306..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-Consult /usr/share/doc/dpatch/README.source.gz.
-
----
-2010-03-09 Daigo Moriwaki <daigo at debian dot org>
diff --git a/debian/changelog b/debian/changelog
index b7e1393..c70b498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tdiary (3.0.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix no-debian-copyright (Lintian).
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix extra-license-file license.txt (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 29 Apr 2012 09:00:44 +0300
+
tdiary (3.0.1-1) unstable; urgency=low
* New upstream release (Closes: #542801, #594947)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 6273f51..c983531 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: tdiary
Section: web
Priority: optional
Maintainer: Daigo Moriwaki <da...@debian.org>
-Build-Depends: debhelper (>> 5), dpatch, docbook-to-man
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), docbook-to-man
+Standards-Version: 3.9.3
Homepage: http://www.tdiary.org/
Package: tdiary
@@ -11,10 +11,11 @@ Architecture: all
Depends: ${misc:Depends}, ruby (>= 1.8), libuconv-ruby1.8, rdtool, libdpkg-ruby1.8
Suggests: tdiary-mode, tdiary-contrib (>= 3.0), tdiary-contrib (<< 3.1)
Recommends: tdiary-theme (= ${source:Version}), tdiary-plugin (= ${source:Version}),
-Description: a communication-friendly weblog system
+Description: communication-friendly weblog system
tDiary is a weblog system, which makes your weblog communication-friendly for
the writer (you) and readers. It consists of Ruby scripts for CGI (Common
- Gateway Interface). The followings are the main features.
+ Gateway Interface). The followings are the main features:
+ .
* Comments: readers can post comments to each entry like message boards.
* Links: Each entry can show referers from which readers come so that you
can see others write about the entry.
@@ -33,14 +34,14 @@ Package: tdiary-theme
Architecture: all
Depends: ${misc:Depends}
Suggests: tdiary
-Description: Themes of tDiary to change the design
+Description: themes of tDiary to change the design
This package includes a lot of Cascading Style Sheets, which change the design
of tDiary. You can choose a theme at the configuration page.
Package: tdiary-plugin
Architecture: all
Depends: ${misc:Depends}, tdiary (= ${source:Version}), ruby (>= 1.8), libnora-ruby1.8
-Description: Plugins of tDiary to add functionalities
+Description: plugins of tDiary to add functionalities
This package includes a lot of plugins that add functionalities to tDiary; for
instance there are calendar, categories, footnotes, images, RSS (RDF Site
Summary), search form, title lists, TODOs, what's new and so on.
@@ -56,8 +57,7 @@ Package: tdiary-contrib
Architecture: all
Depends: ${misc:Depends}, tdiary (>= 3.0), tdiary (<< 3.1), ruby (>= 1.8), curl
Suggests: libestraier-ruby1.8, hyperestraier
-Description: Plugins of tDiary to add functionalities
+Description: plugins of tDiary to add functionalities
This package includes optional utilities and plugins for tDiary. They are
valuable but not so useful for general users. Some can not be completely
internationalized.
-
diff --git a/debian/tdiary.copyright b/debian/copyright
similarity index 98%
rename from debian/tdiary.copyright
rename to debian/copyright
index 86a1a7a..9d7bc0c 100644
--- a/debian/tdiary.copyright
+++ b/debian/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.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fb8ed0a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_core
diff --git a/debian/patches/10_core.dpatch b/debian/patches/10-core.patch
similarity index 85%
rename from debian/patches/10_core.dpatch
rename to debian/patches/10-core.patch
index 806e822..1905b49 100644
--- a/debian/patches/10_core.dpatch
+++ b/debian/patches/10-core.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## core.dpatch by Daigo Moriwaki <da...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Daigo Moriwaki <da...@debian.org>
+Subject: Add <Files squeeze.rb> section
-@DPATCH@
diff -urNad 2.0.2+20060303~/dot.htaccess 2.0.2+20060303/dot.htaccess
--- 2.0.2+20060303~/dot.htaccess 2006-03-04 01:25:00.000000000 +0900
+++ 2.0.2+20060303/dot.htaccess 2006-03-04 23:45:38.000000000 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..076eab3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-core.patch
diff --git a/debian/rules b/debian/rules
index 13eb6da..460ab9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,15 +14,19 @@ manpages = tdiary-setup.1 tdiary-convert2.1
$(manpages): %.1: debian/%.sgml
docbook-to-man $< > $@
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch $(manpages)
+build-stamp: $(manpages)
@echo "--- Compiling"
dh_testdir
# Do something to build your package here
# touch build-stamp
-clean: clean1 unpatch
+clean: clean1
clean1:
@echo "--- Cleaning"
dh_testdir
@@ -35,7 +39,7 @@ clean1:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/tdiary.
@@ -94,6 +98,8 @@ install: build
find $(CURDIR)/debian/$$d -type d -name ".svn" | xargs rm -rf ; \
done
+ find debian -name license.txt | xargs -r rm -f
+
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
@@ -118,23 +124,9 @@ binary-indep: build install
dh_md5sums -i
dh_builddeb -i
-
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-
-# You can do more things with dpatch, like having patches only applied on
-# a special architecture - see the non-dh version of the sample for this!
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- #dpatch call-all -a=pkg-info >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
# Build architecture-dependent files here.
binary-arch: build install
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
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 <moonw...@moonwolf.com>
+ Copyright (C) 2004 MoonWolf <moonw...@moonwolf.com>
License: GPL
io/dbi_io
Copyright (C) 2003 ma2tak <ma2...@ma2tak.dyndns.org>
- (C) 2004 moonwolf <moonw...@mooonwolf.com>
- (C) 2005 Kazuhiko <kazuh...@fdiary.net>
- (C) 2007 sasasin <sasa...@sasasin.net>
+ Copyright (C) 2004 moonwolf <moonw...@mooonwolf.com>
+ Copyright (C) 2005 Kazuhiko <kazuh...@fdiary.net>
+ Copyright (C) 2007 sasasin <sasa...@sasasin.net>
License: GPL
plugin/add_bookmark
- Copyright (c) 2005 SHIBATA Hiroshi <h-...@nifty.com>
+ Copyright (C) 2005 SHIBATA Hiroshi <h-...@nifty.com>
License: GPL
plugin/antirefspam
- Copyright (c) 2004-2005 T.Shimomura <red...@netlife.gr.jp>
+ Copyright (C) 2004-2005 T.Shimomura <red...@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 <d...@kato-agri.com>
- Copyright (c) 2002 Toshi Okada <to...@neverland.to>
- Copyright (c) 2003 Yoshimi KURUMA <yoshi...@iris.dti.ne.jp>
+ Copyright (C) 2002 Daisuke Kato <d...@kato-agri.com>
+ Copyright (C) 2002 Toshi Okada <to...@neverland.to>
+ Copyright (C) 2003 Yoshimi KURUMA <yoshi...@iris.dti.ne.jp>
License: GPL2
plugin/image_gps
- Copyright (c) 2004,2005 kp <k...@mmho.no-ip.org>
+ Copyright (C) 2004,2005 kp <k...@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 <s...@spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <s...@spc.gr.jp>
License: GPL
plugin/japanese/jmonth.rb
- Copyright (c) 2005 sasasin/SuzukiShinnosuke<sasa...@sasasin.sytes.net>
+ Copyright (C) 2005 sasasin/SuzukiShinnosuke<sasa...@sasasin.sytes.net>
License: GPL
plugin/japanese/jroku.rb
- Copyright (c) 2005 SHIBATA Hiroshi <h-...@nifty.com>
+ Copyright (C) 2005 SHIBATA Hiroshi <h-...@nifty.com>
License: GPL
plugin/japanese/jyear.rb
- Copyright (c) 2005 sasasin/SuzukiShinnosuke<sasa...@sasasin.sytes.net>
+ Copyright (C) 2005 sasasin/SuzukiShinnosuke<sasa...@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-...@nifty.com>
+ Copyright (C) 2006 SHIBATA Hiroshi <h-...@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 <k...@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 <mu...@highway.ne.jp>
+ Copyright (C) 2002-2004 MUTOH Masao <mu...@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 <s...@spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <s...@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 <k...@kitaj.no-ip.com>
+ Copyright (C) 2001,2002 Junichiro KITA <k...@kitaj.no-ip.com>
Distributed under the GPL
calendar3
- Copyright (c) 2001,2002 Junichiro KITA <k...@kitaj.no-ip.com>
+ Copyright (C) 2001,2002 Junichiro KITA <k...@kitaj.no-ip.com>
Distributed under the GPL
category
- Copyright (c) 2003-2004 Junichiro KITA <k...@kitaj.no-ip.com>
+ Copyright (C) 2003-2004 Junichiro KITA <k...@kitaj.no-ip.com>
Distributed under the GPL
comment_mail-qmail
- Copyright (c) 2003 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <s...@spc.gr.jp>
You can distribute this file under the GPL.
comment_mail-sendmail
- Copyright (c) 2003 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <s...@spc.gr.jp>
You can distribute this file under the GPL.
comment_mail-smtp
- Copyright (c) 2003 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <s...@spc.gr.jp>
You can distribute this file under the GPL.
comment_rank
- Copyright (c) 2002 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <s...@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-...@nifty.com>
+ Copyright (C) 2005 SHIBATA Hiroshi <h-...@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 <s...@spc.gr.jp>
+ Copyright (C) 2005 TADA Tadashi <s...@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 <s...@spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <s...@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 <s...@spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <s...@spc.gr.jp>
Distributed under the GPL
image
- Copyright (c) 2002,2003 Daisuke Kato <d...@kato-agri.com>
- Copyright (c) 2002 Toshi Okada <to...@neverland.to>
- Copyright (c) 2003 Yoshimi KURUMA <yoshi...@iris.dti.ne.jp>
+ Copyright (C) 2002,2003 Daisuke Kato <d...@kato-agri.com>
+ Copyright (C) 2002 Toshi Okada <to...@neverland.to>
+ Copyright (C) 2003 Yoshimi KURUMA <yoshi...@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 <in...@cello.no-ip.org>
+ Copyright (C) 2002 abbey <in...@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 <s...@spc.gr.jp>
+ Copyright (C) 2004 TADA Tadashi <s...@spc.gr.jp>
Distributed under the GPL
my-ex
- Copyright (c) 2002 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <s...@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 <k...@kitaj.no-ip.com>
+ Copyright (C) 2002 Junichiro KITA <k...@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 <k...@kitaj.no-ip.com>
- Copyright (c) 2004 MoonWolf <moonw...@moonwolf.com>
+ Copyright (C) 2003 Junichiro KITA <k...@kitaj.no-ip.com>
+ Copyright (C) 2004 MoonWolf <moonw...@moonwolf.com>
Distributed under the GPL
pb-show
- Copyright (c) 2003 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <s...@spc.gr.jp>
You can distribute this file under the GPL.
ping
- Copyright (c) 2004 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2004 TADA Tadashi <s...@spc.gr.jp>
Distributed under the GPL
pingback
- Copyright (c) 2004 MoonWolf <moonw...@moonwolf.com>
+ Copyright (C) 2004 MoonWolf <moonw...@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 <k...@kitaj.no-ip.com>
+ Copyright (C) 2003 Junichiro KITA <k...@kitaj.no-ip.com>
Distributed under the GPL
recent_comment
- Copyright (c) 2002 TADA Tadashi <s...@spc.gr.jp>
- Copyright (c) 2005 Hiroshi SHIBATA <h-...@nifty.com>
+ Copyright (C) 2002 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2005 Hiroshi SHIBATA <h-...@nifty.com>
You can distribute this file under the GPL2.
recent_comment3
- Copyright (c) 2002 Junichiro KITA <k...@kitaj.no-ip.com>
- Copyright (c) 2005 Hiroshi SHIBATA <h-...@nifty.com>
- Copyright (c) 2005 SHIBATA Hiroshi <h-...@nifty.com>
+ Copyright (C) 2002 Junichiro KITA <k...@kitaj.no-ip.com>
+ Copyright (C) 2005 Hiroshi SHIBATA <h-...@nifty.com>
+ Copyright (C) 2005 SHIBATA Hiroshi <h-...@nifty.com>
Distributed under the GPL
recent_list
- Copyright (c) 2001,2002 Junichiro KITA <k...@kitaj.no-ip.com>
+ Copyright (C) 2001,2002 Junichiro KITA <k...@kitaj.no-ip.com>
Distributed under the GPL
recent_namazu
- Copyright (c) 2002 Hiroyuki Ikezoe <z...@kasumi.sakura.ne.jp>
+ Copyright (C) 2002 Hiroyuki Ikezoe <z...@kasumi.sakura.ne.jp>
Distributed under the GPL
recent_rss
- Copyright (c) 2003-2005 Kouhei Sutou <k...@cozmixng.org>
+ Copyright (C) 2003-2005 Kouhei Sutou <k...@cozmixng.org>
Distributed under the GPL
recent_trackback3
- Copyright (c) 2004 Junichiro KITA <k...@kitaj.no-ip.com>
+ Copyright (C) 2004 Junichiro KITA <k...@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 <mu...@highway.ne.jp>
+ Copyright (C) 2002 MUTOH Masao <mu...@highway.ne.jp>
Distributed under the same license terms as tDiary.
sn
- Copyright (c) 2003 SAKAMOTO Hideki <h...@on-sky.net>
+ Copyright (C) 2003 SAKAMOTO Hideki <h...@on-sky.net>
Distributed under the GPL
speed_comment
- Copyright (c) 2002 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2002 TADA Tadashi <s...@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 <s...@spc.gr.jp>
+ Copyright (C) 2005 TADA Tadashi <s...@spc.gr.jp>
You can distribute this file under the GPL2.
tb
- Copyright (c) 2003 Junichiro KITA <k...@kitaj.no-ip.com>
+ Copyright (C) 2003 Junichiro KITA <k...@kitaj.no-ip.com>
Distributed under the GPL
tb-send
- Copyright (c) 2003 Junichiro Kita <k...@kitaj.no-ip.com>
+ Copyright (C) 2003 Junichiro Kita <k...@kitaj.no-ip.com>
You can distribute this file under the GPL.
tb-show
- Copyright (c) 2003 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2003 TADA Tadashi <s...@spc.gr.jp>
You can distribute this file under the GPL.
title_list
- Copyright (c) 2005 TADA Tadashi <s...@spc.gr.jp>
+ Copyright (C) 2005 TADA Tadashi <s...@spc.gr.jp>
You can distribute this file under the GPL2.
title_tag
- Copyright (c) 2003 URABE Shyouhei <r...@mput.dip.jp>
+ Copyright (C) 2003 URABE Shyouhei <r...@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 <k...@kitaj.no-ip.com>
+ Copyright (C) 2001,2002,2003 Junichiro KITA <k...@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 <k...@kitaj.no-ip.com>
+ Copyright (C) 2002 Junichiro KITA <k...@kitaj.no-ip.com>
Distributed under the GPL
xmlrpc
- Copyright (c) 2004 MoonWolf <moonw...@moonwolf.com>
+ Copyright (C) 2004 MoonWolf <moonw...@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".
--
1.7.10
