[Pkg-ocaml-maint-commits] [SCM] bibtex2html packaging branch, master, updated. debian/1.95-1-27-g50935dd

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 4985a472270479032190a62a1387f25db30ebcc4
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Apr 3 12:08:11 2010 +0200

    new patch to fix upstreams clean targets

diff --git a/debian/changelog b/debian/changelog
index ae36acb..3752787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ bibtex2html (1.95-1) unstable; urgency=low
   * Remove patch strings_utf8, this is fixed by upstream now.
   * Shifted linenumbers of patches according to the new upstream version.
   * Migrated debian/rules from cdbs to dh, removed build-dependency on cdbs.
+  * New patch clean-targets: remove more generated files on "make clean"
 
- -- Ralf Treinen <treinen at debian.org>  Sat, 03 Apr 2010 10:22:59 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sat, 03 Apr 2010 12:00:51 +0200
 
 bibtex2html (1.94-5) unstable; urgency=low
 
diff --git a/debian/patches/clean-targets b/debian/patches/clean-targets
new file mode 100644
index 0000000..18ed1d9
--- /dev/null
+++ b/debian/patches/clean-targets
@@ -0,0 +1,29 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: remove more generated files in clean targets
+
+Index: bibtex2html/Makefile.in
+===================================================================
+--- bibtex2html.orig/Makefile.in	2010-04-03 11:56:04.000000000 +0200
++++ bibtex2html/Makefile.in	2010-04-03 12:07:04.000000000 +0200
+@@ -324,18 +324,18 @@
+ GENERATED = bibtex_lexer.ml bbl_lexer.ml \
+ 	    latexscan.ml latex_accents.ml condition_lexer.ml \
+ 	    bibtex_parser.mli bibtex_parser.ml \
+-            condition_parser.mli condition_parser.ml version.ml
++            condition_parser.mli condition_parser.ml version.ml version.tex
+ 
+ clean::
+ 	rm -f *~ *.cm[iox] *.o 
+ 	rm -f $(GENERATED)
+ 	rm -f bibtex2html bib2bib
+-	rm -f manual.{aux,log,dvi,pdf,toc,haux,html}
++	rm -f manual.{aux,log,dvi,pdf,toc,haux,htoc,html}
+ 	rm -f bibtex2html.static bib2bib.static
+ 	rm -f bibtex2html.byte bib2bib.byte
+ 
+ dist-clean:: clean
+-	rm -f Makefile aux2bib
++	rm -f Makefile aux2bib config.log config.status
+ 
+ depend:: $(GENERATED)
+ 	rm -f .depend
diff --git a/debian/patches/series b/debian/patches/series
index 1c90bd4..0f3e7d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 charset
 doc-noexamples
+clean-targets
diff --git a/debian/rules b/debian/rules
index 8731592..eaf60cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
-SHELL=/bin/sh
+SHELL=/bin/dash
 DESTDIR=$(PWD)/debian/bibtex2html
 
 %:
 	dh $@ --with ocaml
 
 override_dh_auto_configure:
-	./configure --bindir=$(DESTDIR)usr/bin\
+	./configure --bindir=$(DESTDIR)/usr/bin\
 			 --prefix=$(DESTDIR)/usr/share
 
 override_dh_auto_build:
@@ -16,6 +16,11 @@ override_dh_auto_build:
 override_dh_auto_install:
 	$(MAKE) install-byte
 
+override_dh_auto_clean:
+	$(MAKE) dist-clean
+
+# do not strip ocaml bytecode
 override_dh_strip:
 
+# upstreams test target does not work (files missing)
 override_dh_auto_test:

-- 
bibtex2html packaging