[Debian-astro-commits] [starlink-ast] 02/02: Adjust patches and symbols for new version
Ole Streicher
olebole at moszumanska.debian.org
Sun Aug 16 14:46:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository starlink-ast.
commit 392c5f7c385df7898a9bc21d8864a197c0a2697d
Author: Ole Streicher <olebole at debian.org>
Date: Wed Aug 12 14:17:24 2015 +0200
Adjust patches and symbols for new version
---
debian/changelog | 6 +
debian/copyright | 2 +-
debian/libstarlink-ast0.symbols | 12 +
debian/patches/latexstyle.patch | 754 ----------------------------------
debian/patches/rename_library | 9 +-
debian/patches/series | 1 -
debian/patches/use_external_pal.patch | 5 +-
7 files changed, 29 insertions(+), 760 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6e30d92..cba8aa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+starlink-ast (8.0.5+dfsg-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <olebole at debian.org> Wed, 12 Aug 2015 14:17:36 +0200
+
starlink-ast (8.0.4+dfsg-1) unstable; urgency=low
* New upstream version
diff --git a/debian/copyright b/debian/copyright
index 25094d1..2795c4e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: AST
Upstream-Author: David Berry, R.F. Warren-Smith
Source: http://www.starlink.ac.uk/ast
-Files: * debian/patches/latexstyle.patch
+Files: *
Copyright: Copyright 1997-2009 Council for the Central Laboratory of the
Research Councils
Copyright (C) 2007-2012 Science & Technology Facilities Council
diff --git a/debian/libstarlink-ast0.symbols b/debian/libstarlink-ast0.symbols
index b4a50d9..b88d327 100644
--- a/debian/libstarlink-ast0.symbols
+++ b/debian/libstarlink-ast0.symbols
@@ -299,6 +299,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astClearLogLabel_ at Base 7.0.4
astClearLogPlot_ at Base 7.0.4
astClearLogTicks_ at Base 7.0.4
+ astClearLutEpsilon_ at Base 8.0.5
astClearLutInterp_ at Base 7.0.4
astClearMajTickLen_ at Base 7.0.4
astClearMapLocked_ at Base 7.0.4
@@ -345,6 +346,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astClearSkyRefIs_ at Base 7.0.4
astClearSkyRefP_ at Base 7.0.4
astClearSkyRef_ at Base 7.0.4
+ astClearSkyTol_ at Base 8.0.5
astClearSortBy_ at Base 7.0.4
astClearSourceFile_ at Base 7.0.4
astClearSourceSys_ at Base 7.0.4
@@ -492,6 +494,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astGetAxisDigits_ at Base 7.0.4
astGetAxisDirection_ at Base 7.0.4
astGetAxisFormat_ at Base 7.0.4
+ astGetAxisInternalUnit_ at Base 8.0.5
astGetAxisIsLatitude_ at Base 7.0.4
astGetAxisLabel_ at Base 7.0.4
astGetAxisNormUnit_ at Base 7.0.4
@@ -584,6 +587,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astGetInPerm_ at Base 7.0.4
astGetIndent_ at Base 7.0.4
astGetInk_ at Base 7.0.4
+ astGetInternalUnit_ at Base 8.0.5
astGetIntraFlag_ at Base 7.0.4
astGetInvert_ at Base 7.0.4
astGetInvisible_ at Base 7.0.4
@@ -610,6 +614,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astGetLogPlot_ at Base 7.0.4
astGetLogTicks_ at Base 7.0.4
astGetLonAxis_ at Base 7.0.4
+ astGetLutEpsilon_ at Base 8.0.5
astGetLutInterp_ at Base 7.0.4
astGetLutMapInfo_ at Base 7.0.4
astGetMajTickLen_ at Base 7.0.4
@@ -692,6 +697,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astGetSkyRefIs_ at Base 7.0.4
astGetSkyRefP_ at Base 7.0.4
astGetSkyRef_ at Base 7.0.4
+ astGetSkyTol_ at Base 8.0.5
astGetSortBy_ at Base 7.0.4
astGetSourceFile_ at Base 7.0.4
astGetSourceSys_ at Base 7.0.4
@@ -1490,6 +1496,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astSetLogLabel_ at Base 7.0.4
astSetLogPlot_ at Base 7.0.4
astSetLogTicks_ at Base 7.0.4
+ astSetLutEpsilon_ at Base 8.0.5
astSetLutInterp_ at Base 7.0.4
astSetMajTickLen_ at Base 7.0.4
astSetMapLocked_ at Base 7.0.4
@@ -1542,6 +1549,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astSetSkyRefIs_ at Base 7.0.4
astSetSkyRefP_ at Base 7.0.4
astSetSkyRef_ at Base 7.0.4
+ astSetSkyTol_ at Base 8.0.5
astSetSortBy_ at Base 7.0.4
astSetSourceFile_ at Base 7.0.4
astSetSourceSys_ at Base 7.0.4
@@ -1601,6 +1609,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astSkyFrame_ at Base 7.0.4
astSkyOffsetMap_ at Base 7.0.4
astSlaAdd_ at Base 7.0.4
+ astSlaIsEmpty_ at Base 8.0.5
astSlaMapId_ at Base 7.0.4
astSlaMap_ at Base 7.0.4
astSourceWrap_ at Base 7.0.4
@@ -1670,6 +1679,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astTestAxisDigits_ at Base 7.0.4
astTestAxisDirection_ at Base 7.0.4
astTestAxisFormat_ at Base 7.0.4
+ astTestAxisInternalUnit_ at Base 8.0.5
astTestAxisIsLatitude_ at Base 7.0.4
astTestAxisLabel_ at Base 7.0.4
astTestAxisNormUnit_ at Base 7.0.4
@@ -1746,6 +1756,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astTestLogLabel_ at Base 7.0.4
astTestLogPlot_ at Base 7.0.4
astTestLogTicks_ at Base 7.0.4
+ astTestLutEpsilon_ at Base 8.0.5
astTestLutInterp_ at Base 7.0.4
astTestMajTickLen_ at Base 7.0.4
astTestMapLocked_ at Base 7.0.4
@@ -1792,6 +1803,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
astTestSkyRefIs_ at Base 7.0.4
astTestSkyRefP_ at Base 7.0.4
astTestSkyRef_ at Base 7.0.4
+ astTestSkyTol_ at Base 8.0.5
astTestSortBy_ at Base 7.0.4
astTestSourceFile_ at Base 7.0.4
astTestSourceSys_ at Base 7.0.4
diff --git a/debian/patches/latexstyle.patch b/debian/patches/latexstyle.patch
deleted file mode 100644
index 09e6ab6..0000000
--- a/debian/patches/latexstyle.patch
+++ /dev/null
@@ -1,754 +0,0 @@
-Author: Sarah F Graves
-Description: Provide missing LaTeX style files
- These files were taken from Starlinks github repository.
-Url: https://github.com/Starlink/starlink
---- /dev/null
-+++ b/starlink.cls
-@@ -0,0 +1,510 @@
-+% Latex2E class for writing starlink documents.
-+\NeedsTeXFormat{LaTeX2e}
-+\ProvidesClass{starlink}
-+%-----------------------------------------------------%
-+% .. Class options.
-+
-+% With chapters...
-+\newif\ifwithchapters
-+\withchaptersfalse
-+
-+% If twoside...
-+\newif\iftwoside
-+\twosidefalse
-+
-+% If list of figures (lof)
-+\newif\ifwithlof
-+\withloftrue
-+
-+% If no abstract
-+\newif\ifwithabs
-+\withabstrue
-+
-+% If all one page (affects html output only)
-+\newif\ifmultipage
-+\multipagetrue
-+
-+% Declare the options.
-+\DeclareOption{chapters}{\withchapterstrue}
-+\DeclareOption{twoside}{\twosidetrue}
-+\DeclareOption{nolof}{\withloffalse}
-+\DeclareOption{noabs}{\withabsfalse}
-+\DeclareOption{onepage}{\multipagefalse}
-+
-+% Pass all options not defined above to the classes.
-+% (Must be done before process options)
-+\ifwithchapters
-+ \typeout{..... passing options to report .....}
-+ \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
-+\else
-+ \typeout{........passing options to article......}
-+ \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-+\fi
-+
-+% Process custom options.
-+\ProcessOptions\relax
-+
-+
-+\ifwithchapters
-+ \LoadClass{report}
-+ \typeout{........Report!...........}
-+\else
-+ \LoadClass{article}
-+ \typeout{..........Article!..........}
-+\fi
-+
-+
-+%--------------------------------------
-+% Packages required for all reports
-+% chek if in a pdf or not
-+\RequirePackage{ifpdf}
-+
-+
-+% Font types and encoding.
-+\RequirePackage[T1]{fontenc}
-+\RequirePackage[utf8]{inputenc}
-+
-+% microtype For improved pdf typography (must come after loading class)
-+\RequirePackage{microtype}
-+
-+%maths
-+\RequirePackage{amsmath}
-+\RequirePackage{mathpazo}
-+
-+% units
-+\RequirePackage{siunitx}
-+
-+% Titlesec.
-+\RequirePackage{titlesec}
-+
-+% Package to allow graphics to be loaded (\includegraphics) and the
-+% default extensions it will look for (and their order).
-+\RequirePackage{graphicx}
-+\DeclareGraphicsExtensions{.pdf,.png,.jpg,.jpeg}
-+
-+%.. Probably needed for something?
-+\RequirePackage{multirow}
-+
-+% formatting of list enivornments
-+\RequirePackage{enumitem}
-+
-+%.. Using color
-+\RequirePackage[usenames,dvipsnames,svgnames,table]{xcolor}
-+
-+%.. Allow boxes with frames and backgrounds, over multiple pages
-+\RequirePackage[framemethod=TikZ]{mdframed}
-+
-+%.. Allow tables on multiple pages
-+\RequirePackage{longtable}
-+
-+%.. Allow sideways tables
-+\RequirePackage{rotating}
-+
-+%.. Allow landscape pdf pages
-+\RequirePackage{pdflscape}
-+
-+%.. Set up the page
-+\RequirePackage[text={160mm,230mm},centering]{geometry}
-+
-+%.. title page formatting
-+\RequirePackage{titling}
-+
-+%... Set up the headers.
-+\RequirePackage{fancyhdr}
-+
-+%.... table of contents formatting
-+\ifpdf
-+\RequirePackage{tocloft}
-+\fi
-+
-+%.. hyperref
-+\RequirePackage[pdfusetitle=true,backref,
-+ breaklinks=True,pdfdisplaydoctitle=true]{hyperref}
-+
-+%... allow environments using verbatim
-+\RequirePackage{fancyvrb}
-+
-+%... allow starlink docs to use indexes
-+\RequirePackage{makeidx}
-+
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+
-+% Starlink document identification commands
-+\newcommand{\stardoccategory}[1]{\def \@stardoccategory {#1}}
-+\newcommand{\stardocinitials}[1]{\def \@stardocinitials {#1}}
-+\newcommand{\stardoccopyright}[1]{\def \@stardoccopyright {#1}}
-+\newcommand{\stardocnumber}[1]{\def \@stardocnumber{#1}}
-+
-+% Define a stardoctitle that takes an optional 'short' argument; this
-+% can then be used in various places. E.g. if you have a multi line
-+% full title, please ensure you also have a single line short title.
-+\def\stardoctitle{\@ifnextchar [{\@stardoctitletwo}{\@stardoctitleone}}
-+\def\@stardoctitletwo[#1]#2{\gdef\@stardoctitle{#2}\gdef\@shorttitle{#1}}
-+\def\@stardoctitleone#1{\gdef\@stardoctitle{#1}\gdef\@shorttitle{#1}}
-+
-+\newcommand{\stardocversion}[1]{\def \@stardocversion{#1}}
-+\newcommand{\stardocmanual}[1]{\def \@stardocmanual{#1}}
-+\newcommand{\stardocabstract}[1]{\def \@stardocabstract{#1}}
-+\newcommand{\stardocauthors}[1]{\def\@stardocauthors{#1}}
-+\newcommand{\stardocdate}[1]{\def\@stardocdate{#1}}
-+\newcommand{\startitlepic}[1]{\def\@startitlepic{#1}}
-+\newcommand{\starfunders}[1]{\def\@starfunders{#1}}
-+\newcommand{\starproject}[1]{\def\@starproject{#1}}
-+\newcommand{\stardocsource}[1]{\def\@stardocsource{#1}}
-+\newcommand{\stardocname}[1]{\def\@stardocname{#1}}
-+
-+% Defaults for current data?
-+\starfunders{}
-+\starproject{Starlink Project}
-+
-+% initalise to nothing
-+\stardoccategory{}
-+\stardocinitials{}
-+\stardoccopyright{}
-+\stardocnumber{}
-+\stardoctitle{}
-+\stardocversion{}
-+\stardocmanual{}
-+\stardocabstract{}
-+\stardocauthors{}
-+\startitlepic{}
-+\stardocname{}
-+\stardocauthors{}
-+\stardocdate{}
-+
-+
-+% Provide \the... versions of these commands so you don't need to use @
-+% in latex.
-+\newcommand{\thestardoccategory}{\@stardoccategory}
-+\newcommand{\thestardocinitials}{\@stardocinitials}
-+\newcommand{\thestardoccopyright}{\@stardoccopyright}
-+\newcommand{\thestardocnumber}{\@stardocnumber}
-+\newcommand{\thestardoctitle}{\@stardoctitle}
-+\newcommand{\theshorttitle}{\@shorttitle}
-+\newcommand{\thestardocversion}{\@stardocversion}
-+\newcommand{\thestardocmanual}{\@stardocmanual}
-+\newcommand{\thestardocabstract}{\@stardocabstract}
-+\newcommand{\thestardocauthors}{\@stardocauthors}
-+\newcommand{\thestarfunders}{\@starfunders}
-+\newcommand{\thestarproject}{\@starproject}
-+\newcommand{\thestartitlepic}{\@startitlepic}
-+\newcommand{\thestardocsource}{\@stardocsource}
-+\newcommand{\thestardocdate}{\@stardocdate}
-+
-+% Ensure the stardoctitle etc is available as \thetitle.
-+\newcommand{\thetitle}{\@stardoctitle}
-+\title{\@stardoctitle}
-+
-+% Ensure the author list is available as \theauthor.
-+\newcommand{\theauthor}{\@stardocauthors}
-+\author{\@stardocauthors}
-+
-+
-+%%--------------------------------------------------------
-+
-+%% Various commands to setup the frontmatter of starlink docs.
-+
-+%% This should consist of 1) the title, 2) the abstract, 3) the table
-+%% of contents, 4) the list of figures (unless class option nolof is given).
-+
-+%.. Format the initial header.
-+\newcommand{\titleheader}{%
-+ \begin{flushright}
-+ \textbf{\thestardocinitials /\thestardocnumber}
-+ \end{flushright}
-+ \thestarproject\\
-+ \thestardoccategory\ \thestardocnumber\\
-+}
-+
-+%... Format the main ttile
-+\newcommand{\titlemain}{%
-+\begin{center}
-+{\Huge\textbf{\thestardoctitle}}
-+
-+{\Huge\textbf{\thestardocversion}}
-+
-+{\Huge\textbf{\thestardocmanual}}
-+\end{center}
-+}
-+
-+
-+% Graphics for front page
-+\newcommand{\thestargraphics}{%
-+\centering
-+\thestartitlepic
-+\vspace{7.5mm}
-+\rule{\textwidth}{0.5mm}%
-+}
-+
-+% .. Provide a command \startitle page that will produce a consistent
-+% starlink title page
-+\newcommand{\startitlepage}{%
-+ \null
-+ \vskip 2em%
-+\vspace*{-1\baselineskip}
-+\thispagestyle{empty}
-+\titleheader
-+%\vspace{-7mm}
-+\begin{flushright}
-+\par\thestardocauthors
-+\par\thestardocdate
-+\par\thestardoccopyright
-+\end{flushright}
-+%\vspace{-2mm}
-+\rule{\textwidth}{0.5mm}
-+\vspace{7.5mm}
-+\titlemain%\par
-+%\vspace{5mm}
-+\thestargraphics\\
-+}
-+
-+
-+%%.. command to print the abstract (with copyright at bottom of page)
-+\newcommand{\Abstract}{%
-+ \ifwithabs
-+ \ifwithchapters
-+ \chapter*{}
-+ \fi
-+ \section*{Abstract}
-+ \thispagestyle{fancy}
-+ \markboth{Abstract}{}
-+ \thestardocabstract{}
-+ \\
-+ \vspace*{\fill}
-+ \\
-+ {\small\thestardoccopyright{}}
-+ \clearpage
-+ \fi
-+}
-+
-+%% General Front matter command -- title page, abstract, toc, lof This
-+%% command \scfrontmatter is what should be called
-+%% after \begin{document} in any starlink tex file.
-+
-+\newcommand*{\scfrontmatter}{
-+% Use roman page numbers
-+\renewcommand{\thepage}{\roman{page}}
-+\setcounter{page}{1}
-+
-+% Create the titlepage
-+\begin{titlepage}%
-+\startitlepage
-+\end{titlepage}
-+
-+% Show the abstract (defined to do nothing if noabs is set)
-+\Abstract{}
-+
-+\clearpage
-+
-+% Table of contents (catcode stuff to prevent errors with _)
-+\begingroup \catcode`\_=12 \tableofcontents \endgroup
-+\clearpage
-+
-+% unless the class option 'nolof' has been given, create a list of
-+% figures.
-+\ifwithlof
-+ \begingroup \catcode`\_=12 \listoffigures \endgroup
-+\fi
-+\clearpage
-+
-+% Reset the page counting to arabic and start from 1.
-+\renewcommand{\thepage}{\arabic{page}}
-+\setcounter{page}{1}
-+}
-+%%%-------------------------------------
-+%% Back matter commands (references and index)
-+% Ensure index shows up in toc.
-+\let\oldprintindex\printindex
-+\renewcommand{\printindex}{%
-+ \phantomsection \addcontentsline{toc}{section}{Index}
-+ \oldprintindex}
-+
-+%%------------------------------------
-+
-+%% Various class specific macros
-+
-+%% Starlink list enivornments
-+
-+%% enumdesc: An enumerated description list
-+\newcounter{enumdescc}
-+\newcounter{enumdescci}
-+\newlist{enumdesc}{description}{2}
-+\setlist[enumdesc,1]{%
-+ before={\stepcounter{enumdescc}\setcounter{enumdescci}{0}},%
-+ style=nextline,leftmargin=0.5cm,labelindent=0.5cm,rightmargin=0.5cm,
-+ topsep=0.5\baselineskip, font={%
-+ \phantomsection\normalfont\normalsize\bfseries\refstepcounter{enumdescci}\theenumdescci~}
-+}
-+
-+
-+
-+%% A description list which has the labels in a box on the left with
-+%% the length of the widest label, and the definitions aligned past
-+%% it. In HTML output, starstyle.4ht will format this as a table.
-+
-+%% This uses the package eqparbox to get the box of width of the
-+%% widest label (takes 2 runs of pdflatex).
-+\usepackage{eqparbox}
-+
-+\newcounter{desc}
-+\newcommand{\descriptionmakelabel}[1]{\eqparbox{descnb\romannumeral\value{desc}}{#1\hfill}}
-+
-+\newlist{aligndesc}{description}{2}
-+\setlist[aligndesc]{before={\refstepcounter{desc}\renewcommand{\makelabel}{\descriptionmakelabel}},
-+ leftmargin=\dimexpr\eqboxwidth{descnb\romannumeral\numexpr\value{desc}+1\relax}+3em\relax,
-+ labelsep=1em, labelindent=2em, rightmargin=2em}
-+
-+%%%--------------------------------------------------------------
-+%% Linking and referencing commands.
-+
-+%%.. Starlink xref command
-+%% By default use the starlink.ac.uk; this will be fixed up at the
-+%% end of make world by a different program.
-+\newcommand{\xref}[3]{%
-+\href{http://www.starlink.ac.uk/cgi-bin/htxserver/#2.htx/#2.html?xref_#3}{#1}}
-+\newcommand{\xlabel}[1]{\label{\protect{xref_#1}}}
-+\newcommand{\cref}[3]{#1~\ref{#2}}
-+%problems with _ in labels (e.g. in xrefs)
-+\let\oldunderscore\_
-+\renewcommand{\_}{\ifmmode \oldunderscore \else \string_\fi}
-+
-+
-+%%---------------------------------------------------------------
-+%% Deprecated commands (for compatability only)
-+
-+% % Graphics commands
-+\newcommand{\starfig}[6]{
-+ \begin{figure}#2
-+ \centering\includegraphics[#3]{#1}
-+ \typeout{#1 inserted on page \arabic{page}}
-+ \caption[#5]{\label{#4} #6}
-+ \end{figure}
-+}
-+
-+% A starlink Hyperref (defined a bit differently to regular hyperref,
-+% and with a first argument that doesn't do anything. Deprecated; only
-+% provided for consistency with old documents. Include the string, not
-+% just the cross reference number or letter in the hyperlink.
-+\newcommand{\slhyperref}[4]{\hyperref[#4]{#2\ref*{#4}#3}}
-+
-+\newcommand{\latexhtml}[2]{#1}
-+
-+% %.. Empty environment latex only.
-+\newenvironment{latexonly}{}{}
-+
-+%%%% Command that doesn't do anything in latex
-+\newcommand{\html}[1]{}
-+
-+%.. environments that don't do anything
-+\def\makeinnocent#1{\catcode`#1=12 }
-+ \def\csarg#1#2{\expandafter#1\csname#2\endcsname}
-+
-+ \def\ThrowAwayComment#1{\begingroup
-+ \def\CurrentComment{#1}%
-+ \let\do\makeinnocent \dospecials
-+ \makeinnocent\^^L% and whatever other special cases
-+ \endlinechar`\^^M \catcode`\^^M=12 \xComment}
-+ {\catcode`\^^M=12 \endlinechar=-1 %
-+ \gdef\xComment#1^^M{\def\test{#1}
-+ \csarg\ifx{PlainEnd\CurrentComment Test}\test
-+ \let\html at next\endgroup
-+ \else \csarg\ifx{LaLaEnd\CurrentComment Test}\test
-+ \edef\html at next{\endgroup\noexpand\end{\CurrentComment}}
-+ \else \let\html at next\xComment
-+ \fi \fi \html at next}
-+ }
-+ \def\excludecomment
-+ #1{\expandafter\def\csname#1\endcsname{\ThrowAwayComment{#1}}%
-+ {\escapechar=-1\relax
-+ \csarg\xdef{PlainEnd#1Test}{\string\\end#1}%
-+ \csarg\xdef{LaLaEnd#1Test}{\string\\end\string\{#1\string\}}%
-+ }}
-+
-+\excludecomment{htmlonly}
-+
-+\newcommand{\latex}[1]{#1}
-+
-+%------------------------------------------------------------------------
-+%.. Define additional colours.
-+\definecolor{mygray}{gray}{0.7}
-+\definecolor{MidnightBlue}{RGB}{25, 25, 112}
-+\definecolor{bblue}{RGB}{172,207,230}
-+
-+
-+%--------------------------------------------------
-+%.. Miscellanous commands
-+%.. Create a command to remove all space from input
-+\def\RemoveSpaces#1{\zap at space#1 \@empty}
-+
-+% % Command for text that should be pushed to the right of the line (eg
-+% % following an hfill, on a single line of text
-+\newcommand*{\scpushright}[1]{\hfill #1}
-+
-+
-+
-+% %.. verbatim environment for quoting terminal.
-+\DefineVerbatimEnvironment{terminalv}{Verbatim}{%
-+xleftmargin=.5in,formatcom=\color{MidnightBlue},fontsize=\small}
-+
-+
-+
-+% command for a text box that floats around and pops out from the text (framed)
-+\mdfsetup{%
-+ backgroundcolor=white,%
-+ middlelinewidth=4pt,%
-+ middlelinecolor=bblue,%
-+ userdefinedwidth=0.8\textwidth,%
-+ roundcorner=10pt, %
-+ innertopmargin=\topskip}%
-+
-+\newenvironment{sltextbox}[1]{%
-+\begin{figure*}[h]\begin{mdframed}[userdefinedwidth=0.8\textwidth,
-+ align=center,%
-+ frametitle=#1,%
-+ frametitlebackgroundcolor=bblue]%
-+\setlength{\parskip}{\medskipamount}%
-+}%
-+{\end{mdframed}\end{figure*}}
-+
-+
-+%Framed boxes (obsolete).
-+\newsavebox{\fmbox}
-+\newenvironment{fmpage}[1]{\begin{lrbox}{\fmbox}\begin{minipage}{#1}}{\end{minipage}\end{lrbox}\fbox{\usebox{\fmbox}}}
-+
-+
-+
-+%.. Tip box
-+\newenvironment{tip}%
-+{\begin{figure*}[h]\begin{mdframed}[userdefinedwidth=0.8\textwidth,align=center,frametitle=Tip,frametitlebackgroundcolor=bblue]%
-+\setlength{\parskip}{\medskipamount}%
-+}%
-+{\end{mdframed}\end{figure*}}
-+
-+%.. starlink long table (used so that its easier to fix it up for html output)
-+\setlength{\LTcapwidth}{\textwidth}
-+\newenvironment{sllongtable}[2]{%
-+\begin{longtable}{#1}\caption{#2}\\}
-+{\end{longtable}}
-+
-+
-+%.........................................
-+
-+\newcommand{\Acronyms}{%
-+ \ifwithchapters
-+ \chapter*{}
-+ \fi
-+ \section*{Acronyms}
-+ \markboth{Acronyms}{}
-+ \addcontentsline{toc}{section}{\protect\numberline{}Acronyms}
-+}
-+
-+
-+%--------------------------------------------------------------------
-+%% Load the reamining starlink specific classes.
-+
-+%.. The remaining starlink specific definitions.
-+%\RequirePackage{starabbrev}
-+%\RequirePackage{starstyle}
-+\RequirePackage{sst}
-+
-+%--------------------------------------------------------------------
---- /dev/null
-+++ b/sst.sty
-@@ -0,0 +1,234 @@
-+\ProvidesPackage{sst}
-+
-+%%%%
-+% Packet for formatting latex code output from prolat
-+%%%%%
-+
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+% .. Set up the sectioning and appearance for the sstroutine.
-+
-+\RequirePackage{titlesec}
-+
-+%... New subsection sstrefsection
-+\titleclass{\sstrefsection}{straight}[\subsection]
-+\newcounter{sstrefsection}
-+\renewcommand{\thesstrefsection}{\arabic{sstrefsection}}
-+
-+%... Formatting the title for sstrefsection
-+\titleformat{name=\sstrefsection}%
-+{\normalfont\Large\bfseries\centering}{}{0pt}{}
-+\titlespacing*{\sstrefsection}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
-+
-+%... Command to turn name and short description into single variable for title.
-+\newcommand{\sstsectitle}[2]{\strut \vphantom{#1}#1\newline \ignorespaces#2\strut}
-+
-+% .. Command to completely remove section from contents so it can be
-+% added in manually at the correct section.
-+\newcommand{\nocontentsline}[3]{}
-+\newcommand{\tocless}[2]{\bgroup\let\addcontentsline=\nocontentsline#1{#2}\egroup}
-+%% Add a toc entry which will be used in the main toc
-+\newcommand{\sstmaintocline}[2]{\addcontentsline{toc}{subsection}{\protect\numberline{}#1}}
-+
-+%% commands to temporarily stop sstroutines from writing anything into the main toc
-+\newcommand{\sstnomaintoc}{\renewcommand{\sstmaintocline}[2]{}}
-+%% Command to restart sstroutines appearing in the main html toc
-+%% (does nothing in pdf)
-+\newcommand{\sstmaintoc}{\renewcommand{\sstmaintocline}[2]{\addcontentsline{toc}{subsection}{\protect\numberline{}##1}}}
-+
-+
-+
-+%% .. command to format the sst title
-+\newcommand{\ssttitle}[2]{
-+ \tocless\sstrefsection{\centering\rule{\textwidth}{0.5mm}\\%
-+ #1\\#2\\\rule{\textwidth}{0.5mm}}
-+ \sstmaintocline{\RemoveSpaces{#1}}{#2}
-+}
-+
-+
-+
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+%... Basic SSTROUTINE command
-+\newcommand{\sstroutine}[3]{
-+ \clearpage
-+ % Create the section.
-+ \ssttitle{#1}{#2}
-+
-+ % Set the first parameter as the label; need to remove spaces first.
-+ \label{\RemoveSpaces{#1}}
-+
-+ %.. change the mark on the left hand side to include the name of the chapter.
-+ \markright{\textit{\RemoveSpaces{#1}}}
-+ \iftwoside
-+ \fancyhead[RE,LO]{\thepage\hspace{1cm}\rightmark}
-+ \else
-+ \lhead{\thepage\hspace{1cm}\rightmark}
-+ \fi
-+
-+ %.. Nest all the material within a description
-+ \begin{description}[style=nextline]
-+ #3
-+ \end{description}
-+
-+ % End the page
-+ \newpage
-+}
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+% .. Various sst macros that are used within an \sstroutine
-+
-+% .. diytopic -- basis for many of th commands.
-+\newcommand{\sstdiytopic}[2]{\item[#1:]
-+\begin{description}[style=nextline]\item[]\end{description} #2}
-+
-+\newcommand{\sstdescription}[1]{\item[Description:] #1 }
-+
-+\newcommand{\sstusage}[1]{\item[Usage:]{\raggedright \tt #1}}
-+
-+\newcommand{\sstparameters}[1]{\item[Parameters:]
-+\begin{description}[style=nextline]\item[] #1 \end{description}}
-+
-+\newcommand{\sstkeywords}[1]{\item[Keywords:]
-+\begin{description}[style=nextline]\item[] #1 \end{description}}
-+
-+\newcommand{\sstsubsection}[2]{\item[{#1}] #2}
-+
-+\newcommand{\sstnotes}[1]{\sstdiytopic{Notes}{#1}}
-+
-+\newcommand{\sstdiylist}[2]{\item[#1] #2}
-+
-+\newcommand{\sstimplementationstatus}[1]{\item[Implementation Status:] #1}
-+
-+\newcommand{\sstbugs}[1]{\item[Bugs:] #1}
-+
-+% Format a list of items while in paragraph mode.
-+\newcommand{\sstitemlist}[1]{
-+ \mbox{}%\vspace{-1\baselineskip}
-+ \begin{itemize}
-+ #1
-+ \end{itemize}
-+}
-+
-+\newcommand{\ssthitemlist}[1]{\mbox{}\begin{itemize}#1\end{itemize}}
-+\newcommand{\sstapplicability}[1]{\sstdiytopic{Applicability}{#1}}
-+\newcommand{\sstresparameters}[1]{\sstdiytopic{Results Parameters}{#1}}
-+\newcommand{\sstarguments}[1]{\sstdiytopic{Arguments}{#1}}
-+\newcommand{\sstinvocation}[1]{\sstdiytopic{Invocation}{{\tt #1}}}
-+\newcommand{\sstreturnedvalue}[1]{\sstdiytopic{Returned Value}{#1}}
-+\newcommand{\sstimplementation}[1]{\sstdiytopic{Implementation}{#1}}
-+
-+
-+\newcommand{\sstexamplesubsection}[2]{\sloppy
-+\item[{\texttt{\textcolor{MidnightBlue}{#1}}}]
-+#2 }
-+
-+% Set the font of the label of the sstexample items:
-+% (extra \\ spacing is required to not have weird effects. I think the
-+% important point is to explicitly force the label into vertical mode,
-+% so it doesn't try and continue the previous paragraph).
-+\newcommand{\sstexamplefont}[1]{\\#1\\\\}
-+
-+\newcommand{\sstexamples}[1]{
-+ \setlength{\parindent}{0mm}
-+ \item[Examples:]
-+ \begin{description}[style=unboxed,font=\sstexamplefont,
-+ leftmargin=0pt,]
-+ #1
-+ \end{description}
-+}
-+
-+% Define the format of an item.
-+\newcommand{\sstitem}{\item\mbox{}}
-+
-+% Format the attribute data type section.
-+\providecommand{\sstattributetype}[1]{}%\item[Type:]#1}
-+
-+% an environment for references (for the SST sstdiytopic command).
-+\newenvironment{refs}{\vspace{-4ex} % normally 3ex
-+ \begin{list}{}{\setlength{\topsep}{0mm}
-+ \setlength{\partopsep}{0mm}
-+ \setlength{\itemsep}{0mm}
-+ \setlength{\parsep}{0mm}
-+ \setlength{\leftmargin}{1.5em}
-+ \setlength{\itemindent}{-\leftmargin}
-+ \setlength{\labelsep}{0mm}
-+ \setlength{\labelwidth}{0mm}}
-+ }{\end{list}}
-+
-+
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+% .. Additional SST-routine like commands.
-+
-+
-+% .. SST attribute command: similar to an sstroutine, but slightly
-+% different formatting and doesn't force a new page. See SUN/95 for
-+% example of usage. Also doesn't appear in the table of contents.
-+
-+\newcommand{\sstattribute}[3]{
-+ % Create the section.
-+ \subsubsection*{\centering \rule{\textwidth}{0.5mm}\\\Large\ignorespaces#1
-+ \\#2\\\rule{\textwidth}{0.5mm}}
-+
-+ % Set the first parameter as the label; need to remove spaces first.
-+ \label{\RemoveSpaces{#1}}
-+
-+ %.. change the mark on the left hand side to include the name of the section.
-+ \markright{\textit{\RemoveSpaces{#1}}}
-+
-+ \iftwoside
-+ \fancyhead[RE,LO]{\thepage\hspace{1cm}\rightmark}
-+ \else
-+ \lhead{\thepage\hspace{1cm}\rightmark}
-+ \fi
-+
-+ %.. Nest all the material within a description
-+ \begin{description}[style=nextline]
-+ #3
-+ \end{description}%
-+}
-+
-+
-+%% SSTroutinenolabel should be same as regular sstroutine, but not
-+%% define a label (see sun209 -- this is because sun209 uses \textit
-+%% in some of its macro titles, so thesse cannot be automatically
-+%% changed to a label. The label must be manually created when
-+%% using these.
-+\newcommand{\sstroutinenolabel}[3]{
-+ \clearpage
-+ % Create the section.
-+ \ssttitle{#1}{#2}
-+
-+ %.. change the mark on the left hand side to include the name of the chapter.
-+ \markright{\textit{\RemoveSpaces{#1}}}
-+ \iftwoside
-+ \fancyhead[RE,LO]{\thepage\hspace{1cm}\rightmark}
-+ \else
-+ \lhead{\thepage\hspace{1cm}\rightmark}
-+ \fi
-+
-+ %.. Nest all the material within a description
-+ \begin{description}[style=nextline]
-+ #3
-+ \end{description}
-+
-+ % End the page
-+ \newpage
-+}
-+
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+% .. Miscellaneous
-+
-+%% Change the \wedge command to something that looks better.
-+\renewcommand{\wedge}{\mbox{\textasciicircum}}
-+
-+
-+%% command to prevent sstroutines from appearing in the extra html toc
-+%% called by \sstminitoc{Title of Toc} (does nothing in pdf)
-+\newcommand{\sstnoextratoc}{}
-+%% Command to restart sstroutines appearing in the extra html toc
-+%% called by \sstminitoc{Title of Toc} (does nothing in pdf)
-+\newcommand{\sstextratoc}{}
-+
-+
-+% Command that in html typesets a listing of all
-+% sstroutines/sstroutinenolables that occur before the next sectioning
-+% command. Does nothing in pdf at the moment.
-+\newcommand{\sstminitoc}[1]{}
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 6855f43..a2667ef 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -202,7 +202,7 @@ Description: "ast" is a quite short name for a library that is so
fi
# Make pre-distribution files. These are files which are required for
-@@ -770,5 +770,5 @@
+@@ -770,8 +770,8 @@
ast_test_SOURCES = ast_test.c
#ast_test_LDADD = `ast_link`
@@ -210,9 +210,12 @@ Description: "ast" is a quite short name for a library that is so
-ast_test_LDADD = @LIBPAL@ libast.la libast_pal.la libast_grf_3.2.la libast_grf_5.6.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm
+# Expand ast_link to avoid libstarlink_ast_pass2, which causes problems for Solaris
+ast_test_LDADD = @LIBPAL@ libstarlink_ast.la libstarlink_ast_pal.la libstarlink_ast_grf_3.2.la libstarlink_ast_grf_5.6.la libstarlink_ast_grf_2.0.la libstarlink_ast_grf3d.la libstarlink_ast_err.la -lm
+
+ # Need to include latex support files in the distribution tar ball so
+ # that the docs can be built from the tex source files. Requires environment
--- a/ast.news
+++ b/ast.news
-@@ -242,7 +242,7 @@
+@@ -286,7 +286,7 @@
Main Changes in V7.0.2
----------------------
@@ -221,7 +224,7 @@ Description: "ast" is a quite short name for a library that is so
option is used when AST is configured.
-@@ -250,7 +250,7 @@
+@@ -294,7 +294,7 @@
----------------------
- The levmar and wcslib code distributed within AST is now stored in the
diff --git a/debian/patches/series b/debian/patches/series
index cac0bd9..a1b9e71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ use_std_automake.patch
use_external_pal.patch
use_external_cminpack.patch
workround_armhf_compiler_bug.patch
-latexstyle.patch
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index afa6f1e..1721981 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -42,9 +42,12 @@ Description: The external PAL library in Debian is called "starlink-pal".
else
libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
endif
-@@ -776,4 +774,4 @@
+@@ -776,7 +774,7 @@
#ast_test_LDADD = `ast_link`
# Expand ast_link to avoid libstarlink_ast_pass2, which causes problems for Solaris
-ast_test_LDADD = @LIBPAL@ libstarlink_ast.la libstarlink_ast_pal.la libstarlink_ast_grf_3.2.la libstarlink_ast_grf_5.6.la libstarlink_ast_grf_2.0.la libstarlink_ast_grf3d.la libstarlink_ast_err.la -lm
+ast_test_LDADD = @LIBPAL@ libstarlink_ast.la libstarlink_ast_grf_3.2.la libstarlink_ast_grf_5.6.la libstarlink_ast_grf_2.0.la libstarlink_ast_grf3d.la libstarlink_ast_err.la -lm
+
+ # Need to include latex support files in the distribution tar ball so
+ # that the docs can be built from the tex source files. Requires environment
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/starlink-ast.git
More information about the Debian-astro-commits
mailing list