[Pkg-ocaml-maint-commits] r4192 - in /trunk/packages/hevea/trunk/debian: changelog patches/00list patches/02_nogif.dpatch patches/04_koi8r.dpatch rules

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Sun Aug 26 16:13:23 UTC 2007 

Author: treinen
Date: Sun Aug 26 16:13:23 2007
New Revision: 4192

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4192
Log:
towards hevea-1.10. Still to do:
- test uft8 encoding
- port charcode patch
- testing

Removed:
    trunk/packages/hevea/trunk/debian/patches/04_koi8r.dpatch
Modified:
    trunk/packages/hevea/trunk/debian/changelog
    trunk/packages/hevea/trunk/debian/patches/00list
    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=4192&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/changelog (original)
+++ trunk/packages/hevea/trunk/debian/changelog Sun Aug 26 16:13:23 2007
@@ -3,8 +3,13 @@
   * Changed priority back to "optional" as package depends on the virtual
     package "gs".
   * New upstream version.
-
- -- Ralf Treinen <treinen at debian.org>  Sat, 25 Aug 2007 15:21:27 +0200
+  * debian/rules: new target "config.sh" due to modified upstream Makefile
+  * debian/rules: drop installation of xxdate.exe as this is now fixed in
+    the upstream Makefile.
+  * Drop patch koi8r as this is now done by upstream
+  * Patch 02_nogif: adapt to modified upstream
+
+ -- Ralf Treinen <treinen at debian.org>  Sun, 26 Aug 2007 18:01:15 +0200
 
 hevea (1.09-4) experimental; urgency=low
 

Modified: trunk/packages/hevea/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/hevea/trunk/debian/patches/00list?rev=4192&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/patches/00list (original)
+++ trunk/packages/hevea/trunk/debian/patches/00list Sun Aug 26 16:13:23 2007
@@ -1,4 +1,2 @@
 02_nogif
-03_charset
-04_koi8r
-
+#03_charset

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=4192&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch (original)
+++ trunk/packages/hevea/trunk/debian/patches/02_nogif.dpatch Sun Aug 26 16:13:23 2007
@@ -4,14 +4,14 @@
 ## DP: generate by default images as png, not gif 
 
 @DPATCH@
-diff -urNad trunk~/html/gif.hva trunk/html/gif.hva
---- trunk~/html/gif.hva	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/html/gif.hva	2006-10-16 20:27:17.000000000 +0200
+diff -urNad hevea-1.10~/html/gif.hva hevea-1.10/html/gif.hva
+--- hevea-1.10~/html/gif.hva	1970-01-01 01:00:00.000000000 +0100
++++ hevea-1.10/html/gif.hva	2007-08-26 17:59:42.000000000 +0200
 @@ -0,0 +1 @@
 +\renewcommand{\heveaimageext}{.gif}
-diff -urNad trunk~/imagen trunk/imagen
---- trunk~/imagen	2006-09-07 17:06:15.000000000 +0200
-+++ trunk/imagen	2006-10-16 20:27:17.000000000 +0200
+diff -urNad hevea-1.10~/imagen hevea-1.10/imagen
+--- hevea-1.10~/imagen	2007-08-26 17:59:38.000000000 +0200
++++ hevea-1.10/imagen	2007-08-26 17:59:42.000000000 +0200
 @@ -7,10 +7,10 @@
  PNMEXTRA=""
  PNMMARGIN="pnmmargin -white 1"
@@ -27,10 +27,10 @@
  TODIR="."
  RM="/bin/rm -f"
  
-diff -urNad trunk~/latexcommon.hva trunk/latexcommon.hva
---- trunk~/latexcommon.hva	2006-10-13 19:25:03.000000000 +0200
-+++ trunk/latexcommon.hva	2006-10-16 20:27:17.000000000 +0200
-@@ -476,7 +476,7 @@
+diff -urNad hevea-1.10~/latexcommon.hva hevea-1.10/latexcommon.hva
+--- hevea-1.10~/latexcommon.hva	2007-08-26 17:59:38.000000000 +0200
++++ hevea-1.10/latexcommon.hva	2007-08-26 17:59:42.000000000 +0200
+@@ -499,7 +499,7 @@
  % Images     %
  %%%%%%%%%%%%%%
  \newcounter{image}
@@ -39,12 +39,12 @@
  \newcommand{\heveaimagedir}{}
  \renewcommand{\theimage}{\@arabic{image}}
  \newcommand{\imageflush}[1][]
-diff -urNad trunk~/libs.def trunk/libs.def
---- trunk~/libs.def	2006-10-13 19:25:03.000000000 +0200
-+++ trunk/libs.def	2006-10-16 20:28:23.000000000 +0200
+diff -urNad hevea-1.10~/libs.def hevea-1.10/libs.def
+--- hevea-1.10~/libs.def	2007-06-14 11:08:36.000000000 +0200
++++ hevea-1.10/libs.def	2007-08-26 18:00:14.000000000 +0200
 @@ -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
--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 inputenc.hva latin1.hva latin2.hva latin3.hva latin4.hva latin5.hva latin6.hva latin7.hva latin8.hva latin9.hva latin10.hva ascii.hva cp1250.hva cp1252.hva cp1257.hva ansinew.hva applemac.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 inputenc.hva latin1.hva latin2.hva latin3.hva latin4.hva latin5.hva latin6.hva latin7.hva latin8.hva latin9.hva latin10.hva ascii.hva cp1250.hva cp1252.hva cp1257.hva ansinew.hva applemac.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 inputenc.hva latin1.hva latin2.hva latin3.hva latin4.hva latin5.hva latin6.hva latin7.hva latin8.hva latin9.hva latin10.hva ascii.hva cp1250.hva cp1252.hva cp1257.hva ansinew.hva applemac.hva
+ 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
+ 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=4192&op=diff
==============================================================================
--- trunk/packages/hevea/trunk/debian/rules (original)
+++ trunk/packages/hevea/trunk/debian/rules Sun Aug 26 16:13:23 2007
@@ -1,24 +1,30 @@
 #!/usr/bin/make -f
 # debian/rules for hevea
 
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
 
-# for package maintainers only - target not used in build process!
 OCAMLABI := $(shell ocamlc -version)
 
-build: hevea
+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 LIBDIR=/usr/share/hevea
+	$(MAKE) byte
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	$(MAKE) clean
 	(cd debian/examples; $(MAKE) clean)
-	-rm .cvsignore
+	-rm .cvsignore config.sh
 	dh_clean
 
 install: build
@@ -26,13 +32,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install\
-		TARGET=byte\
-		DESTDIR=`pwd`/debian/hevea\
-		PREFIX=usr\
-		LIBDIR=usr/share/hevea\
-		LATEXLIBDIR=/usr/share/texmf/tex/latex/misc
-	install xxdate.exe `pwd`/debian/hevea/usr/share/hevea
+	$(MAKE) install TARGET=byte
 
 binary-arch: build install
 
@@ -53,4 +53,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch debian/control
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch

More information about the Pkg-ocaml-maint-commits mailing list