[Pkg-ocaml-maint-commits] r1263 - in trunk/packages/cduce/trunk/debian: . patches

[Thomas Petazzoni]

Author: tpetazzo-guest
Date: 2005-04-13 22:01:18 +0000 (Wed, 13 Apr 2005)
New Revision: 1263

Added:
   trunk/packages/cduce/trunk/debian/patches/dont-compile-mlcduce-wrapper.dpatch
Removed:
   trunk/packages/cduce/trunk/debian/cduce.install
Modified:
   trunk/packages/cduce/trunk/debian/cduce.manpages
   trunk/packages/cduce/trunk/debian/control
   trunk/packages/cduce/trunk/debian/patches/00list
   trunk/packages/cduce/trunk/debian/rules
Log:

 - Add chrpath to Build-Depends
 - Use chrpath in debian/rules
 - Remove cduce.install (useless)
 - Add dpatch to unactivate compilation and installation of mlcduce_wrapper which is an internal tool for CDuce developers



Deleted: trunk/packages/cduce/trunk/debian/cduce.install
===================================================================
--- trunk/packages/cduce/trunk/debian/cduce.install	2005-04-13 20:04:57 UTC (rev 1262)
+++ trunk/packages/cduce/trunk/debian/cduce.install	2005-04-13 22:01:18 UTC (rev 1263)
@@ -1,3 +0,0 @@
-cduce		usr/bin
-cdo2ml		usr/bin
-cduce_mktop	usr/bin

Modified: trunk/packages/cduce/trunk/debian/cduce.manpages
===================================================================
--- trunk/packages/cduce/trunk/debian/cduce.manpages	2005-04-13 20:04:57 UTC (rev 1262)
+++ trunk/packages/cduce/trunk/debian/cduce.manpages	2005-04-13 22:01:18 UTC (rev 1263)
@@ -1,4 +1,3 @@
-doc/cdo2ml.1 
 doc/cduce.1
-doc/dtd2cduce.1
+doc/cdo2ml.1
 doc/cduce_mktop.1

Modified: trunk/packages/cduce/trunk/debian/control
===================================================================
--- trunk/packages/cduce/trunk/debian/control	2005-04-13 20:04:57 UTC (rev 1262)
+++ trunk/packages/cduce/trunk/debian/control	2005-04-13 22:01:18 UTC (rev 1263)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Thomas Petazzoni <thomas.petazzoni@enix.org>
 Uploaders: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, ocaml-compiler-libs-3.08.3, libpcre-ocaml-dev, libocamlnet-ocaml-dev, libexpat-ocaml-dev, libcurl-ocaml-dev, ocaml-ulex, dpatch
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, ocaml-compiler-libs-3.08.3, libpcre-ocaml-dev, libocamlnet-ocaml-dev, libexpat-ocaml-dev, libcurl-ocaml-dev, ocaml-ulex, dpatch, chrpath
 Standards-Version: 3.6.1.1
 
 Package: cduce

Modified: trunk/packages/cduce/trunk/debian/patches/00list
===================================================================
--- trunk/packages/cduce/trunk/debian/patches/00list	2005-04-13 20:04:57 UTC (rev 1262)
+++ trunk/packages/cduce/trunk/debian/patches/00list	2005-04-13 22:01:18 UTC (rev 1263)
@@ -0,0 +1 @@
+dont-compile-mlcduce-wrapper

Added: trunk/packages/cduce/trunk/debian/patches/dont-compile-mlcduce-wrapper.dpatch
===================================================================
--- trunk/packages/cduce/trunk/debian/patches/dont-compile-mlcduce-wrapper.dpatch	2005-04-13 20:04:57 UTC (rev 1262)
+++ trunk/packages/cduce/trunk/debian/patches/dont-compile-mlcduce-wrapper.dpatch	2005-04-13 22:01:18 UTC (rev 1263)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dont-compile-mlcduce-wrapper.dpatch by  <thomas@crazy.kos.nx>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cduce-0.3.2/Makefile /tmp/dpep.EYtqbe/cduce-0.3.2/Makefile
+--- cduce-0.3.2/Makefile	2005-03-22 08:38:08.000000000 +0100
++++ /tmp/dpep.EYtqbe/cduce-0.3.2/Makefile	2005-04-13 23:30:51.092040149 +0200
+@@ -5,8 +5,8 @@
+ INSTALL_BINARIES=cduce$(EXE)
+ 
+ ifneq ($(ML_INTERFACE), false)
+-  ALL_TARGET += cdo2ml mlcduce_wrapper
+-  INSTALL_BINARIES += cdo2ml$(EXE) mlcduce_wrapper$(EXE) cduce_mktop
++  ALL_TARGET += cdo2ml
++  INSTALL_BINARIES += cdo2ml$(EXE) cduce_mktop
+ endif
+ 
+ 


Property changes on: trunk/packages/cduce/trunk/debian/patches/dont-compile-mlcduce-wrapper.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/cduce/trunk/debian/rules
===================================================================
--- trunk/packages/cduce/trunk/debian/rules	2005-04-13 20:04:57 UTC (rev 1262)
+++ trunk/packages/cduce/trunk/debian/rules	2005-04-13 22:01:18 UTC (rev 1263)
@@ -41,6 +41,7 @@
 	touch Makefile.conf
 	$(MAKE) $(MAKE_OPTS) clean
 	rm Makefile.conf
+	rm -f configure-stamp
 	dh_clean 
 
 install:
@@ -53,12 +54,13 @@
 	# debian/<package>-doc.
 	$(MAKE) $(MAKE_OPTS) DOCDIR=$(DOCDIR) BINDIR=$(BINDIR) MANDIR=$(MANDIR) OCAMLFIND_DESTDIR=$(LIBDIR) OCAMLFIND_LDCONF=ignore install
 
+	# Remove the wrong RPATH
+	chrpath -d $(BINDIR)/cduce
+
 	# CDuce Makefile installs all the documentation in DOCDIR, including 
 	# README, LICENSE, and so on. We don't want these. Let's hack.
 	find $(DOCDIR) -maxdepth 1 -not -name "*.html" -not -name "img" -exec rm {} \;
 
-	dh_install
-
 binary: build install
 	dh_testdir
 	dh_testroot