[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9-2-8-gcdd5af2

[Ralf Treinen]

The following commit has been merged in the master branch:
commit e4775a646bd69624e0a454b1f762d8824d53a2c5
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Mar 23 22:38:10 2010 +0100

    removed some old patches that ar no longer needed.

diff --git a/debian/advi.links b/debian/advi.links
deleted file mode 100644
index a623d2d..0000000
--- a/debian/advi.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/man/man1/advi.1.gz usr/share/man/man1/zadvi.1.gz
diff --git a/debian/patches/doc-without-htmlc b/debian/patches/doc-without-htmlc
deleted file mode 100644
index c7b6da8..0000000
--- a/debian/patches/doc-without-htmlc
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Ralf Treinen
-Description: do not call htmlc from the doc Makefile
-
-Index: advi/doc/Makefile.am
-===================================================================
---- advi.orig/doc/Makefile.am	2010-03-15 22:04:56.000000000 +0100
-+++ advi/doc/Makefile.am	2010-03-15 22:06:07.000000000 +0100
-@@ -169,19 +169,3 @@
- 
- 
- $(HTMLFILES): ../configure
--
--.htm.html: 
--if HAVE_HTMLC
--	$(HTMLC) $(HTMLC_FLAGS) -f $(srcdir)/$< -t $@
--else
--	@echo "htmlc required, unable to proceed"
--	@exit 1
--endif
--
--.man.1: $(top_srcdir)/config.status
--if HAVE_HTMLC
--	$(HTMLC) $(HTMLC_FLAGS) -f $(srcdir)/$< -t $@
--else
--	@echo "htmlc required, unable to proceed"
--	@exit 1
--endif
-Index: advi/doc/Makefile.in
-===================================================================
---- advi.orig/doc/Makefile.in	2010-03-15 22:04:56.000000000 +0100
-+++ advi/doc/Makefile.in	2010-03-15 22:06:07.000000000 +0100
-@@ -777,15 +777,6 @@
- 
- $(HTMLFILES): ../configure
- 
--.htm.html: 
-- at HAVE_HTMLC_TRUE@	$(HTMLC) $(HTMLC_FLAGS) -f $(srcdir)/$< -t $@
-- at HAVE_HTMLC_FALSE@	@echo "htmlc required, unable to proceed"
-- at HAVE_HTMLC_FALSE@	@exit 1
--
--.man.1: $(top_srcdir)/config.status
-- at HAVE_HTMLC_TRUE@	$(HTMLC) $(HTMLC_FLAGS) -f $(srcdir)/$< -t $@
-- at HAVE_HTMLC_FALSE@	@echo "htmlc required, unable to proceed"
-- at HAVE_HTMLC_FALSE@	@exit 1
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/debian/patches/examples-phony-targets b/debian/patches/examples-phony-targets
deleted file mode 100644
index 35c4b45..0000000
--- a/debian/patches/examples-phony-targets
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: add some phony targets in examples/Makefile that might get
-  called from the top-level Makefile
-
-Index: advi/examples/Makefile
-===================================================================
---- advi.orig/examples/Makefile	2010-03-15 22:11:57.000000000 +0100
-+++ advi/examples/Makefile	2010-03-15 22:14:43.000000000 +0100
-@@ -56,3 +56,9 @@
- 	for i in $(SUBDIRS); do \
- 	 cd $$i; $(MAKE) clean; cd ..; \
- 	done
-+
-+check:
-+
-+install:
-+
-+.phony: check install

-- 
advi packaging