Hi,

The following is the diff for my ion2 20040729-2.1 NMU, with Julien's
patch applied.

diff -u ion2-20040729/debian/control ion2-20040729/debian/control
--- ion2-20040729/debian/control
+++ ion2-20040729/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Per Olofsson <[EMAIL PROTECTED]>
 Uploaders: Norbert Tretkowski <[EMAIL PROTECTED]>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 Build-Depends: debhelper (>> 4), libxinerama-dev, gcc (>> 3), liblua50-dev (>> 
5.0.2), liblualib50-dev (>> 5.0.2), lua50 (>> 5.0.2), libtool (>> 1.4.1), 
libltdl3-dev (>> 1.4.1), tetex-extra, hevea
 
 Package: ion2
diff -u ion2-20040729/debian/changelog ion2-20040729/debian/changelog
--- ion2-20040729/debian/changelog
+++ ion2-20040729/debian/changelog
@@ -1,3 +1,14 @@
+ion2 (20040729-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ion2's macros.tex to work with hevea 1.09: (Closes: #396930)
+     + patch from Luc Maranget <[EMAIL PROTECTED]>
+  * Bump Standards-Version to 3.7.2.
+  * Update FSF address.
+  * install-menu is in /usr/bin, not /usr/sbin.
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]>  Fri, 10 Nov 2006 02:48:44 
+0100
+
 ion2 (20040729-2) unstable; urgency=low
 
   * Used libxinerama-dev instead of libx11-dev in build-dependencies and
diff -u ion2-20040729/debian/copyright ion2-20040729/debian/copyright
--- ion2-20040729/debian/copyright
+++ ion2-20040729/debian/copyright
@@ -89,7 +89,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * $Header: /home/twp/cvsroot/twp/ion/ion-devel-dock/dock.c,v 1.17 2003/12/21 
11:59:48 twp Exp $
  *
diff -u ion2-20040729/debian/ion2.menu-method 
ion2-20040729/debian/ion2.menu-method
--- ion2-20040729/debian/ion2.menu-method
+++ ion2-20040729/debian/ion2.menu-method
@@ -1,4 +1,4 @@
-#!/usr/sbin/install-menu
+#!/usr/bin/install-menu
 # by Iwan Heskamp <[EMAIL PROTECTED]>
 # http://tdm120.el.utwente.nl/~hkp/pwm/
 # Modified for Ion by Per Olofsson <[EMAIL PROTECTED]>
diff -u ion2-20040729/debian/ion2.menu-method.i18n 
ion2-20040729/debian/ion2.menu-method.i18n
--- ion2-20040729/debian/ion2.menu-method.i18n
+++ ion2-20040729/debian/ion2.menu-method.i18n
@@ -1,4 +1,4 @@
-#!/usr/sbin/install-menu
+#!/usr/bin/install-menu
 # by Iwan Heskamp <[EMAIL PROTECTED]>
 # http://tdm120.el.utwente.nl/~hkp/pwm/
 # Modified for Ion by Per Olofsson <[EMAIL PROTECTED]>
diff -u ion2-20040729/ion-doc/macros.tex ion2-20040729/ion-doc/macros.tex
--- ion2-20040729/ion-doc/macros.tex
+++ ion2-20040729/ion-doc/macros.tex
@@ -1,4 +1,4 @@
-\usepackage{babel}
+\usepackage[english]{babel}
 \usepackage[latin1]{inputenc}
 \usepackage{ae}
 \usepackage{url}
@@ -21,9 +21,6 @@
 \begin{htmlonly}
 %END LATEX
 
-\remakesection
-  {\chapter}{-1}{chapter}
-  [EMAIL PROTECTED]@close{H1}}
 \setcounter{tocdepth}{3}
 \setcounter{indexcols}{1}
 [EMAIL PROTECTED]@attributes}{CELLSPACING=10 CELLPADDING=0}
@@ -35,9 +32,21 @@
 
 % URL settings
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%BEGIN LATEX
 \urlstyle{rm}
 \newcommand{\centerurl}[1]{\begin{center}\url{#1}\end{center}}
+%END LATEX
+
+%BEGIN LATEX
+\begin{htmlonly}
+%END LATEX
+
+\urlstyle{rm}
+\newcommand{\centerurl}[1]{\begin{center}\ahrefurl{#1}\end{center}}
+
+%BEGIN LATEX
+\end{htmlonly}
+%END LATEX
 
 % listings package
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -58,7 +67,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \newcommand{\note}[1]{\color{red}**#1**}
+%BEGIN LATEX
 \newcommand{\file}[1]{\emph{#1}}
+%END LATEX
 \newcommand{\type}[1]{#1}
 \newcommand{\spec}[1]{#1}
 \newcommand{\key}[1]{\textbf{#1}}
@@ -77,15 +88,18 @@
 %BEGIN LATEX
 \begin{htmlonly}
 %END LATEX
-\newcommand{\code}[1]{\texttt{#1}}
-\newcommand{\var}[1]{\texttt{#1}}
-\newcommand{\command}[1]{\texttt{#1}}
[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]@tilde\emph{#1}}}
[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]@o{#1}}}
[EMAIL PROTECTED]@o
[EMAIL PROTECTED]@o
[EMAIL PROTECTED]@o
 
 % docode is not present nor needed in hevea
 \newcommand{\docode}{}
-
-\newcommand{\hyperlabel}[1]{\label{#1}}
-\newcommand{\fnref}[1]{\aname{fn:#1}{\texttt{#1}}}
[EMAIL PROTECTED]@o}[1]{{\catcode95=12{}#1}}
[EMAIL PROTECTED]@o{#1}}}
+\newcommand{\fnref}[1]{\ahrefloc{fn:[EMAIL PROTECTED]@[EMAIL 
PROTECTED]@o{#1}}}}
 \newcommand{\myhref}[2]{\ahref{#2}{#1}}
 %BEGIN LATEX
 \end{htmlonly}
@@ -128,10 +142,10 @@
   \end{description}
 }
 \newcommand{\synopsis}[1]{
-  \item[Synopsis:] \texttt{#1}
+  \item[Synopsis:] \code{#1}
 }
 \newcommand{\funcname}[1]{
-  \item[Function:] \texttt{#1}
+  \item[Function:] \code{#1}
 }
 \newenvironment{funcdesc}{
   \item[Description:]


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to