Releasing debian version 0.5.1-1debian/0.5.1-1

3 files changed, 29 insertions, 186 deletions

diff --git a/debian/rules b/debian/rules
index 91ee9ce..428fbff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,40 +8,41 @@
 
 export DH_COMPAT=3
 
-nossl:
-	@echo already nossl version environments
+ifeq ($(DEB_BUILD_GNU_SYSTEM),linux)
+  DEVS=x11,fb+s
+else
+  DEVS=x11
+endif
 
-ssl:
-	@echo change to ssl version...
-	@cd debian && for i in *-ssl; do \
-		f=`echo $$i | sed -e 's/-ssl//'`; \
-		mv $$f $$f-nossl; \
-		mv $$i $$f; \
-		echo -n "$$f "; \
-	done
-	@chmod +x debian/rules
-	@echo done
+confargs := --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+	--mandir=/usr/share/man \
+	--with-gc --with-ssl \
+	--with-migemo="migemo -t egrep /usr/share/migemo/migemo-dict" \
+	--with-editor=/usr/bin/sensible-editor \
+	--enable-gopher \
+	--enable-image=$(DEVS) \
+	--enable-m17n --enable-unicode --enable-nls
 
-include debian/rules.mk
+builddir := .
 
 build: build-stamp
-build-stamp: configure-stamp
+build-stamp: 
 	dh_testdir
 	# Add here commands to compile the package.
-	(echo "# Configuration at "`hostname`; cat debian/config.param) > $(buildjadir)/config.param
-	cd $(buildjadir) && ./configure -yes -model=cookie -lang=JA -cflags="-O2 -DDEBIAN" -code=E --gc-includedir=/usr/include/gc  --mimetypes=/etc/mime.types
-	cd $(buildjadir) && LC_ALL=C $(MAKE) OPTS="-Wall -g"
-	(echo "# Configuration at "`hostname`; cat debian/config.param) > $(buildendir)/config.param
-	cd $(buildendir) && ./configure -yes -model=cookie -lang=EN -cflags="-O2 -DDEBIAN" --gc-includedir=/usr/include/gc  --mimetypes=/etc/mime.types
-	cd $(buildendir) && LC_ALL=C $(MAKE) OPTS="-Wall -g"
+	-cp /usr/share/misc/config.guess .
+	-cp /usr/share/misc/config.sub .
+	cd $(builddir) && ./configure $(confargs)
+	cd $(builddir) && LC_ALL=C $(MAKE) OPTS="-Wall -g -DDEBIAN"
+	cd $(builddir)/po && LC_ALL=C $(MAKE) update-gmo
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -rf $(buildtree)
+	-test -f $(builddir)/Makefile && cd $(builddir) && $(MAKE) distclean
+	-rm -f $(builddir)/po/*.gmo
+	-rm -f 
 	rm -f extract-stamp patch-stamp configure-stamp build-stamp install-stamp
-	rm -f debian/docs debian/examples
 	dh_clean
 
 install: install-stamp
@@ -52,8 +53,8 @@ install-stamp: build-stamp
 	dh_installdirs
 
 	# Add here commands to install the package into debian/w3m.
-	cd $(buildendir) && $(MAKE) install DESTDIR=`pwd`/../../debian/w3m
-	cd $(buildendir)/Bonus && find . -type f -perm 0100 -print | \
+	cd $(builddir) && $(MAKE) install DESTDIR=`pwd`/debian/w3m
+	cd $(builddir)/Bonus && find . -type f -perm 0100 -print | \
 	while read i; \
 	do \
 		sed -e 's:/usr/local/bin/ruby:/usr/bin/ruby:' \
@@ -61,16 +62,7 @@ install-stamp: build-stamp
 			$$i \
 			> `pwd`/../../../debian/w3m/usr/share/doc/w3m/examples/$$i ; \
 	done
-	cd `pwd`/debian/w3m && mv usr/bin/w3m usr/bin/w3m-en
-	cd `pwd`/debian/w3m && mv usr/lib/w3m/w3mbookmark usr/lib/w3m/w3mbookmark-en
-	cd `pwd`/debian/w3m && mv usr/lib/w3m/w3mhelperpanel usr/lib/w3m/w3mhelperpanel-en
-	install -m 755 debian/w3m.sh `pwd`/debian/w3m/usr/bin/w3m
-	install -m 755 debian/w3mbookmark.sh `pwd`/debian/w3m/usr/lib/w3m/w3mbookmark
-	install -m 755 debian/w3mhelperpanel.sh `pwd`/debian/w3m/usr/lib/w3m/w3mhelperpanel
-	install -m 755 $(buildjadir)/w3m `pwd`/debian/w3m/usr/bin/w3m-ja
-	install -m 755 $(buildjadir)/w3mbookmark `pwd`/debian/w3m/usr/lib/w3m/w3mbookmark-ja
-	install -m 755 $(buildjadir)/w3mhelperpanel `pwd`/debian/w3m/usr/lib/w3m/w3mhelperpanel-ja
-	install -m 644 debian/w3mconfig `pwd`/debian/w3m/etc/w3m/w3mconfig
+	install -m 644 debian/w3mconfig `pwd`/debian/w3m/etc/w3m/config
 	install -m 644 debian/mailcap `pwd`/debian/w3m/etc/w3m/mailcap
 	dh_movefiles --sourcedir=debian/w3m
 	touch install-stamp
@@ -84,12 +76,10 @@ binary-arch: build-stamp install-stamp
 #	dh_testversion
 	dh_testdir -a
 	dh_testroot -a
-	sed -e 's:^:$(builddir)/:' debian/docs.in > debian/docs
 	dh_installdocs -a
 	cp -a $(builddir)/doc-jp/* `pwd`/debian/w3m/usr/share/doc/w3m/ja/
-	rm -f `pwd`/debian/w3m/usr/share/doc/w3m/ja/README.kokb
+	-rm -f `pwd`/debian/w3m/usr/share/doc/w3m/ja/README.kokb
 	-rm -rf `pwd`/debian/w3m/usr/share/doc/w3m/ja/CVS
-	sed -e 's:^:$(builddir)/:' debian/examples.in > debian/examples
 	cp debian/README.Debian.w3m-img `pwd`/debian/w3m-img/usr/share/doc/w3m-img/README.Debian
 	dh_installexamples -a
 	cd `pwd`/debian/w3m/usr/share/doc/w3m && \
@@ -106,11 +96,9 @@ binary-arch: build-stamp install-stamp
 	dh_installchangelogs -a $(builddir)/ChangeLog
 	dh_strip -a
 	dh_compress -a
-	dh_link usr/share/man/man1/w3m.1.gz usr/share/man/man1/w3m-ja.1.gz
-	dh_link usr/share/man/man1/w3m.1.gz usr/share/man/man1/w3m-en.1.gz
-	dh_link usr/share/man/ja/man1/w3m.1.gz usr/share/man/ja/man1/w3m-ja.1.gz
-	dh_link usr/share/man/ja/man1/w3m.1.gz usr/share/man/ja/man1/w3m-en.1.gz
 	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/rules-ssl b/debian/rules-ssl
deleted file mode 100644
index 423a978..0000000
--- a/debian/rules-ssl
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/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
-
-export DH_COMPAT=3
-
-nossl:
-	@echo change to nossl version...
-	@cd debian && for i in *-nossl; do \
-		f=`echo $$i | sed -e 's/-nossl//'`; \
-		mv $$f $$f-ssl; \
-		mv $$i $$f; \
-		echo -n "$$f "; \
-	done
-	@chmod +x debian/rules
-	@echo done
-
-ssl:
-	@echo already ssl version environments
-
-include debian/rules.mk
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	(echo "# Configuration at "`hostname`; cat debian/config.param) > $(buildjadir)/config.param
-	cd $(buildjadir) && ./configure -yes -model=monster -lang=JA -clfags="-O2 -DDEBIAN" -code=E --gc-includedir=/usr/include/gc --ssl-includedir=/usr/include/openssl --mimetypes=/etc/mime.types
-	cd $(buildjadir) && LC_ALL=C $(MAKE) OPTS="-Wall -g"
-	(echo "# Configuration at "`hostname`; cat debian/config.param) > $(buildendir)/config.param
-	cd $(buildendir) && ./configure -yes -model=monster -lang=EN -cflags="-O2 -DDEBIAN" --gc-includedir=/usr/include/gc  --ssl-includedir=/usr/include/openssl --mimetypes=/etc/mime.types
-	cd $(buildendir) && LC_ALL=C $(MAKE) OPTS="-Wall -g"
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf $(buildtree)
-	rm -f extract-stamp patch-stamp configure-stamp build-stamp install-stamp
-	rm -f debian/docs debian/examples
-	dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -m 755 -s $(buildendir)/w3m `pwd`/debian/w3m-ssl/usr/bin/w3m-ssl-en
-	install -m 755 -s $(buildjadir)/w3m `pwd`/debian/w3m-ssl/usr/bin/w3m-ssl-ja
-	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
-	dh_testroot
-	dh_installdocs
-#	dh_installmenu
-#	dh_installmime
-#	dh_installemacsen
-#	dh_installinit
-#	dh_installcron
-#	dh_installman $(builddir)/doc/w3m.1
-#	install -m 644 $(builddir)/doc-jp/HISTORY.kokb `pwd`/debian/w3m-ssl/usr/share/doc/w3m-ssl/changelog.w3m-kokb
-	#dh_installchangelogs $(builddir)/doc/HISTORY
-	dh_installchangelogs $(builddir)/ChangeLog
-	dh_strip
-	dh_compress
-	(cd debian/w3m-ssl/usr/share/doc/w3m-ssl; ls -1) | while read file; do \
-	   case $$file in changelog*|copyright*|README.Debian) continue;; esac;\
-	   test -d debian/w3m-ssl/usr/share/doc/w3m-ssl/$$file && continue; \
-	   rm -f debian/w3m-ssl/usr/share/doc/w3m-ssl/$$file; \
-	   dh_link usr/share/doc/w3m/$$file usr/share/doc/w3m-ssl/$$file; \
-	done
-	dh_link usr/share/doc/w3m/examples usr/share/doc/w3m-ssl/examples
-	dh_link usr/share/doc/w3m/ja usr/share/doc/w3m-ssl/ja
-	dh_link usr/share/man/man1/w3m.1.gz usr/share/man/man1/w3m-ssl-ja.1.gz
-	dh_link usr/share/man/man1/w3m.1.gz usr/share/man/man1/w3m-ssl-en.1.gz
-	dh_link usr/share/man/ja/man1/w3m.1.gz usr/share/man/ja/man1/w3m-ssl-ja.1.gz
-	dh_link usr/share/man/ja/man1/w3m.1.gz usr/share/man/ja/man1/w3m-ssl-en.1.gz
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-#	dh_makeshlibs
-	dh_md5sums
-	dh_builddeb
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
diff --git a/debian/rules.mk b/debian/rules.mk
deleted file mode 100644
index 69e60bb..0000000
--- a/debian/rules.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Makefile -*-
-# 
-buildtree=build-tree/
-sourcedir=w3m-0.3
-builddir=$(buildtree)/$(sourcedir)
-
-extract: extract-stamp
-extract-stamp:
-	-rm -rf $(buildtree)
-	mkdir $(buildtree)
-	tar zxfC upstream/w3m-0.3.tar.gz $(buildtree)
-	touch extract-stamp
-
-patch: patch-stamp
-patch-stamp: extract-stamp
-	for p in debian/patches/[0-9]*; \
-	do \
-		test -f $$p || continue; \
-		patchopt=`sed -ne '1s/PATCH: \(.*\)/\1/p' $$p`; \
-		echo "Patch: $$p ($$patchopt)"; \
-		cat $$p | (cd $(builddir) && patch $$patchopt); \
-	done
-	touch patch-stamp
-
-
-buildjadir=$(buildtree)/$(sourcedir)-ja
-buildendir=$(buildtree)/$(sourcedir)-en
-
-setup-ja: $(buildjadir)/setup-stamp
-$(buildjadir)/setup-stamp: extract-stamp patch-stamp
-	-rm -rf $(buildjadir)
-	cp -a $(builddir) $(buildjadir)
-	touch $(buildjadir)/setup-stamp
-
-setup-en: $(buildendir)/setup-stamp
-$(buildendir)/setup-stamp: extract-stamp patch-stamp
-	-rm -rf $(buildendir)
-	cp -a $(builddir) $(buildendir)
-	touch $(buildendir)/setup-stamp
-
-configure: configure-stamp
-configure-stamp: setup-ja setup-en
-	touch configure-stamp
-