--- wysihtml-0.13.orig/autogen.sh +++ wysihtml-0.13/autogen.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# autogenerate script + +aclocal && autoheader && automake --foreign -a -c && autoconf + --- wysihtml-0.13.orig/ChangeLog +++ wysihtml-0.13/ChangeLog @@ -1,3 +1,12 @@ +2006-12-10 Junichi Uekawa + + * debian/control (Description): change to iceweasel + + * Documentation/wysihtml.tex: change to iceweasel. + + * src/wysihtml.el (wysihtml-mozilla-command-line): + * src/wysidocbookxml.el (wysidocbookxml-mozilla-command-line): change default to iceweasel instead of mozilla + 2006-05-27 Junichi Uekawa * NEWS: 0.13 --- wysihtml-0.13.orig/debian/rules +++ wysihtml-0.13/debian/rules @@ -0,0 +1,98 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatibility version to use. +export DH_COMPAT=4 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +INSTALL = install +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +CFLAGS= -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. + INSTALL_PROGRAM="$(INSTALL_PROGRAM)" CFLAGS="$(CFLAGS)" \ + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --libexecdir=/usr/lib/wysihtml --datadir=/usr/share/emacs/site-lisp + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #/usr/bin/docbook-to-man debian/wysihtml.sgml > wysihtml.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + rm -rf debian/tmp-info + + # Add here commands to clean up after the build process. + -$(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/wysihtml-el/ + # hack info doc. + -mkdir debian/tmp-info + (head -1 build/wysihtml.info; \ + cat debian/wysihtmlinfoheader ; \ + sed 1d < build/wysihtml.info ) > debian/tmp-info/wysihtml.info + -cp build/wysihtml.info-* debian/tmp-info + + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installemacsen --priority=60 + dh_installcron + dh_installman + dh_installinfo -v debian/tmp-info/wysihtml.info* + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- wysihtml-0.13.orig/debian/control +++ wysihtml-0.13/debian/control @@ -0,0 +1,19 @@ +Source: wysihtml +Section: text +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Junichi Uekawa +Build-Depends: debhelper (>> 3.0.0), hevea +Standards-Version: 3.7.2 + +Package: wysihtml-el +Architecture: any +Depends: ${shlibs:Depends}, firefox | abrowser | www-browser, xemacs21-mule | xemacs21-mule-canna-wnn | emacs23 | emacs-snapshot, elserv (>= 0.4.0+0.20011203cvs-3.2), apel, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc +Recommends: psgml +Description: Almost real-time previewing system for HTML and DocBook + WYSIHTML is a almost real-time previewing system for HTML + and DocBook XML files. + . + This package facilitates and automates + editing HTML/DocBook XML source in emacs and + previewing with iceweasel browser. --- wysihtml-0.13.orig/debian/emacsen-install +++ wysihtml-0.13/debian/emacsen-install @@ -0,0 +1,56 @@ +#! /bin/sh -e +# /usr/lib/emacsen-common/packages/install/wysihtml + +# Written by Jim Van Zandt , borrowing heavily +# from the install scripts for gettext by Santiago Vila +# and octave by Dirk Eddelbuettel . + +# special-case xemacs, since non-mule xemacs doesn't work. + +FLAVOR=$1 +PACKAGE=wysihtml + +if [ ${FLAVOR} = emacs ]; then exit 0; fi + +if [ ${FLAVOR} = xemacs21 ]; then + XEMACS=`ls /usr/bin/xemacs*21*-mule* 2> /dev/null | head -1` + if [ -z $XEMACS ]; then exit 0; fi + XEMACS=`basename $XEMACS` +else + unset XEMACS || true +fi + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + + +#FLAVORTEST=`echo $FLAVOR | cut -c-6` +#if [ ${FLAVORTEST} = xemacs ] ; then +# SITEFLAG="-no-site-file" +#else +# SITEFLAG="--no-site-file" +#fi +FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +# Install-info-altdir does not actually exist. +# Maybe somebody will write it. +if test -x /usr/sbin/install-info-altdir; then + echo install/${PACKAGE}: install Info links for ${FLAVOR} + install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz +fi + +install -m 755 -d ${ELCDIR} +cd ${ELDIR} +FILES=`echo *.el` +cp ${FILES} ${ELCDIR} +cd ${ELCDIR} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${XEMACS:-$FLAVOR} ${FLAGS} ${FILES} +rm -f *.el path.el + +exit 0 --- wysihtml-0.13.orig/debian/wysihtmlinfoheader +++ wysihtml-0.13/debian/wysihtmlinfoheader @@ -0,0 +1,4 @@ +INFO-DIR-SECTION Emacs +START-INFO-DIR-ENTRY +* Wysihtml: (wysihtml). wysihtml documentation. +END-INFO-DIR-ENTRY --- wysihtml-0.13.orig/debian/emacsen-remove +++ wysihtml-0.13/debian/emacsen-remove @@ -0,0 +1,15 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/wysihtml + +FLAVOR=$1 +PACKAGE=wysihtml + +if [ ${FLAVOR} != emacs ]; then + if test -x /usr/sbin/install-info-altdir; then + echo remove/${PACKAGE}: removing Info links for ${FLAVOR} + install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/wysihtml.info.gz + fi + + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} +fi --- wysihtml-0.13.orig/debian/dirs +++ wysihtml-0.13/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- wysihtml-0.13.orig/debian/changelog +++ wysihtml-0.13/debian/changelog @@ -0,0 +1,181 @@ +wysihtml (0.13-5.1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Replaced iceape and iceweasel deps + with mozilla and firefox ones. + + -- Artur Rona Tue, 02 Nov 2010 19:39:49 +0100 + +wysihtml (0.13-5.1) unstable; urgency=low + + * debian/control + - (Depends): Remove emacs22, add emacs23 (important; Closes: #577467). + + -- Jari Aalto Thu, 14 Oct 2010 10:14:00 +0300 + +wysihtml (0.13-5ubuntu2) intrepid; urgency=low + + * fix LP: #272772: packages that Depend/Recommend/Suggest firefox + (meta-package) must alternatively Depend/Recommend/Suggest abrowser + - update debian/control + + -- Fabien Tassin Mon, 22 Sep 2008 00:18:51 +0200 + +wysihtml (0.13-5ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Replaced iceape and iceweasel deps with mozilla and firefox ones. + - Update maintainer field in debian/control. + + -- Michele Angrisano Fri, 13 Jul 2007 14:23:35 +0200 + +wysihtml (0.13-5) unstable; urgency=low + + * support emacs22 + + -- Junichi Uekawa Thu, 12 Jul 2007 22:31:24 +0900 + +wysihtml (0.13-4ubuntu2) feisty; urgency=low + + * debian/control: change depends from mozilla-browser | firefox to + firefox | www-browser. + + -- Michael Bienia Wed, 14 Feb 2007 17:29:43 +0100 + +wysihtml (0.13-4ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Ubuntu changes: + - Replaced iceape and iceweasel deps with mozilla and firefox ones + - Maintainer field changed to Ubuntu MOTU Developers + * Fixed typos in the Maintainer field + + -- Adrien Cunin Sun, 28 Jan 2007 18:04:29 +0100 + +wysihtml (0.13-4) unstable; urgency=low + + * Bug fix: "wysihtml-el: Please add a depends against emacsen or + emacs-snapshot", thanks to arnaud@andesi.org (Closes: #403162). + * add Recommends to psgml. + + -- Junichi Uekawa Fri, 5 Jan 2007 14:11:31 +0900 + +wysihtml (0.13-3ubuntu1) feisty; urgency=low + + * debian/control: + - Changed Maintainer Field to Ubuntu MOTU Developer and moved old + Maintainer field to Original-Maintainer + - Replaced Debians ice* deps to Ubuntus Mozilla package names + + -- Stephan Hermann Sat, 20 Jan 2007 17:47:17 +0100 + +wysihtml (0.13-3) unstable; urgency=low + + * Bug fix: "wysihtml-el: still depends on old mozilla-browser or firefox + packages", thanks to Laurent Bonnaud (Closes: #402271). + Now depends on iceweasel or iceape-browser + * update documentation to refer to iceweasel instead of mozilla. + + -- Junichi Uekawa Sun, 10 Dec 2006 14:39:51 +0900 + +wysihtml (0.13-2) unstable; urgency=low + + * Build-Depends: hevea (closes: #369766) + * Standards-Version: 3.7.2 + * Debhelper compatibility level: 4 + + -- Junichi Uekawa Fri, 2 Jun 2006 00:17:17 +0900 + +wysihtml (0.13-1) unstable; urgency=low + + * New upstream version + - now includes an info documentation. + * Change dependency to mozilla | firefox + * start to pretend real xemacs support. + * update to work with recent pbuilder-doc.xml. Handle documents starting + with + + -- Junichi Uekawa Sat, 27 May 2006 08:13:01 +0900 + +wysihtml (0.12-1) unstable; urgency=low + + * New upstream version + - Rewritten DocBookXML support. + * Standards-version: 3.6.2 + + -- Junichi Uekawa Sun, 21 Aug 2005 13:01:17 +0900 + +wysihtml (0.11-1) unstable; urgency=low + + * New upstream version + - Work with new LDP xsl stylesheet 0.0.20040321-0.1 + + -- Junichi Uekawa Tue, 4 Jan 2005 12:45:41 +0900 + +wysihtml (0.10-3) unstable; urgency=low + + * Added mozilla-firefox as alternative to dependency. (Closes: #236599). + + -- Junichi Uekawa Tue, 9 Mar 2004 08:44:09 +0900 + +wysihtml (0.10-2) unstable; urgency=low + + * Do not die when xemacs-nomule exists. (Closes: #234827). + + -- Junichi Uekawa Sat, 28 Feb 2004 08:52:18 +0900 + +wysihtml (0.10-1) unstable; urgency=low + + * New upstream version + * Standards-version: 3.6.1 + * Fix build rules to get nostrip and noopt options to work. + + -- Junichi Uekawa Tue, 30 Dec 2003 23:49:07 +0900 + +wysihtml (0.9-1) unstable; urgency=low + + * New upstream version + + -- Junichi Uekawa Sat, 26 Jul 2003 12:22:37 +0900 + +wysihtml (0.8-1) unstable; urgency=low + + * New upstream version + - documentation improvements + - Allow "customize" from emacs interface. + + -- Junichi Uekawa Sun, 18 May 2003 12:41:20 +0900 + +wysihtml (0.7-1) unstable; urgency=low + + * New upstream version + - improved docbook-xml handling. + + -- Junichi Uekawa Fri, 11 Apr 2003 00:18:52 +0900 + +wysihtml (0.6-2) unstable; urgency=low + + * Fix typo in emacsen startup script. + + -- Junichi Uekawa Tue, 8 Apr 2003 22:17:20 +0900 + +wysihtml (0.6-1) unstable; urgency=low + + * Update Depends line to clarify that this thing requires xemacs21 mule + version. + * versioned depends on a fixed elserv. (closes: #179627) + * Check for mule in startup scripts. + + -- Junichi Uekawa Mon, 10 Mar 2003 00:44:55 +0900 + +wysihtml (0.5-2) unstable; urgency=low + + * check if mule is avilable in the startup script. + + -- Junichi Uekawa Sat, 15 Feb 2003 16:31:09 +0900 + +wysihtml (0.5-1) unstable; urgency=low + + * Initial Release (closes: #178450) + + -- Junichi Uekawa Sat, 25 Jan 2003 21:45:05 +0900 + --- wysihtml-0.13.orig/debian/README.Debian +++ wysihtml-0.13/debian/README.Debian @@ -0,0 +1,8 @@ +wysihtml for Debian +------------------- + +This is WYSIHTML, an almost wysiwyg mode for emacs. + +Edit a file in html-mode, and type M-x wysihtml-mode. + + -- Junichi Uekawa , Mon Jan 27 19:14:31 2003 --- wysihtml-0.13.orig/debian/copyright +++ wysihtml-0.13/debian/copyright @@ -0,0 +1,11 @@ +This package was debianized by Junichi Uekawa on +Sat, 25 Jan 2003 21:45:05 +0900. + +It was downloaded from http://www.netfort.gr.jp/~dancer/software/downloads/wysihtml-0.5.tar.gz + +Upstream Author: Junichi Uekawa + +Copyright: + +GPL version 2 or later, see /usr/share/common-licenses/GPL-2 + --- wysihtml-0.13.orig/debian/emacsen-startup +++ wysihtml-0.13/debian/emacsen-startup @@ -0,0 +1,20 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file for the Debian GNU/Linux wysihtml package +;; +;; Originally contributed by Nils Naumann +;; Modified by Dirk Eddelbuettel +;; Adapted for dh-make by Jim Van Zandt + +;; The wysihtml package follows the Debian/GNU Linux 'emacsen' policy and +;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, +;; xemacs19, emacs20, xemacs20...). The compiled code is then +;; installed in a subdirectory of the respective site-lisp directory. +;; We have to add this to the load-path: +(if (featurep 'mule) + (setq load-path (cons (concat "/usr/share/" + (symbol-name flavor) + "/site-lisp/wysihtml") load-path))) +(autoload 'wysihtml-mode "wysihtml" nil t) +(autoload 'wysidocbookxml-mode "wysidocbookxml" nil t) + --- wysihtml-0.13.orig/Documentation/wysihtml.tex +++ wysihtml-0.13/Documentation/wysihtml.tex @@ -16,14 +16,14 @@ wysihtml is a suite of applications for emacs to have a semi-real-time HTML editing and previewing -using Mozilla Firefox web-browser. +using Iceweasel web-browser. -The preview in Mozilla Firefox is updated as characters are typed +The preview in Iceweasel is updated as characters are typed in emacs. \subsection{Requirements} -To use wysihtml, it is required to have elserv, and Mozilla Firefox +To use wysihtml, it is required to have elserv, and Iceweasel \footnote{It is possible to use other browsers if it is possible to get a command-line to re-load a web page in real-time} functional. --- wysihtml-0.13.orig/src/wysidocbookxml.el +++ wysihtml-0.13/src/wysidocbookxml.el @@ -34,7 +34,7 @@ (defcustom wysidocbookxml-elserv-port 8090 "Elserv port used for wysidocbookxml." :group 'wysidocbookxml :type 'number) -(defcustom wysidocbookxml-mozilla-command-line "mozilla -remote openurl\\(file:///%s%s\\)" "The command-line used to invoke mozilla remote interface") +(defcustom wysidocbookxml-mozilla-command-line "iceweasel -remote openurl\\(file:///%s%s\\)" "The command-line used to invoke mozilla remote interface") (defvar wysidocbookxml-elserv-process nil "The elserv process identifier for the elserv process being used for wysidocbookxml.") (defvar wysidocbookxml-current-buffer nil "The buffer which is going to be displayed through elserv, for preview.") --- wysihtml-0.13.orig/src/wysidocbookdaemon.c +++ wysihtml-0.13/src/wysidocbookdaemon.c @@ -1,6 +1,6 @@ /* * wysidocbookdaemon -- daemon for wysi docbook XML - * Copyright (C) 2003,2005 Junichi Uekawa + * Copyright (C) 2003,2005-2006 Junichi Uekawa * * 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 --- wysihtml-0.13.orig/src/wysihtml.el +++ wysihtml-0.13/src/wysihtml.el @@ -1,5 +1,5 @@ ;; Routines for "what you see is HTML". -;; copyright 2003 Junichi Uekawa. +;; copyright 2003,2006 Junichi Uekawa. ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ (defcustom wysihtml-elserv-port 8089 "Elserv port used for wysihtml." :group 'wysihtml :type 'number) -(defcustom wysihtml-mozilla-command-line "mozilla -remote openurl\\(%s\\)" +(defcustom wysihtml-mozilla-command-line "iceweasel -remote openurl\\(%s\\)" "The command-line used to invoke mozilla-remote interface.") (defvar wysihtml-elserv-process nil "The elserv process identifier for the elserv process being used for wysihtml.") (defvar wysihtml-current-buffer nil