Author: treinen
Date: Sun Feb 15 20:44:11 2009
New Revision: 6170
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6170
Log:
switch to cdbs
Added:
trunk/packages/hevea/trunk/debian/hevea.examples
trunk/packages/hevea/trunk/debian/rules.debhelper (with props)
Removed:
trunk/packages/hevea/trunk/debian/dirs
Modified:
trunk/packages/hevea/trunk/debian/changelog
trunk/packages/hevea/trunk/debian/control
trunk/packages/hevea/trunk/debian/hevea.manpages
trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch
trunk/packages/hevea/trunk/debian/rules
Modified: trunk/packages/hevea/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/changelog?rev=6170&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/changelog (original)
+++ trunk/packages/hevea/trunk/debian/changelog Sun Feb 15 20:44:11 2009
@@ -1,12 +1,18 @@
-hevea (1.10-7) UNRELEASED; urgency=low
+hevea (1.10-7) unstable-NOT-RELEASED-YET; urgency=low
[ Ralf Treinen ]
+ * switch to cdbs build system, build-depend on cdbs
* Standards-Version 3.8.0 (no change).
-
+ * Dependencies: switch order in "tetex-bin|texlive-base"
+ * Dependencies: changed "gs" to "ghostscript"
+ * Renamed debian/dirs -> debian/hevea.dirs
+ * Add debian/hevea.{manpages,examples}
+ * Switch build-dependency on ocaml back to >= 3.07
+
[ Stephane Glondu ]
* Remove Julien from Uploaders
- -- Stephane Glondu <[email protected]> Sun, 15 Feb 2009 21:07:33 +0100
+ -- Ralf Treinen <[email protected]> Sun, 15 Feb 2009 21:44:00 +0100
hevea (1.10-6) experimental; urgency=low
Modified: trunk/packages/hevea/trunk/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/control?rev=6170&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/control (original)
+++ trunk/packages/hevea/trunk/debian/control Sun Feb 15 20:44:11 2009
@@ -9,8 +9,8 @@
Samuel Mimram <[email protected]>,
Sylvain Le Gall <[email protected]>,
Stephane Glondu <[email protected]>
-Build-Depends-Indep: ocaml-nox (>= 3.11),
-Build-Depends: debhelper (>= 4.0), dpatch, tex-common
+Build-Depends-Indep: ocaml-nox (>= 3.07),
+Build-Depends: debhelper (>= 4.0), dpatch, tex-common, cdbs
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/hevea/trunk
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/
@@ -18,7 +18,7 @@
Package: hevea
Architecture: all
-Depends: gs, netpbm(>=2:9.10-1), tetex-bin | texlive-base,
ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ghostscript, netpbm(>=2:9.10-1), texlive-base | tetex-bin ,
ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
Suggests: hevea-doc
Description: translates from LaTeX to HTML, info, or text
Its remarkable features are
Added: trunk/packages/hevea/trunk/debian/hevea.examples
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/hevea.examples?rev=6170&op=file
==============================================================================
--- trunk/packages/hevea/trunk/debian/hevea.examples (added)
+++ trunk/packages/hevea/trunk/debian/hevea.examples Sun Feb 15 20:44:11 2009
@@ -1,0 +1,1 @@
+debian/examples/*
Modified: trunk/packages/hevea/trunk/debian/hevea.manpages
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/hevea.manpages?rev=6170&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/hevea.manpages (original)
+++ trunk/packages/hevea/trunk/debian/hevea.manpages Sun Feb 15 20:44:11 2009
@@ -1,1 +1,1 @@
-manpages/*
+debian/manpages/*
Modified: trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch?rev=6170&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch (original)
+++ trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch Sun Feb 15
20:44:11 2009
@@ -45,6 +45,6 @@
@@ -1,4 +1,4 @@
ALLLIB= alltt.hva amsmath.hva articlecommon.hva babel.hva bookcommon.hva
comment.hva compat.hva hyperref.hva ifthen.hva index.hva iso-symb.hva
keyval.hva latexcommon.hva listings.hva lstlang1.hva lstlang2.hva lstlang3.hva
makeidx.hva mathop.hva moreverb.hva multibib.hva multind.hva natbib-common.hva
packages.hva plain.hva program.hva spaces.hva supertabular.hva underscore.hva
url.hva verbatim.hva french-common.hva german-common.hva english.hva czech.hva
ragged2e.hva chapterbib.hva deepcut.hva figcut.hva longtable.hva eurosym.hva
isolatin1.hva textcomp.hva chngcntr.hva ifpdf.hva theorem.hva xspace.hva
latexsym.hva iso-html.hva iso-text.hva winstyles.hva winfonts.hva epsfig.hva
inputenc.hva thai.hva
-HTMLLIB= amssymb.hva amsfonts.hva article.hva austrian.hva book.hva color.hva
colortbl.hva commongraphic.hva fancysection.hva fancyvrb.hva french.hva
german.hva graphics.hva graphicx.hva hevea.hva common-math.hva mathpartir.hva
natbib.hva png.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva
symb-fra.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva
-+HTMLLIB= amssymb.hva amsfonts.hva article.hva austrian.hva book.hva color.hva
colortbl.hva commongraphic.hva fancysection.hva fancyvrb.hva french.hva
german.hva graphics.hva graphicx.hva hevea.hva common-math.hva mathpartir.hva
natbib.hva png.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva
symb-fra.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva gif.png
++HTMLLIB= amssymb.hva amsfonts.hva article.hva austrian.hva book.hva color.hva
colortbl.hva commongraphic.hva fancysection.hva fancyvrb.hva french.hva
german.hva graphics.hva graphicx.hva hevea.hva common-math.hva mathpartir.hva
natbib.hva png.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva
symb-fra.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva gif.hva
TEXTLIB=article.hva book.hva color.hva colortbl.hva fancysection.hva
hevea.hva report.hva seminar.hva french.hva austrian.hva german.hva natbib.hva
INFOLIB=article.hva book.hva hevea.hva report.hva seminar.hva
Modified: trunk/packages/hevea/trunk/debian/rules
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/rules?rev=6170&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/rules (original)
+++ trunk/packages/hevea/trunk/debian/rules Sun Feb 15 20:44:11 2009
@@ -1,57 +1,26 @@
#!/usr/bin/make -f
-# debian/rules for hevea
-# export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ocaml.mk
-include /usr/share/dpatch/dpatch.make
-
-OCAMLABI := $(shell ocamlc -version)
-
-config.sh:
+makebuilddir/hevea::
+ -rm config.sh
$(MAKE) config.sh\
- DESTDIR=`pwd`/debian/hevea/ \
+ DESTDIR=$(DEB_DESTDIR)\
PREFIX=/usr\
LIBDIR=/usr/share/hevea\
- LATEXLIBDIR=/usr/share/texmf/tex/latex/misc
+ LATEXLIBDIR=/usr/share/texmf/tex/latex/misc
-build: config.sh hevea
-hevea: patch
- dh_testdir
- $(MAKE) byte
+clean/hevea::
+ cd debian/examples; make clean
-clean: unpatch
- dh_testdir
- dh_testroot
- $(MAKE) clean
- (cd debian/examples; $(MAKE) clean)
- -rm .cvsignore config.sh
- dh_clean
+install/hevea::
+ cp html/gif.hva $(DEB_DESTDIR)/usr/share/hevea/html
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install TARGET=byte
- cp html/gif.hva `pwd`/debian/hevea/usr/share/hevea/html
+# we have decided to build this package as bytecode
+DEB_MAKE_BUILD_TARGET = byte
+DEB_MAKE_INSTALL_TARGET = install TARGET=byte
-binary-arch: build install
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installman debian/manpages/*
- dh_installexamples debian/examples/*
- dh_installchangelogs CHANGES
- dh_installtex
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
Added: trunk/packages/hevea/trunk/debian/rules.debhelper
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/rules.debhelper?rev=6170&op=file
==============================================================================
--- trunk/packages/hevea/trunk/debian/rules.debhelper (added)
+++ trunk/packages/hevea/trunk/debian/rules.debhelper Sun Feb 15 20:44:11 2009
@@ -1,0 +1,57 @@
+#!/usr/bin/make -f
+# debian/rules for hevea
+
+# export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+OCAMLABI := $(shell ocamlc -version)
+
+config.sh:
+ $(MAKE) config.sh\
+ DESTDIR=`pwd`/debian/hevea/ \
+ PREFIX=/usr\
+ LIBDIR=/usr/share/hevea\
+ LATEXLIBDIR=/usr/share/texmf/tex/latex/misc
+
+build: config.sh hevea
+hevea: patch
+ dh_testdir
+ $(MAKE) byte
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ $(MAKE) clean
+ (cd debian/examples; $(MAKE) clean)
+ -rm .cvsignore config.sh
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ $(MAKE) install TARGET=byte
+ cp html/gif.hva `pwd`/debian/hevea/usr/share/hevea/html
+
+binary-arch: build install
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs README
+ dh_installman debian/manpages/*
+ dh_installexamples debian/examples/*
+ dh_installchangelogs CHANGES
+ dh_installtex
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch
Propchange: trunk/packages/hevea/trunk/debian/rules.debhelper
------------------------------------------------------------------------------
svn:executable = *
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
