[Pkg-ocaml-maint-commits] r1343 - in trunk/packages/perl4caml/trunk/debian: . patches

Wed, 04 May 2005 02:28:33 +0000

Author: mfurr
Date: 2005-05-04 02:28:31 +0000 (Wed, 04 May 2005)
New Revision: 1343

Added:
   trunk/packages/perl4caml/trunk/debian/patches/
   trunk/packages/perl4caml/trunk/debian/patches/00list
   trunk/packages/perl4caml/trunk/debian/patches/10_Makefile.dpatch
Modified:
   trunk/packages/perl4caml/trunk/debian/changelog
   trunk/packages/perl4caml/trunk/debian/control
   trunk/packages/perl4caml/trunk/debian/copyright
   trunk/packages/perl4caml/trunk/debian/rules
Log:
added patches to detect ocamlopt


Modified: trunk/packages/perl4caml/trunk/debian/changelog
===================================================================

--- trunk/packages/perl4caml/trunk/debian/changelog	2005-05-04 00:27:38 UTC (rev 1342)
+++ trunk/packages/perl4caml/trunk/debian/changelog	2005-05-04 02:28:31 UTC (rev 1343)
@@ -1,3 +1,12 @@
+perl4caml (0.9.3-3) unstable; urgency=low
+
+  * Missed John's makefile patch, added back with dpatch
+  * Makefile now detects absence of ocamlopt
+  * Policy => 3.6.1.0
+  * lintian suggested typo fixes
+
+ -- Mike Furr <mfurr@debian.org>  Tue,  3 May 2005 22:03:09 -0400
+
 perl4caml (0.9.3-2) unstable; urgency=medium
 
   * New maintainer (Closes: 305456)

Modified: trunk/packages/perl4caml/trunk/debian/control
===================================================================
--- trunk/packages/perl4caml/trunk/debian/control	2005-05-04 00:27:38 UTC (rev 1342)
+++ trunk/packages/perl4caml/trunk/debian/control	2005-05-04 02:28:31 UTC (rev 1343)
@@ -1,8 +1,9 @@
 Source: perl4caml
 Priority: optional
+Section: libdevel
 Maintainer: Mike Furr <mfurr@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libperl-dev, perl-modules, perl-base (>= 5.8), perl (>= 5.8), ocaml-nox-3.08.3
-Standards-Version: 3.6.0
+Build-Depends: debhelper (>= 4.0.0), libperl-dev, perl-modules, perl-base (>= 5.8), perl (>= 5.8), ocaml-nox-3.08.3, dpatch
+Standards-Version: 3.6.1.0
 
 Package: libperl4caml-ocaml-dev
 Section: libdevel

Modified: trunk/packages/perl4caml/trunk/debian/copyright
===================================================================
--- trunk/packages/perl4caml/trunk/debian/copyright	2005-05-04 00:27:38 UTC (rev 1342)
+++ trunk/packages/perl4caml/trunk/debian/copyright	2005-05-04 02:28:31 UTC (rev 1343)
@@ -4,7 +4,7 @@
 
 It was downloaded from  http://www.merjis.com/developers/perl4caml/
 
-Upstream Author(s):  Richard W.M. Jones <rich@annexia.org>
+Upstream Author:  Richard W.M. Jones <rich@annexia.org>
 
 Copyright:
 Copyright (C) 2003 Merjis Ltd. (http://www.merjis.com/)

Added: trunk/packages/perl4caml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/perl4caml/trunk/debian/patches/00list	2005-05-04 00:27:38 UTC (rev 1342)
+++ trunk/packages/perl4caml/trunk/debian/patches/00list	2005-05-04 02:28:31 UTC (rev 1343)
@@ -0,0 +1 @@
+10_Makefile

Added: trunk/packages/perl4caml/trunk/debian/patches/10_Makefile.dpatch
===================================================================
--- trunk/packages/perl4caml/trunk/debian/patches/10_Makefile.dpatch	2005-05-04 00:27:38 UTC (rev 1342)
+++ trunk/packages/perl4caml/trunk/debian/patches/10_Makefile.dpatch	2005-05-04 02:28:31 UTC (rev 1343)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_Makefile.dpatch by Mike Furr <mfurr@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad perl4caml-0.9.3/Makefile /tmp/dpep.RbqfpB/perl4caml-0.9.3/Makefile
+--- perl4caml-0.9.3/Makefile	2005-05-03 22:05:05.246071082 -0400
++++ /tmp/dpep.RbqfpB/perl4caml-0.9.3/Makefile	2005-05-03 22:10:11.837276478 -0400
+@@ -4,6 +4,10 @@
+ 
+ include Makefile.config
+ 
++ifeq (YES, $(shell if [ -x /usr/bin/ocamlopt ]; then echo YES; fi))
++HASOCAMLOPT := yes
++endif
++
+ OCAMLC := ocamlc
+ OCAMLOPT := ocamlopt
+ OCAMLMKLIB := ocamlmklib
+@@ -52,7 +56,11 @@
+ 	wrappers/pl_Template.cmo \
+ 	wrappers/pl_WWW_Mechanize.cmo
+ 
++ifdef HASOCAMLOPT
+ all:	perl4caml.cma perl4caml.cmxa META all-examples html
++else
++all:	perl4caml.cma META all-examples html
++endif
+ 
+ perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
+ 	$(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
+@@ -60,9 +68,14 @@
+ perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx)
+ 	$(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
+ 
++ifdef HASOCAMLOPT
+ all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \
+ 	examples/test.opt examples/loadpage.opt examples/google.opt \
+ 	examples/parsedate.bc examples/parsedate.opt
++else
++all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \
++	examples/parsedate.bc
++endif
+ 
+ TEST_PROGRAMS := $(patsubst %.ml,%.bc,$(wildcard test/*.ml)) \
+ 	$(patsubst %.ml,%.opt,$(wildcard test/*.ml))
+@@ -142,10 +155,17 @@
+ 	rm -rf $(DESTDIR)$(OCAMLLIBDIR)/perl
+ 	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/perl
+ 	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/stublibs
++ifdef HASOCAMLOPT
+ 	install -c -m 0644 perl.cmi perl.mli perl4caml.cma perl4caml.cmxa \
+ 	  perl4caml.a libperl4caml.a META \
+ 	  $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) \
+ 	  $(DESTDIR)$(OCAMLLIBDIR)/perl
++else
++	install -c -m 0644 perl.cmi perl.mli perl4caml.cma \
++	  META \
++	  $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) \
++	  $(DESTDIR)$(OCAMLLIBDIR)/perl
++endif
+ 	install -c -m 0644 dllperl4caml.so $(DESTDIR)$(OCAMLLIBDIR)/stublibs
+ 
+ # Distribution.


Property changes on: trunk/packages/perl4caml/trunk/debian/patches/10_Makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/perl4caml/trunk/debian/rules
===================================================================
--- trunk/packages/perl4caml/trunk/debian/rules	2005-05-04 00:27:38 UTC (rev 1342)
+++ trunk/packages/perl4caml/trunk/debian/rules	2005-05-04 02:28:31 UTC (rev 1343)
@@ -6,9 +6,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -20,20 +17,13 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+include /usr/share/dpatch/dpatch.make
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
-	# Add here commands to configure the package.
 
+
 	touch configure-stamp
 
 
@@ -41,17 +31,17 @@
 build-stamp: configure-stamp 
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE)
 
 	touch build-stamp
 
-clean:
+clean: patch clean1 unpatch
+
+clean1:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 	-rm -rf html
 
@@ -63,7 +53,6 @@
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	cd debian/tmp && find . -name ".arch-ids" -exec rm -rf {} \;
 
@@ -76,32 +65,19 @@
 	dh_installchangelogs  -i
 	dh_installdocs -i
 	dh_installexamples -i
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman -i
 	dh_link -i
 	# dh_strip is broken on this package!
 	#dh_strip
 	dh_compress -i
 	dh_fixperms -i
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb -i
 	dh_shlibdeps -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
-#
 
+
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
@@ -110,25 +86,12 @@
 	dh_installchangelogs  -a
 	dh_installdocs -a
 	dh_installexamples -a
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman -a
 	dh_link -a
 	# dh_strip is broken on this package!
 	#dh_strip
 	dh_compress -a
 	dh_fixperms -a
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a



