[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 5c1da7fcf1ef714086fa9b3a6e15df6c54433af2
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Apr 3 12:23:08 2010 +0200

    sanitise upstream makefile

diff --git a/debian/changelog b/debian/changelog
index 3752787..4afb905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ bibtex2html (1.95-1) unstable; urgency=low
   * 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"
+  * New patch sanitise-makefile: specify shell, rename dist-clean to distclean
+  * Add bash to build-depends since it is needed by upstream Makefile
 
- -- Ralf Treinen <treinen at debian.org>  Sat, 03 Apr 2010 12:00:51 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sat, 03 Apr 2010 12:19:26 +0200
 
 bibtex2html (1.94-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 88d8804..1b13b56 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders:
  Samuel Mimram <smimram at debian.org>,
  Sylvain Le Gall <gildor at debian.org>
 Standards-Version: 3.8.4
-Build-Depends-Indep: ocaml-nox (>= 3.07), hevea
+Build-Depends-Indep: ocaml-nox (>= 3.07), hevea, bash
 Build-Depends: debhelper (>= 7.0), dh-ocaml
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/bibtex2html.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/bibtex2html.git
diff --git a/debian/patches/sanitise-makefile b/debian/patches/sanitise-makefile
new file mode 100644
index 0000000..59f90aa
--- /dev/null
+++ b/debian/patches/sanitise-makefile
@@ -0,0 +1,25 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: specify shell, use standard name for distclean
+
+Index: bibtex2html/Makefile.in
+===================================================================
+--- bibtex2html.orig/Makefile.in	2010-04-03 12:16:17.000000000 +0200
++++ bibtex2html/Makefile.in	2010-04-03 12:16:44.000000000 +0200
+@@ -14,6 +14,8 @@
+ #  (enclosed in the file GPL).                                           #
+ ##########################################################################
+ 
++SHELL=/bin/bash
++
+ #########################################
+ # Configuration part
+ #########################################
+@@ -334,7 +336,7 @@
+ 	rm -f bibtex2html.static bib2bib.static
+ 	rm -f bibtex2html.byte bib2bib.byte
+ 
+-dist-clean:: clean
++distclean:: clean
+ 	rm -f Makefile aux2bib config.log config.status
+ 
+ depend:: $(GENERATED)
diff --git a/debian/patches/series b/debian/patches/series
index 0f3e7d3..c75ba65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 charset
 doc-noexamples
 clean-targets
+sanitise-makefile
diff --git a/debian/rules b/debian/rules
index eaf60cd..8d6c93e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,6 @@ 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:
 

-- 
bibtex2html packaging