2 files changed, 11 insertions, 33 deletions
diff --git a/debian/control b/debian/control
index 7b9c028..e607c08 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,18 @@
 Source: w3m
 Section: text
-Priority: optional
+Priority: standard
 Maintainer: Fumitoshi UKAI <ukai@debian.or.jp>
-Build-Depends: libgc6-dev, libncurses5-dev, libgpmg1-dev, zlib1g-dev, debhelper, gawk | awk, imlib-dev
-Standards-Version: 3.5.6
+Build-Depends: libgc-dev, libncurses5-dev, libgpmg1-dev [!hurd-i386], zlib1g-dev, libssl-dev, debhelper (>= 3.0.0), gawk | awk, libgdk-pixbuf-dev, autotools-dev
+Standards-Version: 3.6.1
 
 Package: w3m
 Architecture: any
 Depends: ${shlibs:Depends}
+Recommends: ca-certificates
 Provides: www-browser
-Suggests: w3m-img, w3m-ssl (>= ${Source-Version}), mime-support, menu (>> 1.5), w3m-el, migemo, man-db
+Suggests: w3m-img, mime-support, menu (>> 1.5), w3m-el, migemo, man-db
+Conflicts: w3m-ssl
+Replaces: w3m-ssl, w3mmee
 Description: WWW browsable pager with excellent tables/frames support
  w3m is a text-based World Wide Web browser with IPv6 support. 
  It features excellent support for tables and frames. It can be used 
@@ -25,7 +28,9 @@ Description: WWW browsable pager with excellent tables/frames support
 
 Package: w3m-img
 Architecture: any
-Depends: w3m (= ${Source-Version}) | w3m-ssl (= ${Source-Version}), ${shlibs:Depends}
+Priority: optional
+Depends: w3m (= ${Source-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.
+ on terminal emulator in X Window System environments and linux
+ framebuffer.
diff --git a/debian/control-ssl b/debian/control-ssl
deleted file mode 100644
index f47aa25..0000000
--- a/debian/control-ssl
+++ /dev/null
@@ -1,27 +0,0 @@
-Source: w3m-ssl
-Section: main
-Priority: optional
-Maintainer: Fumitoshi UKAI <ukai@debian.or.jp>
-Build-Depends: libgc6-dev, libncurses5-dev, libgpmg1-dev, zlib1g-dev, libssl-dev, debhelper, gawk | awk, imlib-dev
-Standards-Version: 3.5.6
-
-Package: w3m-ssl
-Architecture: any
-Depends: ${shlibs:Depends}, w3m
-Recommends: ca-certificates
-Provides: www-browser
-Suggests: w3m (= ${Source-Version}), w3m-img, mime-support, menu (>> 1.5), migemo
-Description: WWW browsable pager with SSL support
- w3m is a text-based World Wide Web browser with IPv6 support. 
- It features excellent support for tables and frames. It can be used 
- as a standalone file pager, too.
- .
-  * You can follow links and/or view images in HTML.
-  * 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.
- .
- This package is built with SSL support.
- .
- For more information, 
- see http://sourceforge.net/projects/w3m