12 files changed, 121 insertions, 33 deletions

diff --git a/debian/changelog b/debian/changelog
index 3ca24a2..36a35ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+w3m (0.5.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #433122)
+  * Acknowledge NMU. (Closes: #404564)
+  * debian/menu: Comply with menu transition. (Closes: #483817, thanks to
+    Hideki Yamane)
+  * debian/watch: New file. (Closes: #462162)
+  * Handling debian/patches with quilt.
+    - Typo fixes for w3m.1. (Closes: #423829, #266854)
+  * Use dpkg-statoverride to set the file mode of /usr/lib/w3m/w3mimgdisplay.
+  * debian/postinst: Remove redundant signal handling.
+  * debian/copyright: Updated.
+  * debian/control:
+    - Use ${binary:Version} instead of ${Source-Version}.
+    - Set Standards-Version to 3.7.3.
+    - Add the Homepage field.
+    - Typo fix in Description.
+    - Add Tatsuya Kinoshita to Uploaders.
+
+ -- Tatsuya Kinoshita <tats@debian.org>  Sun, 01 Jun 2008 11:31:04 +0900
+
 w3m (0.5.1-5.1) unstable; urgency=high
 
   * NMU by the Security Team:
@@ -1381,5 +1402,3 @@ w3m (0.0.19990309-1) unstable; urgency=low
   * Initial Release.
 
  -- Fumitoshi UKAI <ukai@debian.or.jp>  Tue,  9 Mar 1999 19:08:08 +0900
-
-
diff --git a/debian/control b/debian/control
index 1755648..9f5ff9c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,10 @@ Source: w3m
 Section: text
 Priority: standard
 Maintainer: Fumitoshi UKAI <ukai@debian.or.jp>
-Build-Depends: libgc-dev, libncurses5-dev, libgpmg1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], zlib1g-dev, libssl-dev, debhelper (>= 4.0.0), gawk | awk, libgdk-pixbuf-dev (>= 0.22.0-5), autotools-dev
-Standards-Version: 3.6.1
+Uploaders: Tatsuya Kinoshita <tats@debian.org>
+Build-Depends: libgc-dev, libncurses5-dev, libgpmg1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], zlib1g-dev, libssl-dev, debhelper (>= 4.0.0), gawk | awk, libgdk-pixbuf-dev (>= 0.22.0-5), autotools-dev, quilt (>= 0.40)
+Standards-Version: 3.7.3
+Homepage: http://sourceforge.net/projects/w3m
 
 Package: w3m
 Architecture: any
@@ -22,15 +24,12 @@ Description: WWW browsable pager with excellent tables/frames support
   * Internet message preview mode, you can browse HTML mail.
   * You can follow links in plain text if it includes URL forms.
   * With w3m-img, you can view image inline.
- .
- For more information, 
- see http://sourceforge.net/projects/w3m
 
 Package: w3m-img
 Architecture: any
 Priority: optional
-Depends: w3m (= ${Source-Version}), ${shlibs:Depends}
+Depends: w3m (= ${binary:Version}), ${shlibs:Depends}
 Description: inline image extension support utilities for w3m
  w3m-img provides some utilities to support inline images for w3m
- on terminal emulator in X Window System environments and linux
+ on terminal emulator in X Window System environments and Linux
  framebuffer.
diff --git a/debian/copyright b/debian/copyright
index 75ffc7f..dc568b4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
-This package was debianized by Fumitoshi UKAI ukai@debian.or.jp on
-Tue,  9 Mar 1999 19:08:08 +0900.
+This package was debianized by
+  1999-2006 Fumitoshi UKAI <ukai@debian.or.jp>
+  2008 Tatsuya Kinoshita <tats@debian.org>
 
-It was downloaded from http://sourceforge.net/projects/w3m
+The upstream source can be downloaded from
+  http://sourceforge.net/projects/w3m
 
 Upstream Authors: 
  Akinori ITO <aito@ei5sun.yz.yamagata-u.ac.jp>
  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
  Fumitoshi UKAI <ukai@debian.or.jp> 
 
-Copyright:
-
 (C) Copyright 1994-1999 by Akinori Ito. All rights reserved.
  Permission is hereby granted to use or copy this program
  for any purpose,  provided the above notices are retained on all copies
diff --git a/debian/menu b/debian/menu
index 708b736..fd40575 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,5 @@
-?package(w3m):needs="text" section="Apps/Net"\
-  title="w3m" command="/usr/bin/w3m /usr/share/doc/w3m/MANUAL.html" hints="Web browsers"
+?package(w3m):needs="text" \
+  section="Applications/Network/Web Browsing" \
+  title="w3m" \
+  command="/usr/bin/w3m /usr/share/doc/w3m/MANUAL.html" \
+  hints="Web browsers"
diff --git a/debian/patches/03-w3m.1-debian-fix b/debian/patches/03-w3m.1-debian-fix
index faf54c5..f8d9116 100644
--- a/debian/patches/03-w3m.1-debian-fix
+++ b/debian/patches/03-w3m.1-debian-fix
@@ -40,3 +40,15 @@ diff -Nru w3m-0.4rc1.orig/doc-jp/w3m.1 w3m-0.4rc1/doc-jp/w3m.1
  連続する空行を1行にまとめて表示する．
  .TP
  .B \-X
+diff -urN w3m-0.5.2.orig/doc/w3m.1 w3m-0.5.2/doc/w3m.1
+--- w3m-0.5.2.orig/doc/w3m.1	2002-11-12 21:36:30.000000000 +0900
++++ w3m-0.5.2/doc/w3m.1	2008-06-01 08:25:04.000000000 +0900
+@@ -133,7 +133,7 @@
+ don't use termcap init/deinit
+ .TP
+ .B -title [=TERM]
+-set buffer name to termianl title string. 
++set buffer name to terminal title string. 
+ If TERM is specified, use the TERM style title configuration.
+ .TP
+ .B -o opt=value
diff --git a/debian/patches/04-ja-w3m.1-debian-fix b/debian/patches/04-ja-w3m.1-debian-fix
new file mode 100644
index 0000000..7dc6ffd
--- /dev/null
+++ b/debian/patches/04-ja-w3m.1-debian-fix
@@ -0,0 +1,42 @@
+diff -urN w3m-0.5.2.orig/doc-jp/w3m.1 w3m-0.5.2/doc-jp/w3m.1
+--- w3m-0.5.2.orig/doc-jp/w3m.1	2002-11-12 21:36:30.000000000 +0900
++++ w3m-0.5.2/doc-jp/w3m.1	2008-06-01 11:07:34.000000000 +0900
+@@ -264,7 +264,7 @@
+ .B "ESC g"
+ 画面下で行番号を入力し，そこで指定した行に移動します．
+ ここで
+-.$
++.B $
+ を入力すると，最終行に移動します．
+ .TP
+ .B Z
+@@ -337,7 +337,7 @@
+ 現在のリンク先を，外部ブラウザを使って表示します．
+ .B "2ESC M", "3ESC M"
+ で2番目と3番目のブラウザを使います．
+-.El
++.\"
+ .SS ファイルとURL関係の操作
+ .TP
+ .B U
+@@ -377,9 +377,9 @@
+ .TP
+ .B "ESC s"
+ HTMLのソースをファイルに保存します．
+-.v
++.B v
+ でソースを表示して
+-.S
++.B S
+ で保存するのとほぼ同じですが，
+ .B "ESC s"
+ で保存したファイルは漢字コードがオリジナルのままであるのに対して，
+@@ -403,7 +403,7 @@
+ .TP
+ .B RET
+ 現在選択しているバッファを表示します．
+-.El
++.\"
+ .SS ブックマーク操作
+ .TP
+ .B "ESC b"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..24b6fd5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+03-w3m.1-debian-fix
+04-ja-w3m.1-debian-fix
diff --git a/debian/postinst b/debian/postinst
index 1ba8910..4268351 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -15,7 +15,7 @@ case "$1" in
        if test -e /etc/w3m/w3mconfig; then
 	   mv -f /etc/w3m/w3mconfig /etc/w3m/w3mconfig.dpkg-tmp
 	   tmp=$(tempfile -p w3m.subst.)
-	   trap "rm -f $tmp" 0 1 2 15
+	   trap "rm -f $tmp" 0
 	   while read opt val
 	   do
 	      val0=$(sed -ne 's/^'$opt'[[:space:]]*//p' /etc/w3m/w3mconfig.dpkg-tmp)
diff --git a/debian/rules b/debian/rules
index 179c5c7..72c0a5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 ifeq ($(DEB_BUILD_GNU_SYSTEM),linux-gnu)
   DEVS=x11,fb+s
 else
@@ -24,9 +22,8 @@ confargs := --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
 builddir := .
 
 build: build-stamp
-build-stamp: 
+build-stamp: debian/stamp-patched
 	dh_testdir
-	# Add here commands to compile the package.
 	-cp /usr/share/misc/config.guess .
 	-cp /usr/share/misc/config.sub .
 	cd $(builddir) && ./configure $(confargs)
@@ -34,12 +31,11 @@ build-stamp:
 	cd $(builddir)/po && LC_ALL=C $(MAKE) update-gmo
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	-test -f $(builddir)/Makefile && cd $(builddir) && $(MAKE) distclean
-	-rm -f $(builddir)/po/*.gmo
-	-rm -f 
+	if test -f $(builddir)/Makefile; then cd $(builddir) && $(MAKE) distclean; fi
+	rm -f $(builddir)/po/*.gmo
 	rm -f extract-stamp patch-stamp configure-stamp build-stamp install-stamp
 	dh_clean
 
@@ -65,13 +61,10 @@ install-stamp: build-stamp
 	dh_movefiles --sourcedir=debian/w3m
 	touch install-stamp
 
-# Build architecture-independent files here.
 binary-indep: build-stamp install-stamp
 # We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build-stamp install-stamp
-#	dh_testversion
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdocs -a
@@ -85,7 +78,6 @@ binary-arch: build-stamp install-stamp
 	dh_installmenu
 	dh_installmime
 	dh_installemacsen
-#	dh_installinit
 	dh_installcron
 	dh_installman $(builddir)/doc/w3m.1
 	dh_installman debian/w3mman.1
@@ -95,8 +87,6 @@ binary-arch: build-stamp install-stamp
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
-	chgrp video debian/w3m-img/usr/lib/w3m/w3mimgdisplay
-	chmod g+s debian/w3m-img/usr/lib/w3m/w3mimgdisplay
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
diff --git a/debian/w3m-img.postinst b/debian/w3m-img.postinst
new file mode 100644
index 0000000..6f3908b
--- /dev/null
+++ b/debian/w3m-img.postinst
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+if dpkg-statoverride --list /usr/lib/w3m/w3mimgdisplay >/dev/null ; then
+  dpkg-statoverride --remove /usr/lib/w3m/w3mimgdisplay
+fi
+dpkg-statoverride --update --add root video 2755 /usr/lib/w3m/w3mimgdisplay
+
+#DEBHELPER#
diff --git a/debian/w3m-img.prerm b/debian/w3m-img.prerm
new file mode 100644
index 0000000..121892d
--- /dev/null
+++ b/debian/w3m-img.prerm
@@ -0,0 +1,8 @@
+#! /bin/sh
+set -e
+
+if dpkg-statoverride --list /usr/lib/w3m/w3mimgdisplay >/dev/null ; then
+  dpkg-statoverride --remove /usr/lib/w3m/w3mimgdisplay
+fi
+
+#DEBHELPER#
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..08e3a6c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts="downloadurlmangle=s/downloads\.sourceforge\.net/jaist.dl.sourceforge.net\/sourceforge/" \
+ http://sourceforge.net/projects/w3m/files/ \
+ http://downloads.sourceforge.net/w3m/w3m-([0-9]+\..+)\.tar\.gz\?.* debian uupdate