[Pkg-ocaml-maint-commits] r4088 - in /trunk/packages/advi/trunk/debian: changelog control patches/00list patches/failed-tests.dpatch rules

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Wed Jul 18 12:39:53 UTC 2007 

Author: smimram
Date: Wed Jul 18 12:39:52 2007
New Revision: 4088

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4088
Log:
Build-depend on texlive instead of tetex.

Added:
    trunk/packages/advi/trunk/debian/patches/failed-tests.dpatch   (with props)
Modified:
    trunk/packages/advi/trunk/debian/changelog
    trunk/packages/advi/trunk/debian/control
    trunk/packages/advi/trunk/debian/patches/00list
    trunk/packages/advi/trunk/debian/rules

Modified: trunk/packages/advi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/advi/trunk/debian/changelog?rev=4088&op=diff
==============================================================================
--- trunk/packages/advi/trunk/debian/changelog (original)
+++ trunk/packages/advi/trunk/debian/changelog Wed Jul 18 12:39:52 2007
@@ -1,9 +1,16 @@
 advi (1.6.0-12) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Remove inactive people from the Uploaders field.
   * Build with ocamlc instead of ocamlopt on arm to fix build failure.
 
- -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 21 Dec 2006 00:23:24 +0100
+  [ Samuel Mimram ]
+  * Build-depend on texlive instead of tetex, closes: #433584.
+  * Added failed-tests.dpatch to remove tests which don't compile anymore with
+    texlive.
+  * Don't ignore errors on make clean.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 18 Jul 2007 14:33:35 +0200
 
 advi (1.6.0-11) unstable; urgency=high
 

Modified: trunk/packages/advi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/advi/trunk/debian/control?rev=4088&op=diff
==============================================================================
--- trunk/packages/advi/trunk/debian/control (original)
+++ trunk/packages/advi/trunk/debian/control Wed Jul 18 12:39:52 2007
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), tetex-bin, ocaml, libcamlimages-ocaml-dev, tetex-extra, zlib1g-dev, gs, dpatch, chrpath, ocaml-best-compilers, hevea, x-dev, libx11-dev, libxinerama-dev
+Build-Depends: debhelper (>> 4.0.0), texlive, texlive-pstricks, ocaml, libcamlimages-ocaml-dev, zlib1g-dev, gs, dpatch, ocaml-best-compilers, hevea, x-dev, libx11-dev, libxinerama-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/advi
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/advi/trunk/
 
 Package: advi
 Architecture: any
-Depends: ${shlibs:Depends}, tetex-bin | texlive-base-bin, tetex-base| texlive-base, gs
+Depends: ${shlibs:Depends}, texlive-base-bin, texlive-base, gs
 Suggests: ttf-kochi-gothic, ttf-kochi-mincho, bzip2
 Replaces: mldvi, activedvi
 Description: an active DVI previewer and presenter
@@ -28,7 +28,7 @@
 
 Package: advi-examples
 Architecture: all
-Depends: tetex-bin | texlive-latex-base, gs, advi, imagemagick
+Depends: texlive-latex-base, gs, advi, imagemagick
 Conflicts: advi (<< 1.6.0-4)
 Suggests: ttf-kochi-gothic, ttf-kochi-mincho, ocaml-base-nox, mpg321, tk8.4, xbase-clients, xterm
 Description: example presentations for Active-DVI (advi)
@@ -37,4 +37,4 @@
  demonstrations, and embedding of arbitrary applications within the
  presentation (hence the Active adjective of the presenter :).
  .
- This package contains example presentations for Active-DVI. 
+ This package contains example presentations for Active-DVI.

Modified: trunk/packages/advi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/advi/trunk/debian/patches/00list?rev=4088&op=diff
==============================================================================
--- trunk/packages/advi/trunk/debian/patches/00list (original)
+++ trunk/packages/advi/trunk/debian/patches/00list Wed Jul 18 12:39:52 2007
@@ -16,3 +16,4 @@
 man_update
 #pagemovement
 examples-makefiles-texinputs
+failed-tests

Added: trunk/packages/advi/trunk/debian/patches/failed-tests.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/advi/trunk/debian/patches/failed-tests.dpatch?rev=4088&op=file
==============================================================================
--- trunk/packages/advi/trunk/debian/patches/failed-tests.dpatch (added)
+++ trunk/packages/advi/trunk/debian/patches/failed-tests.dpatch Wed Jul 18 12:39:52 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## failed-tests.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't compile tests which fail with texlive.
+
+ at DPATCH@
+diff -urNad advi-1.6.0~/examples/seminar/Makefile advi-1.6.0/examples/seminar/Makefile
+--- advi-1.6.0~/examples/seminar/Makefile	2007-07-18 14:27:40.000000000 +0200
++++ advi-1.6.0/examples/seminar/Makefile	2007-07-18 14:29:33.000000000 +0200
+@@ -23,7 +23,7 @@
+ # To view the demos, use ../advi.opt file.dvi
+ 
+ export TEXINPUTS=../../../tex:
+-SUBDIRS=clock a14
++SUBDIRS=a14
+ 
+ all:
+ 	for i in $(SUBDIRS); do \
+diff -urNad advi-1.6.0~/test/Makefile advi-1.6.0/test/Makefile
+--- advi-1.6.0~/test/Makefile	2007-07-18 14:27:39.000000000 +0200
++++ advi-1.6.0/test/Makefile	2007-07-18 14:27:41.000000000 +0200
+@@ -25,7 +25,7 @@
+ PLATEX=TEXINPUTS=.:../tex:$(TEXINPUTS): platex
+ 
+ TEXFILES= demo.tex demo2.tex trigo_source.tex \
+-trans.tex trans2.tex trans3.tex background.tex \
++trans.tex trans2.tex trans3.tex \
+ color.tex demo_raw.tex macros.tex test_events.tex
+ #thumbnails.tex
+ DVIFILES= $(TEXFILES:%.tex=%.dvi)

Propchange: trunk/packages/advi/trunk/debian/patches/failed-tests.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/advi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/advi/trunk/debian/rules?rev=4088&op=diff
==============================================================================
--- trunk/packages/advi/trunk/debian/rules (original)
+++ trunk/packages/advi/trunk/debian/rules Wed Jul 18 12:39:52 2007
@@ -56,7 +56,7 @@
 	  --infodir=\$${prefix}/share/info
 
 backup: backup-stamp
-backup-stamp: 
+backup-stamp:
 	#for i in $(BACKUP_SOURCE); do /bin/cp -f $$i $$i.back; done
 	touch backup-stamp
 backup-clean:
@@ -116,8 +116,9 @@
 	dh_testroot
 	rm -f build-stamp opt-built-stamp
 	rm -f doc/advi.1
-	-$(MAKE) veryclean
+	[ ! -f Makefile.config ] || $(MAKE) veryclean
 	rm -f .depend
+	rm -f doc/*.bdvi doc/*.png doc/*.eps test/*.eps
 	dh_clean
 
 install: build
@@ -132,7 +133,6 @@
 		$(MAKE) installbyt DESTDIR=$(CURDIR)/debian/advi \
 			INSTALLTARGET=advi; \
 	fi
-	chrpath -d $(CURDIR)/debian/advi/usr/bin/advi
 	cp debian/utils/zadvi $(CURDIR)/debian/advi/usr/bin/zadvi
 	echo "-cache-dir ~/.advi-cache" >> $(CURDIR)/debian/advi/etc/advirc

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