[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.8-1-37-gb52324d

[Ralf Treinen]

The following commit has been merged in the experimental branch:
commit 7cec5dd146da2e075592528b3fb138081fea7d4e
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Mar 10 20:26:24 2010 +0100

    fix clean target to remove generated stuff in doc/

diff --git a/debian/changelog b/debian/changelog
index 4453db2..da1ad6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ advi (1.8-3) experimental; urgency=low
   * debian/control: Updated location of upstream homepage
   * debian/watch: put new domain (advi.inria.fr)
   * additional dvis referenced from advi:
-    - debian/rules: create them in the build target
+    - debian/rules: create them in the build target. This entails overriding
+      the clean target to remove all generated stuff from doc/.
     - debian/advi.dirs: create directory /usr/share/advi/screens for them
     - debian/advi.install: install them there
   
diff --git a/debian/rules b/debian/rules
index 3923577..243a25a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ override_dh_auto_configure:
 
 override_dh_auto-build:
 	$(MAKE)
-	(cd doc; $MAKE $DVIS)
+	cd doc && $(MAKE) $(DVIS)
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/advi
@@ -38,3 +38,9 @@ ifeq ($(OPT),true)
 else
 	cd $(CURDIR)/debian/advi/usr/bin && mv -f advi.byt advi
 endif
+
+override_dh_auto_clean:
+	if [ -f Makefile ]; then $(MAKE) clean; fi
+	cd doc && rm -f $(DVIS) \
+		${DVIS:.dvi=.log} ${DVIS:.dvi=.aux} ${DVIS:.dvi=.out}
+	dh_clean

-- 
advi packaging