tags 441240 + patch tags 412169 + patch tags 377456 + patch tags 434924 + patch thanks
On September 8, 2007 at 1:47AM +0900, tats (at vega.ocn.ne.jp) wrote: > Package: w3m-el > Version: 1.4.4-3 > > The debian/copyright file of w3m-el mentions that the package is > licensed under just GPLv2. However, the source files seem that the > files are under GPLv2 with "or (at your option) any later version". > > Also, the copyright holders other than TSUCHIYA Masatoshi exist. > See octet.el, w3m-symbol.el, attic/*, doc/* and shimbun/*. > > Please correct the copyright information in debian/copyright. > > BTW, Fumitoshi, are you busy now? If so, please allow me to NMU. > I can fix this bug and also fix bug #333607, #412169, #377456, #393957 > and #434924 with my NMU. I've prepared the attached patch for the NMU. If you don't make an objection, I'll do the NMU in the next week or so Thanks, -- Tatsuya Kinoshita
--- w3m-el-1.4.4-3/debian/changelog
+++ w3m-el-1.4.4/debian/changelog
@@ -1,3 +1,21 @@
+w3m-el (1.4.4-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/copyright: Fix incorrect license information. closes: Bug#441240
+ * Debian/control:
+ - Move mule-ucs, imagemagick, wv, xlhtml, ppthtml from Recommends to
+ Suggests. Closes: Bug#333607
+ - Add emacs | emacs22 to Depends and Build-Depends-Indep.
+ Closes: Bug#434924
+ - Remove emacs-snapshot from Depends.
+ - Add mew-beta, gnus to Enhances.
+ * debian/rules: Remove doc/version.texi at clean. Closes: Bug#412169
+ * shimbun/mew-shimbun.el: Sync with the upstream CVS version for Mew 5.
+ Closes: Bug#377456
+ * debian/emacsen-install: Make symlinks for *.el. Closes: Bug#393957
+
+ -- Tatsuya Kinoshita <[EMAIL PROTECTED]> Thu, 13 Sep 2007 02:23:00 +0900
+
w3m-el (1.4.4-3) unstable; urgency=low
* change dependency: Depends: emacs21 | emacs-snapshot | apel,
--- w3m-el-1.4.4-3/debian/control
+++ w3m-el-1.4.4/debian/control
@@ -3,16 +3,16 @@
Priority: optional
Maintainer: Fumitoshi UKAI <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 3.0.0)
-Build-Depends-Indep: emacs21
+Build-Depends-Indep: emacs | emacs22 | emacs21
Standards-Version: 3.5.7
Package: w3m-el
Architecture: all
-Depends: emacs21 | emacs-snapshot | apel (>= 10.5), w3m (>= 0.3) | w3m-ssl (>=
0.3) | w3mmee (>= 0.3)
-Recommends: apel (>= 10.5), flim, mule-ucs, imagemagick, wv, xlhtml, ppthtml
-Suggests: bitmap-mule
+Depends: emacs | emacs22 | emacs21 | apel (>= 10.5), w3m (>= 0.3) | w3m-ssl
(>= 0.3) | w3mmee (>= 0.3)
+Recommends: apel (>= 10.5), flim
+Suggests: mule-ucs, imagemagick, wv, xlhtml, ppthtml, bitmap-mule
Conflicts: mew (<< 2.0), flim (<< 1.14.3), apel (<< 10.5)
-Enhances: wl, wl-beta, mew
+Enhances: wl, wl-beta, mew, mew-beta, gnus
Description: a simple Emacs interface of w3m
This package contains a interface program of w3m, which is a pager
with WWW capability. It can be used as lightweight WWW browser on emacsen.
--- w3m-el-1.4.4-3/debian/copyright
+++ w3m-el-1.4.4/debian/copyright
@@ -7,22 +7,177 @@
TSUCHIYA Masatoshi <[EMAIL PROTECTED]>
emacs-w3m development group <[EMAIL PROTECTED]>
-Copyright:
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+TSUCHIYA Masatoshi <[EMAIL PROTECTED]>
- This package 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; version 2 dated June, 1991.
-
- This package 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
+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, 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, you can either send email to this
+program's maintainer or write to: The Free Software Foundation,
+Inc.; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
+Other copyright holders:
+
+octet.el:;; Copyright (C) 2000, 2002, 2003, 2004, 2005
+octet.el:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+w3m-symbol.el:;; Copyright (C) 2002, 2003, 2004, 2005 ARISAWA Akihiro <[EMAIL
PROTECTED]>
+attic/regexp-opt.el:;; Copyright (C) 1994, 1995, 1996, 1997 Free Software
Foundation, Inc.
+attic/vm-w3m.el:;; Copyright (C) 2003 Katsumi Yamaoka
+attic/xml.el:;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+doc/ptexinfmt.el:;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
+doc/ptexinfmt.el:;; 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+doc/ptexinfmt.el:;; Copyright (C) 1999 Yoshiki Hayashi <[EMAIL PROTECTED]>
+doc/ptexinfmt.el:;; Copyright (C) 2000, 2001, 2002 TAKAHASHI Kaoru <[EMAIL
PROTECTED]>
+doc/texinfo.tex:% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
1994, 1995,
+doc/texinfo.tex:% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
Software
+doc/texinfo.tex:% Foundation, Inc.
+doc/txi-en.tex:% Copyright (C) 1999 Free Software Foundation.
+shimbun/sb-2ch.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005 by (not 1)
+shimbun/sb-airs.el:;; Copyright (C) 2001, 2002, 2003, 2005 Yuuichi Teranishi
<[EMAIL PROTECTED]>
+shimbun/sb-asahi-html.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-asahi-html.el:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+shimbun/sb-asahi-mytown.el:;; Copyright (C) 2003, 2004 Katsumi Yamaoka
+shimbun/sb-asahi.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-asahi:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+shimbun/sb-atmarkit.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-bbc.el:;; Copyright (C) 2003, 2004, 2005 Koichiro Ohba <[EMAIL
PROTECTED]>
+shimbun/sb-bbdb-ml.el:;; Copyright (C) 2001, 2005 Akihiro Arisawa <[EMAIL
PROTECTED]>
+shimbun/sb-bbdb-ml.el:;; Copyright (C) 2001, 2005 Yuuichi Teranishi <[EMAIL
PROTECTED]>
+shimbun/sb-chalow.el:;; Copyright (C) 2003, 2004 OHASHI Akira <[EMAIL
PROTECTED]>
+shimbun/sb-cnet-jp.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-cnn-jp.el:;; Copyright (C) 2003, 2004, 2005 Tsuyoshi CHO <[EMAIL
PROTECTED]>
+shimbun/sb-coldsync.el:;; Copyright (C) 2003, 2004 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-debian-jp.el:;; Copyright (C) 2001, 2002, 2003 OHASHI Akira <[EMAIL
PROTECTED]>
+shimbun/sb-debian.el:;; Copyright (C) 2001, 2002, 2003 OHASHI Akira <[EMAIL
PROTECTED]>
+shimbun/sb-dennou.el:;; Copyright (C) 2003, 2004 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-digiko.el:;; Copyright (C) 2001, 2002, 2003, 2004 Akihiro Arisawa
<[EMAIL PROTECTED]>
+shimbun/sb-elips.el:;; Copyright(C) 2003 Katsumi Yamaoka
+shimbun/sb-emacs-w3m.el:;; Copyright (C) 2001, 2002, 2003, 2004 Akihiro
Arisawa <[EMAIL PROTECTED]>
+shimbun/sb-emacswiki.el:;; Copyright (C) 2004, 2005 David Hansen
+shimbun/sb-excite.el:;; Copyright (C) 2004, 2005 Tsuyoshi CHO <[EMAIL
PROTECTED]>
+shimbun/sb-exconn.el:;; Copyright (C) 2004, 2005 Yoichi NAKAYAMA <[EMAIL
PROTECTED]>
+shimbun/sb-f1fan.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-f1fan.el:;; MIYOSHI Masanori <[EMAIL PROTECTED]>
+shimbun/sb-fau.el:;; Copyright (C) 2005 David Hansen
+shimbun/sb-ffii.el:;; Copyright (C) 2004, 2005
+shimbun/sb-ffii.el:;; Felix E. Klee <[EMAIL PROTECTED]>
+shimbun/sb-ffii.el:;; Andreas Seltenreich <[EMAIL PROTECTED]>
+shimbun/sb-fml.el:;; Copyright (C) 2001, 2002, 2003, 2004
+shimbun/sb-fml.el:;; Akihiro Arisawa <[EMAIL PROTECTED]>
+shimbun/sb-fml.el:;; Copyright (C) 2001, 2002, 2003, 2004
+shimbun/sb-fml.el:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+shimbun/sb-glimpse.el:;; Copyright (C) 2001, 2002, 2003 Akihiro Arisawa
<[EMAIL PROTECTED]>
+shimbun/sb-gnome.el:;; Copyright (C) 2001, 2002, 2003, 2004 Yuuichi Teranishi
<[EMAIL PROTECTED]>
+shimbun/sb-haiku-os.el:;; Copyright (C) 2004 Yoichi NAKAYAMA <[EMAIL
PROTECTED]>
+shimbun/sb-heise.el:;; Copyright (C) 2004, 2005 David Hansen
+shimbun/sb-hns.el:;; Copyright (C) 2001, 2002, 2004 Yuuichi Teranishi <[EMAIL
PROTECTED]>
+shimbun/sb-ibm-dev.el:;; Copyright (C) 2001, 2003, 2005 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-impress.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-impress.el:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+shimbun/sb-itmedia.el:;; Copyright (C) 2004, 2005 Yuuichi Teranishi <[EMAIL
PROTECTED]>
+shimbun/sb-javaconf.el:;; Copyright (C) 2001, 2002, 2003, 2004 ABE Yasushi
<[EMAIL PROTECTED]>
+shimbun/sb-jpilot.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-jpo.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-kantei.el:;; Copyright (C) 2001, 2003, 2003, 2004 Yuuichi Teranishi
<[EMAIL PROTECTED]>
+shimbun/sb-kde.el:;; Copyright (C) 2002, 2003 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-laut-de.el:;; Copyright (C) 2004 Andreas Seltenreich <[EMAIL
PROTECTED]>
+shimbun/sb-lotusex.el:;; Copyright (C) 2003, 2004 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-lump.el:;; Copyright (C) 2001, 2002 Yuuichi Teranishi <[EMAIL
PROTECTED]>
+shimbun/sb-m17n.el:;; Copyright (C) 2001, 2002, 2003 Akihiro Arisawa <[EMAIL
PROTECTED]>
+shimbun/sb-macosx-jp.el:;; Copyright (C) 2002 OHASHI Akira <[EMAIL PROTECTED]>
+shimbun/sb-mailarc.el:;; Copyright (C) 2002, 2003 Free Software Foundation,
Inc.
+shimbun/sb-mailman.el:;; Copyright (C) 2002, 2003 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-mailman.el:;; Copyright (C) 2002 Katsumi Yamaoka <[EMAIL
PROTECTED]>
+shimbun/sb-mailman.el:;; Copyright (C) 2005 Tsuyoshi CHO <[EMAIL
PROTECTED]>
+shimbun/sb-mainichi.el:;; Copyright (C) 2001, 2002, 2003, 2004 Koichiro Ohba
<[EMAIL PROTECTED]>
+shimbun/sb-makanai.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-makanai.el:;; MIYOSHI Masanori <[EMAIL PROTECTED]>
+shimbun/sb-marc-aims.el:;; Copyright (C) 2002, 2003, 2005 NOKUBI Takatsugu
<[EMAIL PROTECTED]>
+shimbun/sb-meadow.el:;; Copyright (C) 2001, 2002, 2003, 2004
+shimbun/sb-meadow.el:;; Akihiro Arisawa <[EMAIL PROTECTED]>
+shimbun/sb-meadow.el:;; Copyright (C) 2001, 2002, 2003, 2004
+shimbun/sb-meadow.el:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+shimbun/sb-mew.el:;; Copyright (C) 2001, 2002, 2005 Yuuichi Teranishi <[EMAIL
PROTECTED]>
+shimbun/sb-mew.el:;; Copyright (C) 2001, 2002, 2005 Akihiro Arisawa <[EMAIL
PROTECTED]>
+shimbun/sb-mhonarc.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-mhonarc.el:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+shimbun/sb-mhonarc.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-mhonarc.el:;; Akihiro Arisawa <[EMAIL PROTECTED]>
+shimbun/sb-moz-users.el:;; Copyright (C) 2003 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-msdn.el:;; Copyright (C) 2004, 2005 Yoichi NAKAYAMA <[EMAIL
PROTECTED]>
+shimbun/sb-msports-nifty.el:;; Copyright (C) 2004, 2005 MIYOSHI Masanori
<[EMAIL PROTECTED]>
+shimbun/sb-muchy.el:;; Copyright (C) 2001, 2002, 2003, 2004 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-n24-de.el:;; Copyright (C) 2004 Andreas Seltenreich <[EMAIL
PROTECTED]>
+shimbun/sb-namazu.el:;; Copyright (C) 2001, 2002, 2003, 2004 Akihiro Arisawa
<[EMAIL PROTECTED]>
+shimbun/sb-netbsd.el:;; Copyright (C) 2001, 2002, 2003 Yuuichi Teranishi
<[EMAIL PROTECTED]>
+shimbun/sb-nikkansports.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-nikkansports.el:;; MIYOSHI Masanori <[EMAIL PROTECTED]>
+shimbun/sb-nikkei.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-nikkei.el:;; Kazuyoshi KOREEDA <[EMAIL PROTECTED]>
+shimbun/sb-orca.el:;; Copyright (C) 2002, 2003, 2005 Masamichi Goudge M.D.
<[EMAIL PROTECTED]>
+shimbun/sb-palmfan.el:;; Copyright (C) 2002, 2003, 2005 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-pcweb-column.el:;; Copyright (C) 2002, 2003, 2004 OHASHI Akira
<[EMAIL PROTECTED]>
+shimbun/sb-pilot-link.el:;; Copyright (C) 2002, 2003, 2005 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-pilot-mailsync.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-plucker.el:;; Copyright (C) 2003, 2005 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-pocketgames.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-rakuten.el:;; Copyright (C) 2003, 2004 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-redhat.el:;; Copyright (C) 2002, 2003 OHASHI Akira <[EMAIL
PROTECTED]>
+shimbun/sb-rediff.el:;; Copyright (C) 2004, 2005 S V N Vishwanathan <[EMAIL
PROTECTED]>
+shimbun/sb-rss.el:;; Copyright (C) 2003, 2004, 2005 Koichiro Ohba <[EMAIL
PROTECTED]>
+shimbun/sb-rss.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-ruby.el:;; Copyright (C) 2001, 2002, 2003, 2005
+shimbun/sb-ruby.el:;; NAKAJIMA Mikio <[EMAIL PROTECTED]>
+shimbun/sb-sankei.el:;; Copyright (C) 2003, 2004 Katsumi Yamaoka
+shimbun/sb-savannah.el:;; Copyright (C) 2002, 2003, 2005 Yoichi NAKAYAMA
<[EMAIL PROTECTED]>
+shimbun/sb-slashdot-jp.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-sml.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-spiegel.el:;; Copyright (C) 2004 David Hansen
+shimbun/sb-sponichi.el:;; Copyright (C) 2001, 2002, 2003 Tatsuya Ichikawa
+shimbun/sb-sponichi.el:;; Copyright (C) 2001, 2002, 2003 Yuuichi Teranishi
<[EMAIL PROTECTED]>
+shimbun/sb-squeak-dev.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-squeak-ja.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-tcup.el:;; Copyright (C) 2001, 2002, 2005 Yuuichi Teranishi <[EMAIL
PROTECTED]>
+shimbun/sb-tdiary-ml.el:;; Copyright (C) 2003 Koichiro Ohba <[EMAIL
PROTECTED]>
+shimbun/sb-tdiary.el:;; Copyright (C) 2003, 2004 OHASHI Akira <[EMAIL
PROTECTED]>
+shimbun/sb-texfaq.el:;; Copyright (C) 2002, 2004 Hidetaka Iwai <[EMAIL
PROTECTED]>
+shimbun/sb-text.el:;; Copyright (C) 2001, 2002, 2003, 2004 Yuuichi Teranishi
<[EMAIL PROTECTED]>
+shimbun/sb-the-register.el:;; Copyright (C) 2004, 2005 David Hansen
+shimbun/sb-tigris.el:;; Copyright (C) 2005 Tsuyoshi CHO <[EMAIL PROTECTED]>
+shimbun/sb-vinelinux.el:;; Copyright (C) 2001, 2002, 2003, 2004 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-w3m-dev.el:;; Copyright (C) 2001 NAKAJIMA Mikio
+shimbun/sb-w3m-dev.el:;; Copyright (C) 2005 Tsuyoshi CHO
+shimbun/sb-weeklyworldnews.el:;; Copyright (C) 2004 David Hansen
+shimbun/sb-welt-de.el:;; Copyright (C) 2004 Andreas Seltenreich <[EMAIL
PROTECTED]>
+shimbun/sb-wiki.el:;; Copyright (C) 2003, 2004 NAKAJIMA Mikio <[EMAIL
PROTECTED]>
+shimbun/sb-wikimedia.el:;; Copyright (C) 2004, 2005 Tsuyoshi CHO <[EMAIL
PROTECTED]>
+shimbun/sb-wincefan.el:;; Copyright (C) 2003, 2004, 2005 NAKAJIMA Mikio
<[EMAIL PROTECTED]>
+shimbun/sb-wired.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/sb-wired.el:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+shimbun/sb-x51.el:;; Copyright (C) 2004, 2005 Tsuyoshi CHO <[EMAIL PROTECTED]>
+shimbun/sb-xemacs.el:;; Copyright (C) 2001, 2002 Akihiro Arisawa <[EMAIL
PROTECTED]>
+shimbun/sb-xemacs.el:;; Copyright (C) 2001, 2002 Yuuichi Teranishi <[EMAIL
PROTECTED]>
+shimbun/sb-yahoo-auctions.el:;; Copyright (C) 2005 ARISAWA Akihiro <[EMAIL
PROTECTED]>
+shimbun/sb-yahoo-sports.el:;; Copyright (C) 2005
+shimbun/sb-yahoo-sports.el:;; MIYOSHI Masanori <[EMAIL PROTECTED]>
+shimbun/sb-yahoo.el:;; Copyright (C) 2001, 2002, 2003, 2005
+shimbun/sb-yahoo.el:;; Kazuyoshi KOREEDA <[EMAIL PROTECTED]>
+shimbun/sb-yomiuri-html.el:;; Copyright (C) 2001, 2002, 2003 Yuuichi Teranishi
<[EMAIL PROTECTED]>
+shimbun/sb-zeit-de.el:;; Copyright (C) 2004, 2005 Andreas Seltenreich <[EMAIL
PROTECTED]>
+shimbun/shimbun.el:;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+shimbun/shimbun.el:;; Yuuichi Teranishi <[EMAIL PROTECTED]>
+
+The Debian packaging is distributed under the same conditions as the
+upstream.
--- w3m-el-1.4.4-3/debian/emacsen-install
+++ w3m-el-1.4.4/debian/emacsen-install
@@ -17,6 +17,7 @@
install -m 755 -d ${ELCDIR}
install -m 755 -d ${ELCDIR}/shimbun
+rm -f ${ELCDIR}/*.el ${ELCDIR}/shimbun/*.el
case ${FLAVOR} in
xemacs*)
@@ -73,6 +74,13 @@
${FLAVOR} ${FLAGS} -f w3mhack-compile 2>&1 | gzip -9 > CompilationLog.gz
rm -f `ls -1 *.el | grep -v 'w3m-\(kwds\|load\).el'` path.el shimbun/*.el
path.elc
+(for d in "" "/shimbun"; do
+ cd ${ELDIR}$d
+ for f in *.el; do
+ ln -fs ${ELDIR}$d/$f ${ELCDIR}$d
+ done
+ done)
+
# force to recopmile wl for shimbun module
# fix "Cannot open load file: elmo-shimbun"
if test -d /usr/share/${FLAVOR}/site-lisp/wl; then
--- w3m-el-1.4.4-3/debian/rules
+++ w3m-el-1.4.4/debian/rules
@@ -31,6 +31,7 @@
# Add here commands to clean up after the build process.
-$(MAKE) clean
-rm -f config.log config.cache config.status
+ -rm -f doc/version.texi
dh_clean
install: build
--- w3m-el-1.4.4-3/shimbun/mew-shimbun.el
+++ w3m-el-1.4.4/shimbun/mew-shimbun.el
@@ -1,7 +1,7 @@
;; -*- mode: emacs-lisp -*-
;; mew-shimbun.el --- View shimbun contents with Mew
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
;; TSUCHIYA Masatoshi <[EMAIL PROTECTED]>
;; Author: TSUCHIYA Masatoshi <[EMAIL PROTECTED]>
@@ -23,7 +23,7 @@
;; You should have received a copy of the GNU General Public License
;; along with this program; if not, you can either send email to this
;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; Inc.; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
;;; Commentary:
;; This package is `Shimbun' interface for Mew version 2.1 or later.
@@ -296,6 +296,18 @@
(unless (mew-sinfo-get-summary-form)
(mew-sinfo-set-summary-form (mew-get-summary-form fld)))))
+(static-if (fboundp 'mew-expand-file)
+ ;; Mew 5
+ (defalias 'mew-shimbun-folder-file 'mew-expand-file)
+ (defun mew-shimbun-folder-file (fld file)
+ (expand-file-name file (mew-expand-folder fld))))
+
+(static-if (fboundp 'mew-expand-msg)
+ ;; Mew 5
+ (defalias 'mew-shimbun-expand-msg 'mew-expand-msg)
+ (defun mew-shimbun-expand-msg (fld msg)
+ (expand-file-name msg (mew-expand-folder fld))))
+
(if (featurep 'xemacs)
nil
(eval-and-compile
@@ -356,7 +368,7 @@
(when (re-search-forward (or mew-shimbun-unseen-regex
(mew-shimbun-unseen-regex))
nil t)
(setq sbflds (cons fld sbflds))))
- (setq cfile (mew-expand-folder fld mew-summary-cache-file))
+ (setq cfile (mew-shimbun-folder-file fld
mew-summary-cache-file))
(when (file-readable-p cfile)
(with-temp-buffer
(mew-frwlet
@@ -390,7 +402,7 @@
(mew-summary-ls newfld newfld))))))
;;;###autoload
-(defun mew-shimbun-retrieve ()
+(defun mew-shimbun-retrieve (&optional newfld)
"Retrieve articles via SHIMBUN on this folder."
(interactive)
(when (mew-summary-exclusive-p)
@@ -414,7 +426,7 @@
(mew-shimbun-element-body sgr group server
(setq count
(+ (mew-shimbun-retrieve-article
- mua server group range fld)
+ mua server group range fld newfld)
count)))))
(run-hooks 'mew-shimbun-retrieve-hook)
(message "Getting %s %s in '%s' done"
@@ -431,7 +443,7 @@
(mew-summary-only
(let ((mua (luna-make-entity 'shimbun-mew-mua))
(cfld (mew-summary-folder-name 'ext))
- fld dir server group range)
+ fld dir server group range newfld)
(run-hooks 'mew-shimbun-before-retrieve-hook)
(mew-window-configure 'summary)
(mew-current-set nil nil nil)
@@ -442,17 +454,18 @@
(car fldgrp)))
(setq dir (mew-expand-folder fld))
(unless (file-directory-p dir)
- (mew-make-directory dir))
+ (mew-make-directory dir)
+ (setq newfld t))
(mew-shimbun-visit-folder fld)
(sit-for 0.5)
(mew-rendezvous mew-summary-buffer-process)
- (mew-shimbun-retrieve)
+ (mew-shimbun-retrieve newfld)
(unless (eq (get-buffer cfld) (current-buffer))
(mew-kill-buffer (current-buffer)))))
(mew-shimbun-visit-folder cfld)
(message "Getting done"))))
-(defun mew-shimbun-retrieve-article (mua server group range fld)
+(defun mew-shimbun-retrieve-article (mua server group range fld &optional
newfld)
"Retrieve articles via SHIMBUN."
(luna-define-method shimbun-mua-search-id ((mua shimbun-mew-mua) id)
(let ((shimbun (shimbun-mua-shimbun mua)))
@@ -468,7 +481,7 @@
mew-use-biff))
(count 0)
(dispcount 0)
- newfld msg file)
+ msg file)
(if biff (mew-biff-clean-up))
(shimbun-open-group shimbun group)
(unless (file-exists-p (mew-expand-folder fld))
@@ -501,7 +514,7 @@
(insert (format "X-Shimbun-Id: %s\n" id))
(mew-shimbun-sanity-convert)
(setq msg (mew-folder-new-message fld 'numonly))
- (setq file (mew-expand-folder fld msg))
+ (setq file (mew-shimbun-expand-msg fld msg))
(mew-frwlet
mew-cs-dummy mew-cs-text-for-write
(write-region (point-min) (point-max) file nil 'nomsg))
@@ -662,7 +675,7 @@
(setq newcount (1+ newcount))
(setq msg (mew-folder-new-message fld 'numonly))
(setq oldmd5 nil))
- (setq file (mew-expand-folder fld msg))
+ (setq file (mew-shimbun-expand-msg fld msg))
(setq buf (get-buffer-create mew-shimbun-article-buffer-name))
(with-current-buffer buf
(mew-erase-buffer)
@@ -790,7 +803,7 @@
(mew-elet
(delete-region (point)
(progn (forward-line) (point)))))
- (setq file (mew-expand-folder fld msg))
+ (setq file (mew-shimbun-expand-msg fld msg))
(when (and (file-exists-p file)
(file-readable-p file)
(file-writable-p file))
@@ -1010,10 +1023,10 @@
(forward-line)
(mew-header-goto-next)
(delete-region beg (point)))
- (mew-md5
- (string-as-unibyte
- (mew-buffer-substring (point-min)
- (min (point-max) (+ (point-min) 4096))))))))
+ (md5 (string-as-unibyte
+ (mew-buffer-substring (point-min)
+ (min (point-max) (+ (point-min) 4096))))
+ nil nil 'binary))))
(defvar mew-shimbun-touch-folder-p
(static-if (boundp 'mew-touch-folder-p)
pgpidiFv1knuR.pgp
Description: PGP signature
