]> git.decadent.org.uk Git - ion3.git/commitdiff
Removed ion3-doc binary package.
authorBen Hutchings <ben@decadent.org.uk>
Sat, 10 Nov 2007 04:07:58 +0000 (04:07 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 2 Nov 2008 12:42:37 +0000 (12:42 +0000)
Removed obsolete patch for doc building.

debian/changelog
debian/control
debian/get-orig-source [deleted file]
debian/ion3-doc.doc-base.config [deleted file]
debian/ion3-doc.doc-base.notes [deleted file]
debian/ion3-doc.docs [deleted file]
debian/patches/208_build-docs-with-hevea.diff [deleted file]
debian/rules

index e23c951bd76e6a4c9bf78fc653e1a5154dc3865f..aed1246f2ad6d841b736d16ce46251cb4614f6ac 100644 (file)
@@ -1,3 +1,9 @@
+ion3 (20070927-2) unstable; urgency=low
+
+  * Moved ion3-doc into separate source package
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 04 Nov 2007 16:47:33 +0000
+
 ion3 (20070927-1) unstable; urgency=low
 
   * New upstream release
index 1f2fba990c47db5e3e6ce6e1dab56f344abd9a7a..899be9b1151f1ab509f6546fb71a7ea285f9b66d 100644 (file)
@@ -37,13 +37,3 @@ Depends: libx11-dev, libsm-dev, lua5.1, gcc (>> 3)
 Description: ion3 development files
  This package contains the files necessary for building extension
  modules to the Ion window manager.
-
-Package: ion3-doc
-Section: non-free/doc
-Architecture: all
-Recommends: lynx | www-browser
-Suggests: doc-base, dwww | doc-central | dhelp
-Description: ion3 documentation
- This package contains the document 'Configuring and extending Ion3
- with Lua' which explains how to configure and extend the Ion window
- manager.
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755 (executable)
index c990c05..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -e
-
-PACKAGE="$(dpkg-parsechangelog | sed 's/^Source: //; t; d')"
-test -n "$PACKAGE"
-
-# Get the main upstream tarball URL and version via uscan.
-while read line; do
-    if [ "${line#http://}" != "$line" -a "${line#* }" = "$line" ]; then
-       main_url="${line}"
-    fi
-    if [ "${line#Newest version }" != "$line" ]; then
-       version="${line#Newest version on remote site is }"
-       version="${version%, local version is *}"
-    fi
-done < <(LANG=C uscan --report --verbose)
-test -n "$main_url" -a -n "$version"
-
-# Get the document tarball URL and the filenames of the tarballs.
-# Download them.
-main_file=${main_url##*/}
-doc_url=${main_url/ion/ion-doc}
-doc_file=${doc_url##*/}
-wget -O $main_file $main_url
-wget -O $doc_file $doc_url
-
-# Work out what directories we expect to be in them, and check this.
-main_dir=${main_file%.tar.gz}
-doc_dir=${doc_file%.tar.gz}
-test -z "$(tar tzf $main_file | grep -v "^$main_dir/")"
-test -z "$(tar tzf $doc_file | grep -v "^$doc_dir/")"
-
-# Unpack, combine and repack.
-tar xzf $main_file
-tar xzf $doc_file
-mv $main_dir $PACKAGE-$version.orig
-mv $doc_dir $PACKAGE-$version.orig/doc
-tar cf - $PACKAGE-$version.orig | gzip -c9 > $PACKAGE_$version.orig.tar.gz
-
-# Clean up.
-rm -rf $main_file $doc_file $PACKAGE-$version.orig
diff --git a/debian/ion3-doc.doc-base.config b/debian/ion3-doc.doc-base.config
deleted file mode 100644 (file)
index 3ad6474..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: ion3-doc-config
-Title: Ion: Configuring and extending with Lua (ion3)
-Author: Tuomo Valkonen
-Abstract: This document describes how to configure and extend the window
- manager Ion (version 3).
-Section: WindowManagers
-
-Format: HTML
-Index: /usr/share/doc/ion3-doc/ionconf/index.html
-Files: /usr/share/doc/ion3-doc/ionconf/*
diff --git a/debian/ion3-doc.doc-base.notes b/debian/ion3-doc.doc-base.notes
deleted file mode 100644 (file)
index fb1e77f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: ion3-doc-notes
-Title: Ion: Notes for the module and patch writer (ion3)
-Author: Tuomo Valkonen
-Abstract: This document is an unorganized collection of notes for those who
- want to write modules or patches to Ion (version 3).
-Section: WindowManagers
-
-Format: HTML
-Index: /usr/share/doc/ion3-doc/ionnotes/index.html
-Files: /usr/share/doc/ion3-doc/ionnotes/*
diff --git a/debian/ion3-doc.docs b/debian/ion3-doc.docs
deleted file mode 100644 (file)
index 3e65e4f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/ionconf
-doc/ionnotes
diff --git a/debian/patches/208_build-docs-with-hevea.diff b/debian/patches/208_build-docs-with-hevea.diff
deleted file mode 100644 (file)
index cb4b6fd..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
---- ion3.orig/doc/artikel3.hva
-+++ ion3/doc/artikel3.hva
-@@ -0,0 +1 @@
-+\input{article.hva}
---- ion3.orig/doc/gpl.tex
-+++ ion3/doc/gpl.tex
-@@ -1,21 +1,29 @@
- \xchapter{The GNU General Public License}
- \begin{center}
-+%BEGIN LATEX
- {\parindent 0in
-+%END LATEX
- Version 2, June 1991
- Copyright \copyright\ 1989, 1991 Free Software Foundation, Inc.
-+%BEGIN LATEX
- \bigskip
-+%END LATEX
- 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-+%BEGIN LATEX
- \bigskip
-+%END LATEX
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-+%BEGIN LATEX
- }
-+%END LATEX
- \end{center}
- \begin{center}
---- ion3.orig/doc/ionconf.tex
-+++ ion3/doc/ionconf.tex
-@@ -56,17 +56,21 @@
- \markboth{\MakeUppercase{List of functions}}%
-          {\MakeUppercase{List of functions}}%
--%begin{latexonly}
-+\begin{latexonly}
- \makeatletter
- \def\fnlisti#1{\@dottedtocline{1}{0em}{1.5em}{\lstinline!#1!}{\pageref{fn:#1}}}
- {\parskip\z@\input{fnlist}}
- \makeatother
--%end{latexonly}
-+\end{latexonly}
-+%BEGIN LATEX
- \begin{htmlonly}
-+%END LATEX
- \newcommand{\fnlisti}[1]{\fnref{#1}\\}
- \input{fnlist}
-+%BEGIN LATEX
- \end{htmlonly}
-+%END LATEX
- \printindex
---- ion3.orig/doc/macros.tex
-+++ ion3/doc/macros.tex
-@@ -14,6 +14,25 @@
- \usepackage[a4paper]{geometry}
- \usepackage{calc}
-+% hevea style
-+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+
-+%BEGIN LATEX
-+\begin{htmlonly}
-+%END LATEX
-+
-+\remakesection
-+  {\chapter}{-1}{chapter}
-+  {\@open{H1}{}}{\thechapter}{\quad}{\@close{H1}}
-+\setcounter{tocdepth}{3}
-+\setcounter{indexcols}{1}
-+\renewcommand{\@table@attributes}{CELLSPACING=10 CELLPADDING=0}
-+
-+%BEGIN LATEX
-+\end{htmlonly}
-+%END LATEX
-+
-+
- % URL settings
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-@@ -23,7 +42,7 @@
- % listings package
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--%begin{latexonly}
-+%BEGIN LATEX
- \usepackage{listings}
- \lstset{
-@@ -33,7 +52,7 @@
-   alsoletter={",},
-   alsoother={\_},
- }
--%end{latexonly}
-+%END LATEX
- % Some markup
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-@@ -44,7 +63,7 @@
- \newcommand{\spec}[1]{#1}
- \newcommand{\indextype}[1]{\index{#1@\type{#1}}}
--%begin{latexonly}
-+%BEGIN LATEX
- \newcommand{\key}[1]{\mbox{\textbf{#1}}}
- \newcommand{\code}[1]{\lstinline!#1!}
- \newcommand{\var}[1]{\lstinline!#1!}
-@@ -54,28 +73,33 @@
- \newcommand{\fnrefx}[2]{\hyperlink{fn:#1.#2}{\code{#2}}}
- \newcommand{\fnref}[1]{\hyperlink{fn:#1}{\code{#1}}}
- \newcommand{\myhref}[2]{\hyperlink{#1}{#2}}
-+%END LATEX
--%end{latexonly}
-+%BEGIN LATEX
- \begin{htmlonly}
--    
-+%END LATEX
- \newcommand{\key}[1]{\textbf{#1}}
- \newcommand{\code}[1]{\texttt{#1}}
- \newcommand{\var}[1]{\texttt{#1}}
- \newcommand{\command}[1]{\texttt{#1}}
--\newcommand{\hyperlabel}[1]{\label{#1}}
--\newcommand{\fnref}[1]{\htmlref{\texttt{#1}}{fn:#1}}
--\newcommand{\fnrefx}[2]{\htmlref{\texttt{#2}}{fn:#1.#2}}
--\newcommand{\myhref}[2]{\htmlref{#2}{#1}}
-+% docode is not present nor needed in hevea
-+\newcommand{\docode}{}
-+\newcommand{\hyperlabel}[1]{\label{#1}}
-+\newcommand{\fnref}[1]{\aname{fn:#1}{\texttt{#1}}}
-+\newcommand{\fnrefx}[2]{\aname{fn:#1.#2}{\texttt{#1}}}
-+\newcommand{\myhref}[2]{\ahref{#2}{#1}}
-+%BEGIN LATEX
- \end{htmlonly}
-+%END LATEX
- \newcommand{\tabhead}[1]{\hline #1 \\ \hline}
- % function tables
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--%begin{latexonly}
-+%BEGIN LATEX
- \newcommand{\funclistlabel}[1]{#1\hfill}
- \newenvironment{function}{
-@@ -96,8 +120,11 @@
-   \end{list}
- }
--%end{latexonly}
-+%END LATEX
-+
-+%BEGIN LATEX
- \begin{htmlonly}
-+%END LATEX
- \newenvironment{function}{
-   \begin{description}
-@@ -105,7 +132,9 @@
-   \end{description}
- }
-+%BEGIN LATEX
- \end{htmlonly}
-+%END LATEX
- \newcommand{\synopsis}[1]{
-@@ -128,7 +157,7 @@
- % While rapport3/artikel3 are otherwise nice classes, 
- % itemize looks awful.
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--%begin{latexonly}
-+%BEGIN LATEX
- \makeatletter
- \renewenvironment{itemize}{%
-   \ifnum \@itemdepth >3
-@@ -148,4 +177,4 @@
-   \fi}
-  {\global\@ignoretrue \endlist}
- \makeatletter
--%end{latexonly}
-+%END LATEX
---- ion3.orig/doc/Makefile
-+++ ion3/doc/Makefile
-@@ -1,10 +1,13 @@
- # Settings
- ######################################
--TOPDIR=../ion-3
-+TOPDIR=..
- include $(TOPDIR)/build/system-inc.mk
-+HEVEA=hevea
-+HACHA=hacha
-+
- L2H=latex2html -show_section_numbers -short_index -local_icons -noaddress \
-     -up_url http://iki.fi/tuomov/ion/ -up_title "Ion homepage" -nofootnode\
- ##    -style greyviolet.css
-@@ -58,8 +61,11 @@
-       makeindex ionconf.idx
-       latex ionconf
--ionconf-html: 
--      $(L2H) -split 3 ionconf
-+ionconf-html:
-+      $(HEVEA) -fix ionconf 2>&1 | grep -v 'occuring outside math mode'
-+      rm -rf ionconf
-+      mkdir ionconf
-+      cd ionconf && $(HACHA) ../ionconf.html
- fntexes: $(FNTEXES)
-@@ -97,6 +103,7 @@
-       rm -f $(FNTEXES) fnlist.tex
-       rm -f *.aux *.toc *.log
-       rm -f *.idx *.ild *.ilg *.ind
-+      rm -f *.haux *.hind *.htoc *.html .log
-         
- realclean: clean
-       rm -f *.ps *.pdf *.dvi
---- ion3.orig/doc/rapport3.hva
-+++ ion3/doc/rapport3.hva
-@@ -0,0 +1 @@
-+\input{report.hva}
index f7ed172d6397b4e60f458c6d3e5022832afff725..d579505416009c9522d273ee517b24a15a3b86fc 100755 (executable)
@@ -9,27 +9,21 @@ include /usr/share/quilt/quilt.make
 
 PACKAGE := $(shell dpkg-parsechangelog | sed -r 's/^Source: //; t; d')
 PACKAGE_DEV := $(PACKAGE)-dev
-PACKAGE_DOC := $(PACKAGE)-doc
 INSTDIR := debian/$(PACKAGE)
 INSTDIR_DEV := debian/$(PACKAGE_DEV)
-INSTDIR_DOC := debian/$(PACKAGE_DOC)
 DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -r 's/^Version: //; t; d')
 UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed -r 's/^[0-9]*://; s/-[^-]*$$//')
 
-doc-orig:
-       cp -R doc doc-orig
-
 build-indep: build-indep-stamp
-build-indep-stamp: doc-orig patch
+build-indep-stamp: patch
        dh_testdir
 
        cd libextl && $(MAKE) libextl-mkexports
-       #cd doc && $(MAKE) all all-pdf
 
        touch build-indep-stamp
 
 build-arch: build-arch-stamp
-build-arch-stamp: doc-orig patch
+build-arch-stamp: patch
        dh_testdir
 
        $(MAKE)
@@ -45,11 +39,6 @@ clean: unpatch
 
        $(MAKE) realclean
 
-       if [ -d doc-orig ]; then \
-               rm -rf doc; \
-               mv doc-orig doc; \
-       fi
-
        dh_clean
 
 install-indep: build-indep
@@ -90,12 +79,6 @@ binary-indep: build-indep install-indep
 
        dh_installchangelogs -i
        dh_installdocs -i
-# remove empty images and TeX droppings
-       find $(INSTDIR_DOC)/usr/share/doc/$(PACKAGE_DOC) \
-               -name '*.png' -size 0 \
-               -o -name '*.aux' -o -name '*.idx' -o -name '*.log' \
-               -o -name '*.out' -o -name '*.pl' -o -name WARNINGS \
-               | xargs rm --
 
 #      dh_installexamples -i
 #      dh_install -i
@@ -169,8 +152,7 @@ binary-arch: build-arch install-arch
 binary: binary-indep binary-arch
 
 get-orig-source:
-       chmod +x debian/get-orig-source
-       debian/get-orig-source
+       uscan --force-download
 
 .PHONY: build-indep build-arch build clean binary-indep binary-arch binary \
        install-indep install-arch unpatch get-orig-source