[Pkg-ocaml-maint-commits] r4539 - in /trunk/packages/cameleon/trunk/debian: patches/00list patches/languagesspecsdir.dpatch rules
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Wed Sep 19 00:10:21 UTC 2007
Author: gildor
Date: Wed Sep 19 00:10:21 2007
New Revision: 4539
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4539
Log:
* More cleanup for reproducing the bug "FTBFS when build once in a row"
* Modify to install languages-spec and ocamldoc plugin inside $(DESTDIR)
Added:
trunk/packages/cameleon/trunk/debian/patches/languagesspecsdir.dpatch (with props)
Modified:
trunk/packages/cameleon/trunk/debian/patches/00list
trunk/packages/cameleon/trunk/debian/rules
Modified: trunk/packages/cameleon/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/patches/00list?rev=4539&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/00list (original)
+++ trunk/packages/cameleon/trunk/debian/patches/00list Wed Sep 19 00:10:21 2007
@@ -1,2 +1,3 @@
xml_light
ocamldoc_best
+languagesspecsdir
Added: trunk/packages/cameleon/trunk/debian/patches/languagesspecsdir.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/patches/languagesspecsdir.dpatch?rev=4539&op=file
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/languagesspecsdir.dpatch (added)
+++ trunk/packages/cameleon/trunk/debian/patches/languagesspecsdir.dpatch Wed Sep 19 00:10:21 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## languagesspecsdir.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cameleon-1.9.18.20070918svn~/master.Makefile.in cameleon-1.9.18.20070918svn/master.Makefile.in
+--- cameleon-1.9.18.20070918svn~/master.Makefile.in 2007-09-19 01:55:54.650623381 +0200
++++ cameleon-1.9.18.20070918svn/master.Makefile.in 2007-09-19 01:56:16.293680669 +0200
+@@ -81,7 +81,7 @@
+ PIXMAPSDIR=$(DESTDIR)@PIXMAPSDIR@
+ GLADEDIR=$(DESTDIR)@GLADEDIR@
+ DTDDIR=$(DESTDIR)@DTDDIR@
+-LANGUAGESSPECSDIR=$(DEST_DIR)@LANGUAGESSPECSDIR@
++LANGUAGESSPECSDIR=$(DESTDIR)@LANGUAGESSPECSDIR@
+
+ CAMELEON=@CAMELEON@
+ CAMELEON_BYTE=@CAMELEON_BYTE@
Propchange: trunk/packages/cameleon/trunk/debian/patches/languagesspecsdir.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/cameleon/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/rules?rev=4539&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/rules (original)
+++ trunk/packages/cameleon/trunk/debian/rules Wed Sep 19 00:10:21 2007
@@ -35,11 +35,15 @@
PACKAGE_DOC := cameleon-doc
DESTDIR_DOC := $(CURDIR)/debian/$(PACKAGE_DOC)
+OCAMLDOC_PLUGINSDIR := $(DESTDIR)/$(shell ocamldoc -customdir)
+
DEB_MAKE_CLEAN_TARGET := distclean
DEB_MAKE_BUILD_TARGET := depend all doc
-DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DESTDIR)"
+DEB_MAKE_INSTALL_TARGET := install \
+ DESTDIR='$(DESTDIR)' \
+ OCAMLDOC_PLUGINSDIR='$(OCAMLDOC_PLUGINSDIR)'
DEB_CONFIGURE_EXTRA_FLAGS = --prefix=/usr --datadir=/usr/share/cameleon \
--mandir=/usr/share/man \
@@ -68,46 +72,48 @@
CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
clean::
- -$(RM) $(CURDIR)/src/dump.odoc
- -$(RM) $(CURDIR)/doc/stdlib.odoc
- -$(RM) $(CURDIR)/doc/cameleon.odoc
- -$(RM) $(CURDIR)/src/camtop/camtop_installation.ml
- -$(RM) $(CURDIR)/src/camtop/cam-mktop2
- -$(RM) $(CURDIR)/src/cameleon/cam_config.ml
- -$(RM) $(CURDIR)/src/editor/ed_charsets.ml
- -$(RM) $(CURDIR)/src/odiff/odiff_parser.output
- -$(RM) $(CURDIR)/src/odot/.depend
- -$(RM) $(CURDIR)/src/odot/config.log
- -$(RM) $(CURDIR)/src/odot/config.status
- -$(RM) $(CURDIR)/src/odot/odot_lexer.ml
- -$(RM) $(CURDIR)/src/odot/master.Makefile
- -$(RM) $(CURDIR)/src/odot/odot_version.ml
- -$(RM) $(CURDIR)/src/odot/odot_parser.output
- -$(RM) $(CURDIR)/src/dbforge/dbf_installation.ml
- -$(RM) $(CURDIR)/src/dbforge/dbf_sql_gen.ml
- -$(RM) $(CURDIR)/src/dbforge/dbf_sql_vgen.ml
- -$(RM) $(CURDIR)/src/dbforge/dbf_sql_qgen.ml
- -$(RM) $(CURDIR)/src/report/rep_installation.ml
- -$(RM) $(CURDIR)/src/.depend
- -$(RM) $(CURDIR)/images/topcameleon.xpm
- -$(RM) $(CURDIR)/config.log
- -$(RM) $(CURDIR)/config_check.log
- -$(RM) $(CURDIR)/debian/xml-man/en/cam-config2.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/cameleon2.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/cam-mktop2.1
- -$(RM) $(CURDIR)/debian/xml-man/en/dbforge2.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/dbforge2.gui.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/docbrowser2.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/ocamlcvs2.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/report2.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/report2.gui.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/tmpl_engine.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/chamo.byte.1
- -$(RM) $(CURDIR)/debian/xml-man/en/ocamltdl2.byte.1
- -$(RM) $(CURDIR)/debian/cameleon-doc.dirs
- -$(RM) $(CURDIR)/debian/libcameleon-ocaml-dev.dirs
- -$(RM) $(CURDIR)/debian/libcameleon-ocaml-dev.install
- -$(RM) $(CURDIR)/debian/META.cameleon
+ -$(RM) '$(CURDIR)/src/dump.odoc'
+ -$(RM) '$(CURDIR)/doc/stdlib.odoc'
+ -$(RM) '$(CURDIR)/doc/cameleon.odoc'
+ -$(RM) '$(CURDIR)/src/camtop/camtop_installation.ml'
+ -$(RM) '$(CURDIR)/src/camtop/cam-mktop2'
+ -$(RM) '$(CURDIR)/src/cameleon/cam_config.ml'
+ -$(RM) '$(CURDIR)/src/editor/ed_charsets.ml'
+ -$(RM) '$(CURDIR)/src/odiff/odiff_parser.output'
+ -$(RM) '$(CURDIR)/src/odot/.depend'
+ -$(RM) '$(CURDIR)/src/odot/config.log'
+ -$(RM) '$(CURDIR)/src/odot/config.status'
+ -$(RM) '$(CURDIR)/src/odot/odot_lexer.ml'
+ -$(RM) '$(CURDIR)/src/odot/master.Makefile'
+ -$(RM) '$(CURDIR)/src/odot/odot_version.ml'
+ -$(RM) '$(CURDIR)/src/odot/odot_parser.output'
+ -$(RM) '$(CURDIR)/src/dbforge/dbf_installation.ml'
+ -$(RM) '$(CURDIR)/src/dbforge/dbf_sql_gen.ml'
+ -$(RM) '$(CURDIR)/src/dbforge/dbf_sql_vgen.ml'
+ -$(RM) '$(CURDIR)/src/dbforge/dbf_sql_qgen.ml'
+ -$(RM) '$(CURDIR)/src/report/rep_installation.ml'
+ -$(RM) '$(CURDIR)/src/.depend'
+ -$(RM) '$(CURDIR)/images/topcameleon.xpm'
+ -$(RM) '$(CURDIR)/config.log'
+ -$(RM) '$(CURDIR)/config_check.log'
+ -$(RM) '$(CURDIR)/src/tdl/tdl_filter_parser.ml'
+ -$(RM) '$(CURDIR)/src/tdl/tdl_filter_parser.output'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/cam-config2.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/cameleon2.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/cam-mktop2.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/dbforge2.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/dbforge2.gui.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/docbrowser2.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/ocamlcvs2.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/report2.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/report2.gui.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/tmpl_engine.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/chamo.byte.1'
+ -$(RM) '$(CURDIR)/debian/xml-man/en/ocamltdl2.byte.1'
+ -$(RM) '$(CURDIR)/debian/cameleon-doc.dirs'
+ -$(RM) '$(CURDIR)/debian/libcameleon-ocaml-dev.dirs'
+ -$(RM) '$(CURDIR)/debian/libcameleon-ocaml-dev.install'
+ -$(RM) '$(CURDIR)/debian/META.cameleon'
install/cameleon install/cameleon-doc install/libcameleon-ocaml-dev:: cameleon-install-extra
More information about the Pkg-ocaml-maint-commits
mailing list