[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-1-1-gf6ecf83

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 4fc6e39181f641f1fca75909fe32552646470ab6
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Apr 5 19:50:51 2010 +0200

    cleanup dirs, remove doc package, add target distclean to examples/Makefile

diff --git a/debian/advi.dirs b/debian/advi.dirs
index c7b2f15..05604f2 100644
--- a/debian/advi.dirs
+++ b/debian/advi.dirs
@@ -1 +1,4 @@
-/usr/share/advi
+etc/advi
+usr/bin
+usr/share/man/man1
+usr/share/texmf/tex
diff --git a/debian/changelog b/debian/changelog
index 81d6bb9..de2cf97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ advi (1.9.0-1) unstable; urgency=low
   * Compress installed dvi documents, except splash.dvi.
   * Fix dh_strip override: do not strip when non-native architecture.
   * Patches typo-message and manpage: fix some typos.
-  
- -- Ralf Treinen <treinen at debian.org>  Mon, 05 Apr 2010 11:35:38 +0200
+  * Merged debian/dirs into debian/advi.dirs, removed /usr/share/advi
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 05 Apr 2010 19:41:22 +0200
 
 advi (1.9.0~rc2-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index a34da18..69f8bc2 100644
--- a/debian/control
+++ b/debian/control
@@ -38,17 +38,6 @@ Description: an active DVI previewer and presenter
  security problems when viewing untrusted DVI files. Make sure to read the
  README.Debian for more information.
 
-Package: advi-doc
-Architecture: all
-Recommends: advi
-Description: documentation for Active-DVI (advi)
- Active-DVI is a DVI previewer and presenter written in Objective Caml
- with some eye candy effects for presentation, support for interactive
- demonstrations, and embedding of arbitrary applications within the
- presentation (hence the Active adjective of the presenter :).
- .
- This package contains the user documentation for Active-DVI.
-
 Package: advi-examples
 Architecture: all
 Depends: ${misc:Depends}, texlive-latex-base, ghostscript, advi, imagemagick
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 05604f2..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/advi
-usr/bin
-usr/share/man/man1
-usr/share/texmf/tex
diff --git a/debian/patches/examples-distclean b/debian/patches/examples-distclean
new file mode 100644
index 0000000..85373ee
--- /dev/null
+++ b/debian/patches/examples-distclean
@@ -0,0 +1,15 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: add distclean target in eamples/Makefile since called from
+  top level makefile
+
+--- advi.orig/examples/Makefile	2010-04-05 19:45:28.000000000 +0200
++++ advi/examples/Makefile	2010-04-05 19:45:50.000000000 +0200
+@@ -55,7 +55,7 @@
+ 	 cd $$i; $(MAKE) all; cd ..; \
+ 	done
+ 
+-clean:
++distclean clean:
+ 	for i in $(SUBDIRS); do \
+ 	 cd $$i; $(MAKE) clean; cd ..; \
+ 	done
diff --git a/debian/patches/series b/debian/patches/series
index fd153d1..076d1c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 no-local-advirc
 typo-message
 manpage
+examples-distclean

-- 
advi packaging